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

libpayload: Make heap code independent of its header size 

Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Change-Id: Ie69ceb343494b7dd309847b7d606cb47925f68b6
Reviewed-on: http://review.coreboot.org/3888
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Nico Huber 2013-06-14 15:26:49 +02:00 committed by Nico Huber
parent 0306b50280
commit 2d4b4cafe6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,11 +51,12 @@ static void *hstart = (void *)&_heap;
static void *hend = (void *)&_eheap;
typedef unsigned int hdrtype_t;
#define HDRSIZE (sizeof(hdrtype_t))
#define MAGIC (0x2a << 26)
#define FLAG_FREE (1 << 25)
#define SIZE_BITS 25
#define MAX_SIZE ((1 << SIZE_BITS) - 1)
#define SIZE_BITS ((HDRSIZE << 3) - 7)
#define MAGIC (((hdrtype_t)0x2a) << (SIZE_BITS + 1))
#define FLAG_FREE (((hdrtype_t)0x01) << (SIZE_BITS + 0))
#define MAX_SIZE ((((hdrtype_t)0x01) << SIZE_BITS) - 1)
#define SIZE(_h) ((_h) & MAX_SIZE)
@ -64,8 +65,6 @@ typedef unsigned int hdrtype_t;
#define FREE_BLOCK(_s) _HEADER(_s, FLAG_FREE)
#define USED_BLOCK(_s) _HEADER(_s, 0)
#define HDRSIZE (sizeof(hdrtype_t))
#define IS_FREE(_h) (((_h) & (MAGIC | FLAG_FREE)) == (MAGIC | FLAG_FREE))
#define HAS_MAGIC(_h) (((_h) & MAGIC) == MAGIC)
@ -93,7 +92,7 @@ static void *alloc(int len)
hdrtype_t volatile *ptr = (hdrtype_t volatile *) hstart;
/* Align the size. */
len = (len + 3) & ~3;
len = (len + HDRSIZE - 1) & ~(HDRSIZE - 1);
if (!len || len > MAX_SIZE)
return (void *)NULL;