[coreboot] r3976 - trunk/coreboot-v2/src/lib

Author: stepan
Date: 2009-03-06 18:22:35 +0100 (Fri, 06 Mar 2009)
New Revision: 3976

Modified:
   trunk/coreboot-v2/src/lib/malloc.c
Log:
use pointers instead of size_t when dealing with pointers. Also fix a few
warnings (trivial)

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/lib/malloc.c
===================================================================
--- trunk/coreboot-v2/src/lib/malloc.c	2009-03-06 17:21:23 UTC (rev 3975)
+++ trunk/coreboot-v2/src/lib/malloc.c	2009-03-06 17:22:35 UTC (rev 3976)
@@ -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 @@
    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;
 }