From 67e7f93fc2ea9c6d04698f9af29be78d0123afb0 Mon Sep 17 00:00:00 2001 From: Miguel Date: Mon, 10 Sep 2018 01:41:28 +0200 Subject: start fixing virtual memory manager... (might take a while) --- kernel/kernel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'kernel/kernel.c') 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 ... "); -- cgit v1.2.3