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

use pointers instead of size_t when dealing with pointers. Also fix a few

Browse Source 
warnings (trivial)

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



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3976 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2009-03-06 17:22:35 +00:00
committed by Stefan Reinauer
parent f8c77e82c5
commit 054c7235c3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/malloc.c
View File

@ -4,36 +4,36 @@
#if 0 #if 0
#define MALLOCDBG(x) #define MALLOCDBG(x)
#else #else
#define MALLOCDBG(x) printk_spew x #define MALLOCDBG(x...) printk_spew(x)
#endif #endif
extern unsigned char _heap, _eheap; extern unsigned char _heap, _eheap;
static size_t free_mem_ptr = (size_t)&_heap; /* Start of heap */ static void *free_mem_ptr = &_heap; /* Start of heap */
static size_t free_mem_end_ptr = (size_t)&_eheap; /* End of heap */ static void *free_mem_end_ptr = &_eheap; /* End of heap */
void malloc_mark(malloc_mark_t *place) void malloc_mark(malloc_mark_t *place)
{ {
*place = free_mem_ptr; *place = (malloc_mark_t)free_mem_ptr;
printk_spew("malloc_mark 0x%08lx\n", (unsigned long)free_mem_ptr); printk_spew("malloc_mark %p\n", free_mem_ptr);
} }
void malloc_release(malloc_mark_t *ptr) void malloc_release(malloc_mark_t *ptr)
{ {
free_mem_ptr = *ptr; free_mem_ptr = (void *)*ptr;
printk_spew("malloc_release 0x%08lx\n", (unsigned long)free_mem_ptr); printk_spew("malloc_release %p\n", free_mem_ptr);
} }
void *malloc(size_t size) void *malloc(size_t size)
{ {
void *p; void *p;
MALLOCDBG(("%s Enter, size %ld, free_mem_ptr 0x%08lx\n", __func__, size, free_mem_ptr)); MALLOCDBG("%s Enter, size %ld, free_mem_ptr %p\n", __func__, size, free_mem_ptr);
if (size < 0) if (size < 0)
die("Error! malloc: Size < 0"); die("Error! malloc: Size < 0");
if (free_mem_ptr <= 0) if (free_mem_ptr <= 0)
die("Error! malloc: Free_mem_ptr <= 0"); die("Error! malloc: Free_mem_ptr <= 0");
free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */ free_mem_ptr = (void *)(((unsigned long)free_mem_ptr + 3) & ~3); /* Align */
p = (void *) free_mem_ptr; p = (void *) free_mem_ptr;
free_mem_ptr += size; free_mem_ptr += size;
@ -41,7 +41,7 @@ void *malloc(size_t size)
if (free_mem_ptr >= free_mem_end_ptr) if (free_mem_ptr >= free_mem_end_ptr)
die("Error! malloc: free_mem_ptr >= free_mem_end_ptr"); die("Error! malloc: free_mem_ptr >= free_mem_end_ptr");
MALLOCDBG(("malloc 0x%08lx\n", (unsigned long)p)); MALLOCDBG("malloc %p\n", p);
return p; return p;
} }