justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[kernel] Re-enable most of kernel_main

Browse Source 
The `kernel_main()` had a lot change out from under it with the
bootloader changes. This change brings most of it back in line with the
new kernel arguments.

Tags: pml4 paging boot
This commit is contained in:
Justin C. Miller
2020-05-24 17:58:45 -07:00
parent 35b1d37df0
commit bfd13e7a9b
4 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/memory_bootstrap.cpp
View File

@@ -70,6 +70,7 @@ memory_initialize(args::header *kargs)
{
args::mem_entry *entries = kargs->mem_map;
size_t entry_count = kargs->num_map_entries;
page_table *kpml4 = reinterpret_cast<page_table*>(kargs->pml4);
new (&g_kernel_heap) kutil::heap_allocator {heap_start, kernel_max_heap};
@@ -82,14 +83,13 @@ memory_initialize(args::header *kargs)
}
// Create the page manager
page_manager *pm = new (&g_page_manager) page_manager(*fa);
page_manager *pm = new (&g_page_manager) page_manager(*fa, kpml4);
new (&g_kernel_space) kutil::vm_space {
kernel_offset,
(page_offset-kernel_offset),
g_kernel_heap};
page_table *kpml4 = reinterpret_cast<page_table*>(kargs->pml4);
uintptr_t current_start = 0;
size_t current_bytes = 0;