diff options
| author | Miguel <m.i@gmx.at> | 2018-09-10 01:41:28 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-10 01:41:28 +0200 |
| commit | 67e7f93fc2ea9c6d04698f9af29be78d0123afb0 (patch) | |
| tree | 8affeecb23719c39f8494eb87c1576b1f0d35c55 /kernel/kernel.c | |
| parent | 88c5873713a4eda47d299abd9cecaa49221ec9fe (diff) | |
start fixing virtual memory manager... (might take a while)v0.1
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 2fdb09b..d30abf0 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -72,16 +72,17 @@ void kernel_main(uint32_t eax,uint32_t ebx) // -- MEMORY MANAGEMENT -- // klog("Memory init ... "); - uint32_t kernel_blocks=mem_init(cfg_multiboot); + mem_init(cfg_multiboot); klog("Vritual Memory / Paging init ... "); fixme("do not disable anymore on context switching!"); fixme("write convenneint management funcs as: mapCPU, mapKErnel, map USerspace.."); + fixme("move stack and guard with empty pages!"); - pdirectory *dir=vmem_init(kernel_blocks,(uint32_t)cfg_multiboot->framebuffer_addr,cfg_acpi.local_apic_address,cfg_acpi.io_apic_address); - - - fixme("move stack?"); + struct pdirectory_struct *dir=vmem_init(0, // this is hardcoded to first 32megs anyway + (uint32_t)cfg_multiboot->framebuffer_addr, + cfg_acpi.local_apic_address, + cfg_acpi.io_apic_address); // -- RAM IMAGE -- // klog("Ram Filesystem init ... "); |