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

Make libpayload alloc() memory pointers volatile 

gcc4.6.2 was optimizing the libpayload alloc() function and failing to
reload a pointer after the memory had been manipulated by a pointer in
the inlined function setup(). Change the pointer type to volatile
and now pass it to the setup() function. Also clean up the
declaration so that it isn't cast a bunch times in the function.

Change-Id: I1637bd7bd5d9cf82ac88925cbfe76d319aa3cd82
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/705
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Marc Jones 2012-03-01 16:12:11 -07:00 committed by Patrick Georgi
parent 32829caf40
commit 987e883e6a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,11 +73,9 @@ static int heap_initialized = 0;
static int minimal_free = 0; static int minimal_free = 0;
#endif #endif
static void setup(void) static void setup(hdrtype_t volatile *start, int size)
{ {
int size = (unsigned int)(&_eheap - &_heap) - HDRSIZE; *start = FREE_BLOCK(size);
*((hdrtype_t *) hstart) = FREE_BLOCK(size);
#ifdef CONFIG_DEBUG_MALLOC #ifdef CONFIG_DEBUG_MALLOC
heap_initialized = 1; heap_initialized = 1;
@ -88,7 +86,7 @@ static void setup(void)
static void *alloc(int len) static void *alloc(int len)
{ {
hdrtype_t header; hdrtype_t header;
void *ptr = hstart; hdrtype_t volatile *ptr = (hdrtype_t volatile *) hstart;
/* Align the size. */ /* Align the size. */
len = (len + 3) & ~3; len = (len + 3) & ~3;
@ -97,12 +95,12 @@ static void *alloc(int len)
return (void *)NULL; return (void *)NULL;
/* Make sure the region is setup correctly. */ /* Make sure the region is setup correctly. */
if (!HAS_MAGIC(*((hdrtype_t *) ptr))) if (!HAS_MAGIC(*ptr))
setup(); setup(ptr, len);
/* Find some free space. */ /* Find some free space. */
do { do {
header = *((hdrtype_t *) ptr); header = *ptr;
int size = SIZE(header); int size = SIZE(header);
if (!HAS_MAGIC(header) || size == 0) { if (!HAS_MAGIC(header) || size == 0) {
@ -114,7 +112,7 @@ static void *alloc(int len)
if (header & FLAG_FREE) { if (header & FLAG_FREE) {
if (len <= size) { if (len <= size) {
void *nptr = ptr + (HDRSIZE + len); hdrtype_t volatile *nptr = 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,
@ -124,14 +122,13 @@ static void *alloc(int len)
if (nsize > 0) { if (nsize > 0) {
/* Mark the block as used. */ /* Mark the block as used. */
*((hdrtype_t *) ptr) = USED_BLOCK(len); *ptr = USED_BLOCK(len);
/* Create a new free block. */ /* Create a new free block. */
*((hdrtype_t *) nptr) = *nptr = FREE_BLOCK(nsize);
FREE_BLOCK(nsize);
} else { } else {
/* Mark the block as used. */ /* Mark the block as used. */
*((hdrtype_t *) ptr) = USED_BLOCK(size); *ptr = USED_BLOCK(size);
} }
return (void *)(ptr + HDRSIZE); return (void *)(ptr + HDRSIZE);
@ -140,7 +137,7 @@ static void *alloc(int len)
ptr += HDRSIZE + size; ptr += HDRSIZE + size;
} while (ptr < hend); } while (ptr < (hdrtype_t *) hend);
/* Nothing available. */ /* Nothing available. */
return (void *)NULL; return (void *)NULL;