use pointers instead of size_t when dealing with pointers. Also fix a few
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:
parent
f8c77e82c5
commit
054c7235c3
|
@ -4,36 +4,36 @@
|
|||
#if 0
|
||||
#define MALLOCDBG(x)
|
||||
#else
|
||||
#define MALLOCDBG(x) printk_spew x
|
||||
#define MALLOCDBG(x...) printk_spew(x)
|
||||
#endif
|
||||
extern unsigned char _heap, _eheap;
|
||||
static size_t free_mem_ptr = (size_t)&_heap; /* Start of heap */
|
||||
static size_t free_mem_end_ptr = (size_t)&_eheap; /* End of heap */
|
||||
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 = free_mem_ptr;
|
||||
printk_spew("malloc_mark 0x%08lx\n", (unsigned long)free_mem_ptr);
|
||||
*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 = *ptr;
|
||||
printk_spew("malloc_release 0x%08lx\n", (unsigned long)free_mem_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 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)
|
||||
die("Error! malloc: Size < 0");
|
||||
if (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;
|
||||
free_mem_ptr += size;
|
||||
|
@ -41,7 +41,7 @@ void *malloc(size_t size)
|
|||
if (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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue