X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/290981180b9abc454e017271a8ebe75478c00e86..43c43c058ededea929645fef68d15820eed1f5e9:/lunaix-os/kernel/proc0.c diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c index 14e4862..1e54e59 100644 --- a/lunaix-os/kernel/proc0.c +++ b/lunaix-os/kernel/proc0.c @@ -154,6 +154,8 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */ void init_platform() { + kprintf(KINFO "\033[11;0mLunaixOS \033[39;49m\n"); + // 锁定所有系统预留页(内存映射IO,ACPI之类的),并且进行1:1映射 lock_reserved_memory(); @@ -175,10 +177,11 @@ init_platform() // peripherals & chipset features ps2_kbd_init(); - pci_init(); block_init(); ahci_init(); + pci_init(); + // console console_start_flushing(); console_flush(); @@ -193,11 +196,6 @@ init_platform() vmm_del_mapping(PD_REFERENCED, (void*)i); pmm_free_page(KERNEL_PID, (void*)i); } - - // reserve higher half - for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) { - vmm_set_mapping(PD_REFERENCED, i << 22, 0, 0, VMAP_NOMAP); - } } void @@ -229,6 +227,10 @@ __do_reserved_memory(int unlock) size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS); size_t j = 0; if (!unlock) { + kprintf("mem: freeze: %p..%p type=%x\n", + pa, + pa + pg_num * PG_SIZE, + mmap.type); for (; j < pg_num; j++) { uintptr_t _pa = pa + (j << PG_SIZE_BITS); if (_pa >= KERNEL_MM_BASE) { @@ -242,6 +244,10 @@ __do_reserved_memory(int unlock) // Save the progress for later unmapping. mmaps[i].len_low = j * PG_SIZE; } else { + kprintf("mem: reclaim: %p..%p type=%x\n", + pa, + pa + pg_num * PG_SIZE, + mmap.type); for (; j < pg_num; j++) { uintptr_t _pa = pa + (j << PG_SIZE_BITS); vmm_del_mapping(PD_REFERENCED, _pa);