diff options
| author | hpa <hpa> | 2004-12-18 22:56:01 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2004-12-18 22:56:01 +0000 |
| commit | c854c3a8224da9dfa30d583edef6bc1b92b17aeb (patch) | |
| tree | d67234518bef4e3a0d4b5913eaf124b9d3b3197f /com32 | |
| parent | 5e9b05475246cd32b5c6d4a79b3f1817b92b7bce (diff) | |
| download | syslinux-c854c3a8224da9dfa30d583edef6bc1b92b17aeb.tar.gz | |
Fix handling of alignment issues
Diffstat (limited to 'com32')
| -rw-r--r-- | com32/lib/malloc.c | 2 | ||||
| -rw-r--r-- | com32/lib/malloc.h | 6 | ||||
| -rw-r--r-- | com32/modules/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/com32/lib/malloc.c b/com32/lib/malloc.c index e7a1cdc9..8f6d97d6 100644 --- a/com32/lib/malloc.c +++ b/com32/lib/malloc.c @@ -105,7 +105,7 @@ void *malloc(size_t size) return NULL; /* Add the obligatory arena header, and round up */ - size = (size+2*sizeof(struct arena_header)-1) & ARENA_SIZE_MASK; + size = (size+2*sizeof(struct arena_header)-1) & ~ARENA_SIZE_MASK; for ( fp = __malloc_head.next_free ; fp->a.type != ARENA_TYPE_HEAD ; fp = fp->next_free ) { diff --git a/com32/lib/malloc.h b/com32/lib/malloc.h index 57b76526..70d0e635 100644 --- a/com32/lib/malloc.h +++ b/com32/lib/malloc.h @@ -37,10 +37,10 @@ struct arena_header { #define ARENA_TYPE_HEAD 2 #endif -#define ARENA_SIZE_MASK (~(sizeof(struct arena_header)-1)) +#define ARENA_SIZE_MASK (sizeof(struct arena_header)-1) -#define ARENA_ALIGN_UP(p) ((char *)(((uintptr_t)(p) + ARENA_SIZE_MASK) & ARENA_SIZE_MASK)) -#define ARENA_ALIGN_DOWN(p) ((char *)((uintptr_t)(p) & ARENA_SIZE_MASK)) +#define ARENA_ALIGN_UP(p) ((char *)(((uintptr_t)(p) + ARENA_SIZE_MASK) & ~ARENA_SIZE_MASK)) +#define ARENA_ALIGN_DOWN(p) ((char *)((uintptr_t)(p) & ~ARENA_SIZE_MASK)) /* * This structure should be no more than twice the size of the diff --git a/com32/modules/Makefile b/com32/modules/Makefile index e5d1dfa7..4b6f335e 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -45,7 +45,7 @@ AUXDIR = $(LIBDIR)/syslinux INCDIR = /usr/include COM32DIR = $(AUXDIR)/com32 -MODULES = chain.c32 +MODULES = chain.c32 menu.c32 menu.lnx all: $(MODULES) |