Fix libpayload alloc() size and gcc pointer optimization problems.

[coreboot.git] / payloads / libpayload / libc / malloc.c

diff --git a/payloads/libpayload/libc/malloc.c b/payloads/libpayload/libc/malloc.c
index 9e1dd2e575ee470809fc61623d0779211f10bf3b..3c5a3fd2a2c7b4b9a29fa4b2051a8926ca10f43b 100644 (file)
--- a/payloads/libpayload/libc/malloc.c
+++ b/payloads/libpayload/libc/malloc.c
@@ -73,11 +73,9 @@ static int heap_initialized = 0;
 static int minimal_free = 0;
 #endif
 
-static void setup(void)
+static void setup(hdrtype_t volatile *start, int size)
 {
-       int size = (unsigned int)(&_eheap - &_heap) - HDRSIZE;
-
-       *((hdrtype_t *) hstart) = FREE_BLOCK(size);
+       *start = FREE_BLOCK(size);
 
 #ifdef CONFIG_DEBUG_MALLOC
        heap_initialized = 1;
@@ -88,7 +86,7 @@ static void setup(void)
 static void *alloc(int len)
 {
        hdrtype_t header;
-       void *ptr = hstart;
+       hdrtype_t volatile *ptr = (hdrtype_t volatile *) hstart;
 
        /* Align the size. */
        len = (len + 3) & ~3;
@@ -97,12 +95,12 @@ static void *alloc(int len)
                return (void *)NULL;
 
        /* Make sure the region is setup correctly. */
-       if (!HAS_MAGIC(*((hdrtype_t *) ptr)))
-               setup();
+       if (!HAS_MAGIC(*ptr))
+               setup(ptr, (int)((&_eheap - &_heap) - HDRSIZE));
 
        /* Find some free space. */
        do {
-               header = *((hdrtype_t *) ptr);
+               header = *ptr;
                int size = SIZE(header);
 
                if (!HAS_MAGIC(header) || size == 0) {
@@ -114,7 +112,7 @@ static void *alloc(int len)
 
                if (header & FLAG_FREE) {
                        if (len <= size) {
-                               void *nptr = ptr + (HDRSIZE + len);
+                               hdrtype_t volatile *nptr = (hdrtype_t volatile *)((int)ptr + HDRSIZE + len);
                                int nsize = size - (HDRSIZE + len);
 
                                /* If there is still room in this block,
@@ -124,23 +122,22 @@ static void *alloc(int len)
 
                                if (nsize > 0) {
                                        /* Mark the block as used. */
-                                       *((hdrtype_t *) ptr) = USED_BLOCK(len);
+                                       *ptr = USED_BLOCK(len);
 
                                        /* Create a new free block. */
-                                       *((hdrtype_t *) nptr) =
-                                           FREE_BLOCK(nsize);
+                                       *nptr = FREE_BLOCK(nsize);
                                } else {
                                        /* Mark the block as used. */
-                                       *((hdrtype_t *) ptr) = USED_BLOCK(size);
+                                       *ptr = USED_BLOCK(size);
                                }
 
-                               return (void *)(ptr + HDRSIZE);
+                               return (void *)((int)ptr + HDRSIZE);
                        }
                }
 
-               ptr += HDRSIZE + size;
+               ptr = (hdrtype_t volatile *)((int)ptr + HDRSIZE + size);
 
-       } while (ptr < hend);
+       } while (ptr < (hdrtype_t *) hend);
 
        /* Nothing available. */
        return (void *)NULL;
@@ -286,10 +283,10 @@ static struct align_region_t *allocate_region(int alignment, int num_elements)
 {
        struct align_region_t *new_region;
 #ifdef CONFIG_DEBUG_MALLOC
-       printf("%s(old align_regions=%p, alignment=%u, num_elements=%u)\n", 
+       printf("%s(old align_regions=%p, alignment=%u, num_elements=%u)\n",
                        __func__, align_regions, alignment, num_elements);
 #endif
-       
+
        new_region = malloc(sizeof(struct align_region_t));
 
        if (!new_region)
@@ -342,7 +339,7 @@ void *memalign(size_t align, size_t size)
                memset(align_regions, 0, sizeof(struct align_region_t));
        }
        struct align_region_t *reg = align_regions;
-look_further:  
+look_further:
        while (reg != 0)
        {
                if ((reg->alignment == align) && (reg->free >= (size + align - 1)/align))
@@ -425,7 +422,7 @@ void print_malloc_map(void)
 
        if (free_memory && (minimal_free > free_memory))
                minimal_free = free_memory;
-       printf("Maximum memory consumption: %d bytes",
+       printf("Maximum memory consumption: %d bytes\n",
                (unsigned int)(&_eheap - &_heap) - HDRSIZE - minimal_free);
 }
 #endif