RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:57:44 +00:00
Code Issues Activity Actions

Kernel: Rename .boot_bss to .super_pages to better reflect what it is

Browse source 
This also removes the section attribute for kernel_base which had no
effect because the section wasn't included in the linker script.
This commit is contained in:
Gunnar Beutner 2021-07-19 18:52:01 +02:00 • committed by Andreas Kling
parent be795d5812
commit 5188185374
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/BootInfo.h
View file

@ -12,7 +12,7 @@
extern "C" PhysicalAddress start_of_prekernel_image; extern "C" PhysicalAddress start_of_prekernel_image;
extern "C" PhysicalAddress end_of_prekernel_image; extern "C" PhysicalAddress end_of_prekernel_image;
extern "C" __attribute__((section(".boot_bss"))) FlatPtr kernel_base; extern "C" FlatPtr kernel_base;
#if ARCH(X86_64) #if ARCH(X86_64)
extern "C" u32 gdt64ptr; extern "C" u32 gdt64ptr;
extern "C" u16 code64_sel; extern "C" u16 code64_sel;

2
Kernel/init.cpp
View file

@ -109,7 +109,7 @@ static Processor s_bsp_processor; // global but let's keep it "private"
extern "C" { extern "C" {
PhysicalAddress start_of_prekernel_image; PhysicalAddress start_of_prekernel_image;
PhysicalAddress end_of_prekernel_image; PhysicalAddress end_of_prekernel_image;
__attribute__((section(".boot_bss"))) FlatPtr kernel_base; FlatPtr kernel_base;
#if ARCH(X86_64) #if ARCH(X86_64)
PhysicalAddress boot_pml4t; PhysicalAddress boot_pml4t;
#endif #endif

6
Kernel/linker_amd64.ld
View file

@ -4,7 +4,7 @@ KERNEL_VIRTUAL_BASE = 0x2000000000;
PHDRS PHDRS
{ {
boot_bss PT_LOAD ; super_pages PT_LOAD ;
text PT_LOAD ; text PT_LOAD ;
data PT_LOAD ; data PT_LOAD ;
bss PT_LOAD ; bss PT_LOAD ;
@ -17,10 +17,10 @@ SECTIONS
start_of_kernel_image = .; start_of_kernel_image = .;
.boot_bss ALIGN(4K) (NOLOAD) : AT (ADDR(.boot_bss) - KERNEL_VIRTUAL_BASE) .super_pages ALIGN(4K) (NOLOAD) : AT (ADDR(.super_pages) - KERNEL_VIRTUAL_BASE)
{ {
*(.super_pages) *(.super_pages)
} :boot_bss } :super_pages
.text ALIGN(4K) : AT (ADDR(.text) - KERNEL_VIRTUAL_BASE) .text ALIGN(4K) : AT (ADDR(.text) - KERNEL_VIRTUAL_BASE)
{ {

6
Kernel/linker_i386.ld
View file

@ -4,7 +4,7 @@ KERNEL_VIRTUAL_BASE = 0xc0000000;
PHDRS PHDRS
{ {
boot_bss PT_LOAD ; super_pages PT_LOAD ;
text PT_LOAD ; text PT_LOAD ;
data PT_LOAD ; data PT_LOAD ;
bss PT_LOAD ; bss PT_LOAD ;
@ -17,10 +17,10 @@ SECTIONS
start_of_kernel_image = .; start_of_kernel_image = .;
.boot_bss ALIGN(4K) (NOLOAD) : AT (ADDR(.boot_bss) - KERNEL_VIRTUAL_BASE) .super_pages ALIGN(4K) (NOLOAD) : AT (ADDR(.super_pages) - KERNEL_VIRTUAL_BASE)
{ {
*(.super_pages) *(.super_pages)
} :boot_bss } :super_pages
.text ALIGN(4K) : AT (ADDR(.text) - KERNEL_VIRTUAL_BASE) .text ALIGN(4K) : AT (ADDR(.text) - KERNEL_VIRTUAL_BASE)
{ {