GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

The previous commit was incomplete and missed setting the entire
alloc area.

There are also additional problems with gcc optimizations of the
pointer math. The "auto" casting by gcc wouldn't return warnings,
but it was causing the optimization to be incorrect. We are now
very explicit in the casting in the pointer math.

Change-Id: I020808c8d1dda544fe862b9efb0e5345eeab5aab
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/804
Tested-by: build bot (Jenkins)
Reviewed-by: Peter Stuge <peter@stuge.se>
This commit is contained in:
Marc Jones 2012-03-20 16:53:44 -06:00 committed by Peter Stuge
parent 06253cd9a5
commit ccee6256b4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
payloads/libpayload/libc/malloc.c
View File

@ -96,7 +96,7 @@ static void *alloc(int len)
/* Make sure the region is setup correctly. */ /* Make sure the region is setup correctly. */
if (!HAS_MAGIC(*ptr)) if (!HAS_MAGIC(*ptr))
setup(ptr, len); setup(ptr, (int)((&_eheap - &_heap) - HDRSIZE));
/* Find some free space. */ /* Find some free space. */
do { do {
@ -112,7 +112,7 @@ static void *alloc(int len)
if (header & FLAG_FREE) { if (header & FLAG_FREE) {
if (len <= size) { if (len <= size) {
hdrtype_t volatile *nptr = ptr + (HDRSIZE + len); hdrtype_t volatile *nptr = (hdrtype_t volatile *)((int)ptr + HDRSIZE + len);
int nsize = size - (HDRSIZE + len); int nsize = size - (HDRSIZE + len);
/* If there is still room in this block, /* If there is still room in this block,
@ -131,11 +131,11 @@ static void *alloc(int len)
*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 < (hdrtype_t *) hend); } while (ptr < (hdrtype_t *) hend);
@ -422,7 +422,7 @@ void print_malloc_map(void)
if (free_memory && (minimal_free > free_memory)) if (free_memory && (minimal_free > 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); (unsigned int)(&_eheap - &_heap) - HDRSIZE - minimal_free);
} }
#endif #endif