sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop some dead code, clarify small comments and small cleanups to malloc.c

Browse Source 
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>




git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4677 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2009-09-25 21:59:57 +00:00
committed by Stefan Reinauer
parent 0a181fd642
commit 6bd571e060
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/malloc.c
View File

@ -10,36 +10,27 @@ extern unsigned char _heap, _eheap;
static void *free_mem_ptr = &_heap; /* Start of heap */
static void *free_mem_end_ptr = &_eheap; /* End of heap */
void malloc_mark(malloc_mark_t *place)
{
*place = (malloc_mark_t)free_mem_ptr;
printk_spew("malloc_mark %p\n", free_mem_ptr);
}
void malloc_release(malloc_mark_t *ptr)
{
free_mem_ptr = (void *)*ptr;
printk_spew("malloc_release %p\n", free_mem_ptr);
}
void *malloc(size_t size)
{
void *p;
MALLOCDBG("%s Enter, size %ld, free_mem_ptr %p\n", __func__, size, free_mem_ptr);
/* Checking arguments */
if (size < 0)
die("Error! malloc: Size < 0");
die("Error! malloc: size < 0");
/* Overzealous linker check */
if (free_mem_ptr <= 0)
die("Error! malloc: Free_mem_ptr <= 0");
free_mem_ptr = (void *)(((unsigned long)free_mem_ptr + 3) & ~3); /* Align */
free_mem_ptr = (void *)ALIGN((unsigned long)free_mem_ptr, 4);
p = (void *) free_mem_ptr;
free_mem_ptr += size;
if (free_mem_ptr >= free_mem_end_ptr)
die("Error! malloc: free_mem_ptr >= free_mem_end_ptr");
die("Error! malloc: Out of memory (free_mem_ptr >= free_mem_end_ptr)");
MALLOCDBG("malloc %p\n", p);
@ -49,4 +40,5 @@ void *malloc(size_t size)
void free(void *where)
{
/* Don't care */
MALLOCDBG("free %p\n", where);
}