From b7f893cc42716cf360d0ac23ed7bf3d44c1251dc Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Wed, 4 Sep 2002 20:12:44 +0000 Subject: Per discussions with Erik, 'valloc.c' should be built on top of whichever memory allocator you choose. Unfortunately, the 'malloc-930716' needs a fair amount of work before it is functional. For now, changes have been made to add the 'valloc' call and it works properly with the plain 'malloc' allocator. --- libc/stdlib/Makefile | 3 +- libc/stdlib/malloc-930716/Makefile | 2 +- libc/stdlib/malloc-930716/valloc.c | 61 -------------------------------------- libc/stdlib/valloc.c | 61 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 63 deletions(-) delete mode 100644 libc/stdlib/malloc-930716/valloc.c create mode 100644 libc/stdlib/valloc.c (limited to 'libc') diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile index 91a855f6f..14ac93f51 100644 --- a/libc/stdlib/Makefile +++ b/libc/stdlib/Makefile @@ -46,7 +46,8 @@ CSRC = abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c mkstemp64.c \ getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c drand48.c \ drand48-iter.c drand48_r.c erand48.c erand48_r.c jrand48.c \ jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c \ - nrand48.c nrand48_r.c rand_r.c srand48.c srand48_r.c calloc.c + nrand48.c nrand48_r.c rand_r.c srand48.c srand48_r.c calloc.c \ + valloc.c ifeq ($(HAS_FLOATING_POINT),true) CSRC += strtod.c strtof.c strtold.c endif diff --git a/libc/stdlib/malloc-930716/Makefile b/libc/stdlib/malloc-930716/Makefile index 2e3ee21a7..cc746707e 100644 --- a/libc/stdlib/malloc-930716/Makefile +++ b/libc/stdlib/malloc-930716/Makefile @@ -25,7 +25,7 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak # calloc.c can be found at uClibc/libc/stdlib/calloc.c -CSRC=malloc.c valloc.c +CSRC=malloc.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) diff --git a/libc/stdlib/malloc-930716/valloc.c b/libc/stdlib/malloc-930716/valloc.c deleted file mode 100644 index bfb9efd2a..000000000 --- a/libc/stdlib/malloc-930716/valloc.c +++ /dev/null @@ -1,61 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* Allocate memory on a page boundary. - Copyright (C) 1991, 1992 Free Software Foundation, Inc. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with this library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. - - The author may be reached (Email) at the address mike@@ai.mit.edu, - or (US mail) as Mike Haertel c/o Free Software Foundation. */ - -#include -#include "malloc.h" - -#ifdef emacs -#include "config.h" -#endif - -#ifdef __GNU_LIBRARY__ -extern size_t __getpagesize __P ((void)); -#else -#ifndef USG -extern size_t getpagesize __P ((void)); -#define __getpagesize() getpagesize() -#else -#include -#ifdef EXEC_PAGESIZE -#define __getpagesize() EXEC_PAGESIZE -#else /* No EXEC_PAGESIZE. */ -#ifdef NBPG -#ifndef CLSIZE -#define CLSIZE 1 -#endif /* No CLSIZE. */ -#define __getpagesize() (NBPG * CLSIZE) -#else /* No NBPG. */ -#define __getpagesize() NBPC -#endif /* NBPG. */ -#endif /* EXEC_PAGESIZE. */ -#endif /* USG. */ -#endif - -static size_t pagesize; - -__ptr_t valloc (size_t size) -{ - if (pagesize == 0) - pagesize = __getpagesize (); - - return memalign (pagesize, size); -} diff --git a/libc/stdlib/valloc.c b/libc/stdlib/valloc.c new file mode 100644 index 000000000..bfb9efd2a --- /dev/null +++ b/libc/stdlib/valloc.c @@ -0,0 +1,61 @@ +/* vi: set sw=4 ts=4: */ +/* Allocate memory on a page boundary. + Copyright (C) 1991, 1992 Free Software Foundation, Inc. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. + + The author may be reached (Email) at the address mike@@ai.mit.edu, + or (US mail) as Mike Haertel c/o Free Software Foundation. */ + +#include +#include "malloc.h" + +#ifdef emacs +#include "config.h" +#endif + +#ifdef __GNU_LIBRARY__ +extern size_t __getpagesize __P ((void)); +#else +#ifndef USG +extern size_t getpagesize __P ((void)); +#define __getpagesize() getpagesize() +#else +#include +#ifdef EXEC_PAGESIZE +#define __getpagesize() EXEC_PAGESIZE +#else /* No EXEC_PAGESIZE. */ +#ifdef NBPG +#ifndef CLSIZE +#define CLSIZE 1 +#endif /* No CLSIZE. */ +#define __getpagesize() (NBPG * CLSIZE) +#else /* No NBPG. */ +#define __getpagesize() NBPC +#endif /* NBPG. */ +#endif /* EXEC_PAGESIZE. */ +#endif /* USG. */ +#endif + +static size_t pagesize; + +__ptr_t valloc (size_t size) +{ + if (pagesize == 0) + pagesize = __getpagesize (); + + return memalign (pagesize, size); +} -- cgit v1.2.3