typo fixes to installhtml

[perl5.git] / malloc.c

diff --git a/malloc.c b/malloc.c
index 755fadf..e9b200b 100644 (file)
--- a/malloc.c
+++ b/malloc.c
@@ -3,9 +3,9 @@
  */
 
 #ifndef lint
-#ifdef DEBUGGING
-#define RCHECK
-#endif
+#  if defined(DEBUGGING) && !defined(NO_RCHECK)
+#    define RCHECK
+#  endif
 /*
  * malloc.c (Caltech) 2/21/82
  * Chris Kingsley, kingsley@cit-20.
@@ -328,8 +328,8 @@ malloc(nbytes)
        }
 
 #ifdef PERL_CORE
-    DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%lx: (%05d) malloc %ld bytes\n",
-       (unsigned long)(p+1),an++,(long)size));
+    DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%lx: (%05lu) malloc %ld bytes\n",
+       (unsigned long)(p+1),(unsigned long)(an++),(long)size));
 #endif /* PERL_CORE */
 
        /* remove from linked list */
@@ -383,16 +383,13 @@ morecore(bucket)
 #ifndef atarist /* on the atari we dont have to worry about this */
        op = (union overhead *)sbrk(0);
 #  ifndef I286
-#    ifdef PACK_MALLOC
-       if ((u_int)op & 0x7ff)
-               (void)sbrk(slack = 2048 - ((u_int)op & 0x7ff));
-#    else
-       if ((u_int)op & 0x3ff)
-               (void)sbrk(slack = 1024 - ((u_int)op & 0x3ff));
-#    endif
+       if ((UV)op & (0x7FF >> CHUNK_SHIFT)) {
+           slack = (0x800 >> CHUNK_SHIFT) - ((UV)op & (0x7FF >> CHUNK_SHIFT));
+           (void)sbrk(slack);
 #    if defined(DEBUGGING_MSTATS)
-       sbrk_slack += slack;
+           sbrk_slack += slack;
 #    endif
+       }
 #  else
        /* The sbrk(0) call on the I286 always returns the next segment */
 #  endif
@@ -427,11 +424,11 @@ morecore(bucket)
         */
 #ifndef I286
 #  ifdef PACK_MALLOC
-       if ((u_int)op & 0x7ff)
+       if ((UV)op & 0x7FF)
                croak("panic: Off-page sbrk");
 #  endif
-       if ((u_int)op & 7) {
-               op = (union overhead *)(((MEM_SIZE)op + 8) &~ 7);
+       if ((UV)op & 7) {
+               op = (union overhead *)(((UV)op + 8) & ~7);
                nblks--;
        }
 #else
@@ -488,7 +485,7 @@ free(mp)
 #endif 
 
 #ifdef PERL_CORE
-    DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%lx: (%05d) free\n",(unsigned long)cp,an++));
+    DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%lx: (%05lu) free\n",(unsigned long)cp,(unsigned long)(an++)));
 #endif /* PERL_CORE */
 
        if (cp == NULL)
@@ -498,11 +495,8 @@ free(mp)
 #ifdef PACK_MALLOC
        bucket = OV_INDEX(op);
 #endif 
-#ifdef DEBUGGING
-       ASSERT(OV_MAGIC(op, bucket) == MAGIC); /* make sure it was in use */
-#else
        if (OV_MAGIC(op, bucket) != MAGIC) {
-               static bad_free_warn = -1;
+               static int bad_free_warn = -1;
                if (bad_free_warn == -1) {
                    char *pbf = getenv("PERL_BADFREE");
                    bad_free_warn = (pbf) ? atoi(pbf) : 1;
@@ -517,7 +511,6 @@ free(mp)
 #endif
                return;                         /* sanity */
        }
-#endif
 #ifdef RCHECK
        ASSERT(op->ov_rmagic == RMAGIC);
        if (OV_INDEX(op) <= MAX_SHORT_BUCKET)
@@ -652,9 +645,9 @@ realloc(mp, nbytes)
 #ifdef PERL_CORE
 #ifdef DEBUGGING
     if (debug & 128) {
-       PerlIO_printf(PerlIO_stderr(), "0x%lx: (%05d) rfree\n",(unsigned long)res,an++);
-       PerlIO_printf(PerlIO_stderr(), "0x%lx: (%05d) realloc %ld bytes\n",
-           (unsigned long)res,an++,(long)size);
+       PerlIO_printf(PerlIO_stderr(), "0x%lx: (%05lu) rfree\n",(unsigned long)res,(unsigned long)(an++));
+       PerlIO_printf(PerlIO_stderr(), "0x%lx: (%05lu) realloc %ld bytes\n",
+           (unsigned long)res,(unsigned long)(an++),(long)size);
     }
 #endif
 #endif /* PERL_CORE */