Tiberiu Chibici
913e65b856
==================================================== + Changed 'align 0x4' line above multiboot header in loader.asm to 'align 4' + Removed -e option for echo in build.sh + Modified build.sh for linux + Fixed triple fault when enabling paging + Fixed page faults at memory manager initialization + Fixed 'mem' console function + Added more info about page fault at crash screen + Added Panic() macro + Added verbose mode for memory manager [ BAD] BUILD 0.1.0.390 DATE 8/27/2011 AT 10:54 PM ==================================================== + Added stdlib routines, separated in different files + Rewritten physical memory manager + Added virtual mem manager + Added memory allocation/freeing + Added memory library + Added temporary allocation (at end of kernel), until paging is started - Removed functionality from debug console function 'mem' - Removed system.h, the one remaining function now in stdio.h
88 lines
2.0 KiB
C
88 lines
2.0 KiB
C
/*
|
|
* memory_alloc.c
|
|
*
|
|
* Created on: Aug 27, 2011
|
|
* Author: Tiberiu
|
|
*/
|
|
|
|
#include <memory-add.h>
|
|
|
|
extern uint32 mem_kernel_end;
|
|
extern uint8 mem_initialized;
|
|
|
|
// Used prior to proper initialization
|
|
uint32 _malloc_init1 (uint32 size, uint8 page_aligned)
|
|
{
|
|
uint32 ret = mem_kernel_end;
|
|
|
|
if (page_aligned && (ret & 0xfff)) ret = (ret & 0xfffff000) + 0x1000;
|
|
mem_kernel_end = size + ret;
|
|
|
|
LogMem("%#Allocated %u bytes (%spage aligned) at end of kernel (0x%x).\n", ColorLightMagenta, size, ((page_aligned) ? "" : "not "), ret);
|
|
return (ret);
|
|
}
|
|
|
|
uint32 _malloc_init2 (uint32 size, uint8 page_aligned, uint32* phys)
|
|
{
|
|
uint32 ret = MemHeapAlloc(size, page_aligned, KernelHeap, KernelDirectory);
|
|
|
|
if (phys)
|
|
{
|
|
Page *pg = PagingGetPage(ret, 0, KernelDirectory);
|
|
*phys = (*pg & PageFrame) + (ret & 0xFFF);
|
|
|
|
LogMem("%#Allocated %u bytes (%spage aligned) at address 0x%x (phys=%x).\n", ColorLightMagenta, size, ((page_aligned) ? "" : "not "), ret, *phys);
|
|
}
|
|
|
|
else {
|
|
LogMem("%#Allocated %u bytes (%spage aligned) at address 0x%x.\n", ColorLightMagenta, size, ((page_aligned) ? "" : "not "), ret);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
// Allocate 'size' bytes
|
|
void* kmalloc (uint32 size)
|
|
{
|
|
if (!mem_initialized) return 0;
|
|
if (mem_initialized == 1) return (void*)_malloc_init1(size, 0);
|
|
|
|
return (void*)_malloc_init2(size,0,0);
|
|
}
|
|
|
|
// Allocate 'size' bytes, page aligned
|
|
void* kmalloc_a(uint32 size)
|
|
{
|
|
if (!mem_initialized) return 0;
|
|
if (mem_initialized == 1) return (void*)_malloc_init1(size, 1);
|
|
|
|
return (void*)_malloc_init2(size,1,0);
|
|
}
|
|
|
|
void* kmalloc_p(uint32 size, uint32* phys)
|
|
{
|
|
if (!mem_initialized) return 0;
|
|
if (mem_initialized == 1) {
|
|
*phys = _malloc_init1(size,0);
|
|
return (void*)(*phys);
|
|
}
|
|
|
|
return (void*)_malloc_init2(size,0,phys);
|
|
}
|
|
|
|
void* kmalloc_ap(uint32 size, uint32* phys)
|
|
{
|
|
if (!mem_initialized) return 0;
|
|
|
|
uint32 ret;
|
|
if (mem_initialized == 1) {
|
|
*phys = ret = _malloc_init1(size,1);
|
|
}
|
|
|
|
else ret = _malloc_init2(size,1,phys);
|
|
|
|
LogMem("%#kmalloc_ap requested, returned 0x%x, phys = 0x%x.\n", ColorMagenta, ret, *phys);
|
|
|
|
return (void*)ret;
|
|
}
|