perl5.000 patch.0i: fix glaring mistakes in patches a-h

[perl5.git] / malloc.c

diff --git a/malloc.c b/malloc.c
index b9ef54a..ef095c5 100644 (file)
--- a/malloc.c
+++ b/malloc.c
@@ -1,31 +1,8 @@
-/* $RCSfile: malloc.c,v $$Revision: 4.1 $$Date: 92/08/07 18:24:25 $
+/*    malloc.c
  *
- * $Log:       malloc.c,v $
- * Revision 4.1  92/08/07  18:24:25  lwall
- * 
- * Revision 4.0.1.4  92/06/08  14:28:38  lwall
- * patch20: removed implicit int declarations on functions
- * patch20: hash tables now split only if the memory is available to do so
- * patch20: realloc(0, size) now does malloc in case library routines call it
- * 
- * Revision 4.0.1.3  91/11/05  17:57:40  lwall
- * patch11: safe malloc code now integrated into Perl's malloc when possible
- * 
- * Revision 4.0.1.2  91/06/07  11:20:45  lwall
- * patch4: many, many itty-bitty portability fixes
- * 
- * Revision 4.0.1.1  91/04/11  17:48:31  lwall
- * patch1: Configure now figures out malloc ptr type
- * 
- * Revision 4.0  91/03/20  01:28:52  lwall
- * 4.0 baseline.
- * 
  */
 
 #ifndef lint
-/*SUPPRESS 592*/
-static char sccsid[] = "@(#)malloc.c   4.3 (Berkeley) 9/16/83";
-
 #ifdef DEBUGGING
 #define RCHECK
 #endif
@@ -44,9 +21,6 @@ static char sccsid[] = "@(#)malloc.c  4.3 (Berkeley) 9/16/83";
 #include "EXTERN.h"
 #include "perl.h"
 
-static int findbucket();
-static int morecore();
-
 /* I don't much care whether these are defined in sys/types.h--LAW */
 
 #define u_char unsigned char
@@ -64,7 +38,7 @@ static int morecore();
  */
 union  overhead {
        union   overhead *ov_next;      /* when free */
-#if ALIGNBYTES > 4
+#if MEM_ALIGNBYTES > 4
        double  strut;                  /* alignment problems */
 #endif
        struct {
@@ -81,8 +55,13 @@ union        overhead {
 #define        ov_rmagic       ovu.ovu_rmagic
 };
 
+#ifdef debug
+static void botch _((char *s));
+#endif
+static void morecore _((int bucket));
+static int findbucket _((union overhead *freep, int srchlen));
+
 #define        MAGIC           0xff            /* magic # on accounting info */
-#define OLDMAGIC       0x7f            /* same after a free() */
 #define RMAGIC         0x55555555      /* magic # on range info */
 #ifdef RCHECK
 #define        RSLOP           sizeof (u_int)
@@ -122,7 +101,7 @@ botch(s)
 #define        ASSERT(p)
 #endif
 
-MALLOCPTRTYPE *
+Malloc_t
 malloc(nbytes)
        register MEM_SIZE nbytes;
 {
@@ -143,7 +122,7 @@ malloc(nbytes)
 #endif /* MSDOS */
 #ifdef DEBUGGING
        if ((long)nbytes < 0)
-           fatal("panic: malloc");
+           croak("panic: malloc");
 #endif
 #endif /* safemalloc */
 
@@ -177,21 +156,15 @@ malloc(nbytes)
        }
 
 #ifdef safemalloc
-#if !(defined(I286) || defined(atarist))
-    DEBUG_m(fprintf(stderr,"0x%x: (%05d) malloc %ld bytes\n",p+1,an++,(long)size));
-#else
-    DEBUG_m(fprintf(stderr,"0x%lx: (%05d) malloc %ld bytes\n",p+1,an++,(long)size));
-#endif
+    DEBUG_m(fprintf(stderr,"0x%lx: (%05d) malloc %ld bytes\n",
+       (unsigned long)(p+1),an++,(long)size));
 #endif /* safemalloc */
 
        /* remove from linked list */
 #ifdef RCHECK
        if (*((int*)p) & (sizeof(union overhead) - 1))
-#if !(defined(I286) || defined(atarist))
-           fprintf(stderr,"Corrupt malloc ptr 0x%x at 0x%x\n",*((int*)p),p);
-#else
-           fprintf(stderr,"Corrupt malloc ptr 0x%lx at 0x%lx\n",*((int*)p),p);
-#endif
+           fprintf(stderr,"Corrupt malloc ptr 0x%lx at 0x%lx\n",
+               (unsigned long)*((int*)p),(unsigned long)p);
 #endif
        nextf[bucket] = p->ov_next;
        p->ov_magic = MAGIC;
@@ -209,13 +182,13 @@ malloc(nbytes)
        p->ov_rmagic = RMAGIC;
        *((u_int *)((caddr_t)p + nbytes - RSLOP)) = RMAGIC;
 #endif
-       return ((MALLOCPTRTYPE *)(p + 1));
+       return ((Malloc_t)(p + 1));
 }
 
 /*
  * Allocate more memory to the indicated bucket.
  */
-static
+static void
 morecore(bucket)
        register int bucket;
 {
@@ -282,18 +255,14 @@ morecore(bucket)
 
 void
 free(mp)
-       MALLOCPTRTYPE *mp;
+       Malloc_t mp;
 {   
        register MEM_SIZE size;
        register union overhead *op;
        char *cp = (char*)mp;
 
 #ifdef safemalloc
-#if !(defined(I286) || defined(atarist))
-       DEBUG_m(fprintf(stderr,"0x%x: (%05d) free\n",cp,an++));
-#else
-       DEBUG_m(fprintf(stderr,"0x%lx: (%05d) free\n",cp,an++));
-#endif
+    DEBUG_m(fprintf(stderr,"0x%lx: (%05d) free\n",(unsigned long)cp,an++));
 #endif /* safemalloc */
 
        if (cp == NULL)
@@ -303,16 +272,20 @@ free(mp)
        ASSERT(op->ov_magic == MAGIC);          /* make sure it was in use */
 #else
        if (op->ov_magic != MAGIC) {
+#ifdef RCHECK
                warn("%s free() ignored",
-                   op->ov_magic == OLDMAGIC ? "Duplicate" : "Bad");
+                   op->ov_rmagic == RMAGIC - 1 ? "Duplicate" : "Bad");
+#else
+               warn("Bad free() ignored");
+#endif
                return;                         /* sanity */
        }
-       op->ov_magic = OLDMAGIC;
 #endif
 #ifdef RCHECK
        ASSERT(op->ov_rmagic == RMAGIC);
        if (op->ov_index <= 13)
                ASSERT(*(u_int *)((caddr_t)op + op->ov_size + 1 - RSLOP) == RMAGIC);
+       op->ov_rmagic = RMAGIC - 1;
 #endif
        ASSERT(op->ov_index < NBUCKETS);
        size = op->ov_index;
@@ -336,9 +309,9 @@ free(mp)
  */
 int reall_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */
 
-MALLOCPTRTYPE *
+Malloc_t
 realloc(mp, nbytes)
-       MALLOCPTRTYPE *mp; 
+       Malloc_t mp; 
        MEM_SIZE nbytes;
 {   
        register MEM_SIZE onb;
@@ -363,7 +336,7 @@ realloc(mp, nbytes)
                return malloc(nbytes);
 #ifdef DEBUGGING
        if ((long)nbytes < 0)
-               fatal("panic: realloc");
+               croak("panic: realloc");
 #endif
 #endif /* safemalloc */
 
@@ -422,20 +395,14 @@ realloc(mp, nbytes)
 
 #ifdef safemalloc
 #ifdef DEBUGGING
-#  if !(defined(I286) || defined(atarist))
-       if (debug & 128) {
-           fprintf(stderr,"0x%x: (%05d) rfree\n",res,an++);
-           fprintf(stderr,"0x%x: (%05d) realloc %ld bytes\n",res,an++,(long)size);
-       }
-#  else
-       if (debug & 128) {
-           fprintf(stderr,"0x%lx: (%05d) rfree\n",res,an++);
-           fprintf(stderr,"0x%lx: (%05d) realloc %ld bytes\n",res,an++,(long)size);
-       }
-#  endif
+    if (debug & 128) {
+       fprintf(stderr,"0x%lx: (%05d) rfree\n",(unsigned long)res,an++);
+       fprintf(stderr,"0x%lx: (%05d) realloc %ld bytes\n",
+           (unsigned long)res,an++,(long)size);
+    }
 #endif
 #endif /* safemalloc */
-       return ((MALLOCPTRTYPE*)res);
+       return ((Malloc_t)res);
 }
 
 /*