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

Kernel: Rename bootloader to prekernel

Browse source 
There are a few occurrences of the old name that slipped through.
This commit is contained in:
Gunnar Beutner 2021-07-18 19:39:33 +02:00 • committed by Andreas Kling
parent 439bed301e
commit 5ff1416076
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/VM/MemoryManager.cpp
View file

@ -22,8 +22,8 @@
#include <Kernel/VM/PhysicalRegion.h> #include <Kernel/VM/PhysicalRegion.h>
#include <Kernel/VM/SharedInodeVMObject.h> #include <Kernel/VM/SharedInodeVMObject.h>
extern u8* start_of_bootloader_image; extern u8* start_of_prekernel_image;
extern u8* end_of_bootloader_image; extern u8* end_of_prekernel_image;
extern u8* start_of_kernel_image; extern u8* start_of_kernel_image;
extern u8* end_of_kernel_image; extern u8* end_of_kernel_image;
extern FlatPtr start_of_kernel_text; extern FlatPtr start_of_kernel_text;
@ -201,7 +201,7 @@ UNMAP_AFTER_INIT void MemoryManager::parse_memory_map()
// Register used memory regions that we know of. // Register used memory regions that we know of.
m_used_memory_ranges.ensure_capacity(4); m_used_memory_ranges.ensure_capacity(4);
m_used_memory_ranges.append(UsedMemoryRange { UsedMemoryRangeType::LowMemory, PhysicalAddress(0x00000000), PhysicalAddress(1 * MiB) }); m_used_memory_ranges.append(UsedMemoryRange { UsedMemoryRangeType::LowMemory, PhysicalAddress(0x00000000), PhysicalAddress(1 * MiB) });
m_used_memory_ranges.append(UsedMemoryRange { UsedMemoryRangeType::Bootloader, PhysicalAddress(virtual_to_low_physical(FlatPtr(start_of_bootloader_image))), PhysicalAddress(page_round_up(virtual_to_low_physical(FlatPtr(end_of_bootloader_image)))) }); m_used_memory_ranges.append(UsedMemoryRange { UsedMemoryRangeType::Prekernel, PhysicalAddress(virtual_to_low_physical(FlatPtr(start_of_prekernel_image))), PhysicalAddress(page_round_up(virtual_to_low_physical(FlatPtr(end_of_prekernel_image)))) });
m_used_memory_ranges.append(UsedMemoryRange { UsedMemoryRangeType::Kernel, PhysicalAddress(virtual_to_low_physical(FlatPtr(&start_of_kernel_image))), PhysicalAddress(page_round_up(virtual_to_low_physical(FlatPtr(&end_of_kernel_image)))) }); m_used_memory_ranges.append(UsedMemoryRange { UsedMemoryRangeType::Kernel, PhysicalAddress(virtual_to_low_physical(FlatPtr(&start_of_kernel_image))), PhysicalAddress(page_round_up(virtual_to_low_physical(FlatPtr(&end_of_kernel_image)))) });
if (multiboot_info_ptr->flags & 0x4) { if (multiboot_info_ptr->flags & 0x4) {

4
Kernel/VM/MemoryManager.h
View file

@ -53,7 +53,7 @@ inline FlatPtr virtual_to_low_physical(FlatPtr virtual_)
enum class UsedMemoryRangeType { enum class UsedMemoryRangeType {
LowMemory = 0, LowMemory = 0,
Bootloader, Prekernel,
Kernel, Kernel,
BootModule, BootModule,
PhysicalPages, PhysicalPages,
@ -61,7 +61,7 @@ enum class UsedMemoryRangeType {
static constexpr StringView UserMemoryRangeTypeNames[] { static constexpr StringView UserMemoryRangeTypeNames[] {
"Low memory", "Low memory",
"Bootloader", "Prekernel",
"Kernel", "Kernel",
"Boot module", "Boot module",
"Physical Pages" "Physical Pages"

8
Kernel/init.cpp
View file

@ -106,8 +106,8 @@ static Processor s_bsp_processor; // global but let's keep it "private"
// init_stage2() function. Initialization continues there. // init_stage2() function. Initialization continues there.
extern "C" { extern "C" {
u8 const* start_of_bootloader_image; u8 const* start_of_prekernel_image;
u8 const* end_of_bootloader_image; u8 const* end_of_prekernel_image;
__attribute__((section(".boot_bss"))) FlatPtr kernel_base; __attribute__((section(".boot_bss"))) FlatPtr kernel_base;
#if ARCH(X86_64) #if ARCH(X86_64)
extern "C" u32 gdt64ptr; extern "C" u32 gdt64ptr;
@ -127,8 +127,8 @@ extern "C" [[noreturn]] UNMAP_AFTER_INIT void init(BootInfo const& boot_info)
setup_serial_debug(); setup_serial_debug();
multiboot_info_ptr = boot_info.multiboot_info_ptr; multiboot_info_ptr = boot_info.multiboot_info_ptr;
start_of_bootloader_image = boot_info.start_of_prekernel_image; start_of_prekernel_image = boot_info.start_of_prekernel_image;
end_of_bootloader_image = boot_info.end_of_prekernel_image; end_of_prekernel_image = boot_info.end_of_prekernel_image;
kernel_base = boot_info.kernel_base; kernel_base = boot_info.kernel_base;
#if ARCH(X86_64) #if ARCH(X86_64)
gdt64ptr = boot_info.gdt64ptr; gdt64ptr = boot_info.gdt64ptr;