Imported from ../bash-2.01.tar.gz.

3 files changed, 106 insertions, 34 deletions

diff --git a/lib/malloc/Makefile.in b/lib/malloc/Makefile.in
index 6bba7d1..0842f92 100644
--- a/lib/malloc/Makefile.in
+++ b/lib/malloc/Makefile.in
@@ -17,16 +17,20 @@ RM = rm -f
 CP = cp
 MV = mv
 
+PROFILE_FLAGS = 
+
 CFLAGS = @CFLAGS@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 
 DEFS = @DEFS@
+LOCAL_DEFS = @LOCAL_DEFS@
 
 INCLUDES = -I. -I../.. -I$(topdir) -I$(topdir)/lib
 
-CCFLAGS = ${INCLUDES} $(DEFS) $(LOCAL_CFLAGS) $(CFLAGS) $(MALLOC_CFLAGS) $(CPPFLAGS)
+CCFLAGS = ${PROFILE_FLAGS} ${INCLUDES} $(DEFS) $(LOCAL_DEFS) $(LOCAL_CFLAGS) \
+	  $(CFLAGS) $(MALLOC_CFLAGS) $(CPPFLAGS)
 
 .c.o:
 	$(CC) $(CCFLAGS) -c $<
@@ -35,6 +39,9 @@ CCFLAGS = ${INCLUDES} $(DEFS) $(LOCAL_CFLAGS) $(CFLAGS) $(MALLOC_CFLAGS) $(CPPFL
 	$(CC) $(CCFLAGS) -c $<
 
 MALLOC_SOURCE = malloc.c
+GMALLOC_SOURCE = gmalloc.c
+NMALLOC_SOURCE = nmalloc.c
+STUB_SOURCE = stub.c
 
 ALLOCA_SOURCE = alloca.c
 ALLOCA_OBJECT = alloca.o
@@ -43,12 +50,46 @@ MALLOC_SRC = @MALLOC_SRC@
 MALLOC = @MALLOC@
 ALLOCA = @ALLOCA@
 
-libmalloc.a:	$(MALLOC) $(ALLOCA) stub.o
-	$(RM) $@
-	$(AR) cr $@ $(MALLOC) $(ALLOCA) stub.o
-	-test -n "$(RANLIB)" && $(RANLIB) $@
+MALLOC_OBJS = malloc.o $(ALLOCA) stub.o
+GMALLOC_OBJS = gmalloc.o $(ALLOCA) stub.o
+NMALLOC_OBJS = nmalloc.o $(ALLOCA) stub.o
+NMALLOC2_OBJS = nmalloc2.o $(ALLOCA) stub.o
+NGMALLOC_OBJS = ngmalloc.o $(ALLOCA) stub.o
+STUB_OBJS = $(ALLOCA) stub.o
+
+.PHONY:		malloc gmalloc stubmalloc nmalloc ngmalloc nmalloc2
+
+all:		malloc
+
+malloc: ${MALLOC_OBJS}
+	${RM} libmalloc.a
+	${AR} cr libmalloc.a ${MALLOC_OBJS}
+	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
+
+nmalloc: ${NMALLOC_OBJS}
+	${RM} libmalloc.a
+	${AR} cr libmalloc.a ${NMALLOC_OBJS}
+	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
-malloc.o: malloc.c getpagesize.h
+nmalloc2: ${NMALLOC2_OBJS}
+	${RM} libmalloc.a
+	${AR} cr libmalloc.a ${NMALLOC2_OBJS}
+	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
+
+gmalloc: ${GMALLOC_OBJS}
+	${RM} libmalloc.a
+	${AR} cr libmalloc.a ${GMALLOC_OBJS}
+	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
+
+ngmalloc: ${NGMALLOC_OBJS}
+	${RM} libmalloc.a
+	${AR} cr libmalloc.a ${NGMALLOC_OBJS}
+	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
+
+stubmalloc: ${STUB_OBJS}
+	${RM} libmalloc.a
+	${AR} cr libmalloc.a ${STUB_OBJS}
+	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
 alloca.o:	$(ALLOCA_SOURCE)
 	$(CC) $(CCFLAGS) -c $(ALLOCA_SOURCE)
@@ -62,7 +103,12 @@ mostlyclean clean:
 distclean realclean maintainer-clean: clean
 	$(RM) Makefile
 
+malloc.o: malloc.c
+gmalloc.o: gmalloc.c
+
 alloca.o: $(BUILD_DIR)/config.h
-malloc.o: $(BUILD_DIR)/config.h
-xmalloc.o: $(BUILD_DIR)/config.h
+malloc.o: $(BUILD_DIR)/config.h $(topdir)/bashtypes.h getpagesize.h
+nmalloc.o: $(BUILD_DIR)/config.h $(topdir)/bashtypes.h getpagesize.h
+nmalloc2.o: $(BUILD_DIR)/config.h $(topdir)/bashtypes.h getpagesize.h
+xmalloc.o: $(BUILD_DIR)/config.h $(topdir)/ansi_stdlib.h
 gmalloc.o: $(BUILD_DIR)/config.h
diff --git a/lib/malloc/getpagesize.h b/lib/malloc/getpagesize.h
index 0cb4416..0b75b89 100644
--- a/lib/malloc/getpagesize.h
+++ b/lib/malloc/getpagesize.h
@@ -19,6 +19,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #  include <unistd.h>
 #  if defined (_SC_PAGESIZE)
 #    define getpagesize() sysconf(_SC_PAGESIZE)
+#  else
+#    if defined (_SC_PAGE_SIZE)
+#      define getpagesize() sysconf(_SC_PAGE_SIZE)
+#    endif /* _SC_PAGE_SIZE */
 #  endif /* _SC_PAGESIZE */
 #endif
 
diff --git a/lib/malloc/malloc.c b/lib/malloc/malloc.c
index 88217db..a8b232a 100644
--- a/lib/malloc/malloc.c
+++ b/lib/malloc/malloc.c
@@ -74,7 +74,11 @@ what you give them.   Help stamp out software-hoarding!  */
 #endif
 
 /* Determine which kind of system this is.  */
-#include <sys/types.h>
+#if defined (SHELL)
+#  include "bashtypes.h"
+#else
+#  include <sys/types.h>
+#endif
 #include <signal.h>
 
 /* Define getpagesize () if the system does not.  */
@@ -93,6 +97,20 @@ what you give them.   Help stamp out software-hoarding!  */
 #  undef HAVE_RESOURCE
 #endif
 
+#if __GNUC__ > 1
+#  define FASTCOPY(s, d, n)  __builtin_memcpy (d, s, n)
+#else /* !__GNUC__ */
+#  if !defined (HAVE_BCOPY)
+#    if !defined (HAVE_MEMMOVE)
+#      define FASTCOPY(s, d, n)  memcpy (d, s, n)
+#    else
+#      define FASTCOPY(s, d, n)  memmove (d, s, n)
+#    endif /* !HAVE_MEMMOVE */
+#  else /* HAVE_BCOPY */
+#    define FASTCOPY(s, d, n)  bcopy (s, d, n)
+#  endif /* HAVE_BCOPY */
+#endif /* !__GNUC__ */
+
 #if !defined (NULL)
 #  define NULL 0
 #endif
@@ -138,10 +156,10 @@ struct mhead {
 	char     mh_index;	/* index in nextf[] */
 /* Remainder are valid only when block is allocated */
 	unsigned short mh_size;	/* size, if < 0x10000 */
-#ifdef rcheck
+#ifdef RCHECK
 	unsigned int mh_nbytes;	/* number of bytes allocated */
 	int      mh_magic4;	/* should be == MAGIC4 */
-#endif /* rcheck */
+#endif /* RCHECK */
 };
 
 /* Access free-list pointer of a block.
@@ -154,10 +172,12 @@ struct mhead {
 #define CHAIN(a) \
   (*(struct mhead **) (sizeof (char *) + (char *) (a)))
 
-#ifdef rcheck
+#ifdef RCHECK
 #  include <stdio.h>
 #  if !defined (botch)
 #    define botch(x) abort ()
+#  else
+extern void botch();
 #  endif /* botch */
 
 #  if !defined (__STRING)
@@ -178,10 +198,10 @@ struct mhead {
 #  define MAGIC4 0x55555555
 #  define ASSERT(p) if (!(p)) botch(__STRING(p)); else
 #  define EXTRA  4		/* 4 bytes extra for MAGIC1s */
-#else /* !rcheck */
+#else /* !RCHECK */
 #  define ASSERT(p)
 #  define EXTRA  0
-#endif /* rcheck */
+#endif /* RCHECK */
 
 /* nextf[i] is free list of blocks of size 2**(i + 3)  */
 
@@ -441,15 +461,15 @@ malloc (n)		/* get a block */
   /* If not for this check, we would gobble a clobbered free chain ptr */
   /* and bomb out on the NEXT allocate of this size block */
   if (p -> mh_alloc != ISFREE || p -> mh_index != nunits)
-#ifdef rcheck
+#ifdef RCHECK
     botch ("block on free list clobbered");
-#else /* not rcheck */
+#else /* not RCHECK */
     abort ();
-#endif /* not rcheck */
+#endif /* not RCHECK */
 
   /* Fill in the info, and if range checking, set up the magic numbers */
   p -> mh_alloc = ISALLOC;
-#ifdef rcheck
+#ifdef RCHECK
   p -> mh_nbytes = n;
   p -> mh_magic4 = MAGIC4;
   {
@@ -457,9 +477,9 @@ malloc (n)		/* get a block */
 
     *m++ = MAGIC1, *m++ = MAGIC1, *m++ = MAGIC1, *m = MAGIC1;
   }
-#else /* not rcheck */
+#else /* not RCHECK */
   p -> mh_size = n;
-#endif /* not rcheck */
+#endif /* not RCHECK */
 #ifdef MEMSCRAMBLE
   zmemset ((char *)(p + 1), 0xdf, n);	/* scramble previous contents */
 #endif
@@ -485,17 +505,19 @@ free (mem)
 
     if (p -> mh_alloc == ISMEMALIGN)
       {
-#ifdef rcheck
+#ifdef RCHECK
 	ap -= p->mh_nbytes;
+#else
+	ap -= p->mh_size;	/* XXX */
 #endif
 	p = (struct mhead *) ap - 1;
       }
 
-#ifndef rcheck
+#ifndef RCHECK
     if (p -> mh_alloc != ISALLOC)
       abort ();
 
-#else /* rcheck */
+#else /* RCHECK */
     if (p -> mh_alloc != ISALLOC)
       {
 	if (p -> mh_alloc == ISFREE)
@@ -508,17 +530,17 @@ free (mem)
     ap += p -> mh_nbytes;
     ASSERT (*ap++ == MAGIC1); ASSERT (*ap++ == MAGIC1);
     ASSERT (*ap++ == MAGIC1); ASSERT (*ap   == MAGIC1);
-#endif /* rcheck */
+#endif /* RCHECK */
   }
 #ifdef MEMSCRAMBLE
   {
     register int n;
     
-#ifdef rcheck
+#ifdef RCHECK
     n = p->mh_nbytes;
-#else /* not rcheck */
+#else /* not RCHECK */
     n = p->mh_size;
-#endif /* not rcheck */
+#endif /* not RCHECK */
     zmemset (mem, 0xcf, n);
   }
 #endif
@@ -557,19 +579,19 @@ realloc (mem, n)
   p--;
   nunits = p -> mh_index;
   ASSERT (p -> mh_alloc == ISALLOC);
-#ifdef rcheck
+#ifdef RCHECK
   ASSERT (p -> mh_magic4 == MAGIC4);
   {
     register char *m = mem + (tocopy = p -> mh_nbytes);
     ASSERT (*m++ == MAGIC1); ASSERT (*m++ == MAGIC1);
     ASSERT (*m++ == MAGIC1); ASSERT (*m   == MAGIC1);
   }
-#else /* not rcheck */
+#else /* not RCHECK */
   if (p -> mh_index >= 13)
     tocopy = (1 << (p -> mh_index + 3)) - sizeof *p;
   else
     tocopy = p -> mh_size;
-#endif /* not rcheck */
+#endif /* not RCHECK */
 
   /* See if desired size rounds to same power of 2 as actual size. */
   nbytes = (n + sizeof *p + EXTRA + 7) & ~7;
@@ -577,15 +599,15 @@ realloc (mem, n)
   /* If ok, use the same block, just marking its size as changed.  */
   if (nbytes > (4 << nunits) && nbytes <= (8 << nunits))
     {
-#ifdef rcheck
+#ifdef RCHECK
       register char *m = mem + tocopy;
       *m++ = 0;  *m++ = 0;  *m++ = 0;  *m++ = 0;
       p-> mh_nbytes = n;
       m = mem + n;
       *m++ = MAGIC1;  *m++ = MAGIC1;  *m++ = MAGIC1;  *m++ = MAGIC1;
-#else /* not rcheck */
+#else /* not RCHECK */
       p -> mh_size = n;
-#endif /* not rcheck */
+#endif /* not RCHECK */
       return mem;
     }
 
@@ -596,7 +618,7 @@ realloc (mem, n)
 
     if ((new = malloc (n)) == 0)
       return 0;
-    bcopy (mem, new, tocopy);
+    FASTCOPY (mem, new, tocopy);
     free (mem);
     return new;
   }