diff options
Diffstat (limited to 'kernel/mem.c')
| -rw-r--r-- | kernel/mem.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kernel/mem.c b/kernel/mem.c index 7738af7..c5fe43f 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -111,7 +111,7 @@ void* pmmngr_alloc_block () if (frame == -1) { - panic(FOOLOS_MODULE_NAME,"OUT OF MEMORY (alloc_block)"); + kpanic("OUT OF MEMORY (alloc_block)"); return 0; //out of memory } @@ -119,7 +119,7 @@ void* pmmngr_alloc_block () mem_free_blocks--; uint32_t addr = frame * PMMNGR_BLOCK_SIZE; - log(FOOLOS_MODULE_NAME,99,"alloc block (%d) 0x%08X)",frame,addr); + klog("alloc block (%d) 0x%08X)",frame,addr); return (void*)addr; } @@ -137,12 +137,12 @@ void pmmngr_free_block (void* p) } else { - log(FOOLOS_MODULE_NAME,10,"free block (%d) 0x%08X)",frame,addr); - panic(FOOLOS_MODULE_NAME,"trying to free, free physical mem!"); + klog("free block (%d) 0x%08X)",frame,addr); + kpanic("trying to free, free physical mem!"); } - log(FOOLOS_MODULE_NAME,99,"free block (%d) 0x%08X)",frame,addr); + klog("free block (%d) 0x%08X)",frame,addr); } @@ -151,17 +151,17 @@ uint32_t mem_init(multiboot_information *info) { if(info->flags&&1<<6) { - log(FOOLOS_MODULE_NAME,5,"memory map of length %d provided by bootloader",info->mmap_length); + klog("memory map of length %d provided by bootloader",info->mmap_length); } - else panic(FOOLOS_MODULE_NAME,"Unable to continue without memory map, sorry!"); + else kpanic("Unable to continue without memory map, sorry!"); pmmngr_init (); //clear memmap uint64_t memmap=info->mmap_addr; uint64_t length=info->mmap_length; - log(FOOLOS_MODULE_NAME,5,"kernel loaded at: 0x%08X- 0x%08X",kernel_start,kernel_end); - log(FOOLOS_MODULE_NAME,5,"initial stack at: 0x%08X- 0x%08X",stack_top,stack_bottom); + klog("kernel loaded at: 0x%08X- 0x%08X",kernel_start,kernel_end); + klog("initial stack at: 0x%08X- 0x%08X",stack_top,stack_bottom); // count available mem and track high_end of usable memory uint32_t total_mem=0, highest_end; @@ -174,7 +174,7 @@ uint32_t mem_init(multiboot_information *info) uint64_t mem_end=mmap->base_addr+mmap->length; #ifdef MEM_PRINT_MEMORYMAP - log(FOOLOS_MODULE_NAME,5,"%08X - %08X / type: %s, (size: %d)", + klog("%08X - %08X / type: %s, (size: %d)", (uint32_t)mem_start, (uint32_t)mem_end, memmap_type_to_string[mmap->type-1], mmap->size); #endif @@ -201,7 +201,7 @@ uint32_t mem_init(multiboot_information *info) multiboot_mod *mod=(multiboot_mod *)info->mods_addr; for(int i=0;i<info->mods_count;i++) { - log(FOOLOS_MODULE_NAME,5,"mod 0x%08X-0x%08X : %s", + klog("mod 0x%08X-0x%08X : %s", mod->mod_start,mod->mod_end, mod->string); mem_min_block=mod->mod_end/PMMNGR_BLOCK_SIZE+1; @@ -218,9 +218,9 @@ uint32_t mem_init(multiboot_information *info) // we deinit everything below mem_min_block anyway pmmngr_deinit_region(0,mem_min_block*PMMNGR_BLOCK_SIZE); - log(FOOLOS_MODULE_NAME,5,"Usable ~%d / %d MB ",mem_free_blocks*4096/1024/1024,total_mem/1024/1024); + klog("Usable ~%d / %d MB ",mem_free_blocks*4096/1024/1024,total_mem/1024/1024); - log(FOOLOS_MODULE_NAME,5, + klog( "Free 4K blocks: %d (first free: %d)",mem_free_blocks,mem_min_block); return mem_min_block; |