From 4b0fc33d4984f6a354749cd8fde6480f47ab9d37 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 7 Jul 2005 05:13:25 +0000 Subject: Yoshinori Sato writes: Dont forgive that length of munmap is "0" in current nommu. This purpose cannot free memory area really. It is a patch to work out a solution. --- libc/stdlib/malloc-simple/alloc.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'libc/stdlib/malloc-simple') diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c index 68cd77665..e017b6cbb 100644 --- a/libc/stdlib/malloc-simple/alloc.c +++ b/libc/stdlib/malloc-simple/alloc.c @@ -1,6 +1,6 @@ /* alloc.c * - * Written by Erik Andersen + * Written by Erik Andersen * LGPLv2 * * Parts of the memalign code were stolen from malloc-930716. @@ -32,19 +32,17 @@ void *malloc(size_t size) } #ifdef __ARCH_HAS_MMU__ +#define MMAP_FLAGS MAP_PRIVATE | MAP_ANONYMOUS +#else +#define MMAP_FLAGS MAP_SHARED | MAP_ANONYMOUS +#endif + result = mmap((void *) 0, size + sizeof(size_t), PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); + MMAP_FLAGS, 0, 0); if (result == MAP_FAILED) return 0; * (size_t *) result = size; return(result + sizeof(size_t)); -#else - result = mmap((void *) 0, size, PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS, 0, 0); - if (result == MAP_FAILED) - return 0; - return(result); -#endif } #endif @@ -88,11 +86,7 @@ void *realloc(void *ptr, size_t size) newptr = malloc(size); if (newptr) { memcpy(newptr, ptr, -#ifdef __ARCH_HAS_MMU__ *((size_t *) (ptr - sizeof(size_t))) -#else - size -#endif ); free(ptr); } @@ -111,12 +105,8 @@ void free(void *ptr) return; } } -#ifdef __ARCH_HAS_MMU__ ptr -= sizeof(size_t); munmap(ptr, * (size_t *) ptr + sizeof(size_t)); -#else - munmap(ptr, 0); -#endif } #endif @@ -154,12 +144,8 @@ int __libc_free_aligned(void *ptr) /* Mark the block as free */ l->aligned = NULL; ptr = l->exact; -#ifdef __ARCH_HAS_MMU__ ptr -= sizeof(size_t); munmap(ptr, * (size_t *) ptr + sizeof(size_t)); -#else - munmap(ptr, 0); -#endif return 1; } } @@ -203,4 +189,3 @@ void * memalign (size_t alignment, size_t size) return result; } #endif - -- cgit v1.2.3