[BACK]Return to dbg_mlc.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / gc

Diff for /OpenXM_contrib2/asir2000/gc/dbg_mlc.c between version 1.1 and 1.7

version 1.1, 1999/12/03 07:39:09 version 1.7, 2003/06/24 05:11:32
Line 2 
Line 2 
  * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers   * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
  * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.   * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
  * Copyright (c) 1997 by Silicon Graphics.  All rights reserved.   * Copyright (c) 1997 by Silicon Graphics.  All rights reserved.
    * Copyright (c) 1999-2000 by Hewlett-Packard Company.  All rights reserved.
  *   *
  * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED   * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
  * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.   * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
Line 12 
Line 13 
  * provided the above notices are retained, and a notice that the code was   * provided the above notices are retained, and a notice that the code was
  * modified is included with the above copyright notice.   * modified is included with the above copyright notice.
  */   */
 # define I_HIDE_POINTERS  
 # include "gc_priv.h"  
 # ifdef KEEP_BACK_PTRS  
 #   include "backptr.h"  
 # endif  
   
   #include "private/dbg_mlc.h"
   
 void GC_default_print_heap_obj_proc();  void GC_default_print_heap_obj_proc();
 GC_API void GC_register_finalizer_no_order  GC_API void GC_register_finalizer_no_order
         GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,          GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
                   GC_finalization_proc *ofn, GC_PTR *ocd));                    GC_finalization_proc *ofn, GC_PTR *ocd));
   
 /* Do we want to and know how to save the call stack at the time of     */  
 /* an allocation?  How much space do we want to use in each object?     */  
   
 # define START_FLAG ((word)0xfedcedcb)  #ifndef SHORT_DBG_HDRS
 # define END_FLAG ((word)0xbcdecdef)  
         /* Stored both one past the end of user object, and one before  */  
         /* the end of the object as seen by the allocator.              */  
   
   
 /* Object header */  
 typedef struct {  
 #   ifdef KEEP_BACK_PTRS  
         ptr_t oh_back_ptr;  
 #       define MARKED_FOR_FINALIZATION (ptr_t)(-1)  
             /* Object was marked because it is finalizable. */  
 #       ifdef ALIGN_DOUBLE  
           word oh_dummy;  
 #       endif  
 #   endif  
     char * oh_string;           /* object descriptor string     */  
     word oh_int;                /* object descriptor integers   */  
 #   ifdef NEED_CALLINFO  
       struct callinfo oh_ci[NFRAMES];  
 #   endif  
     word oh_sz;                 /* Original malloc arg.         */  
     word oh_sf;                 /* start flag */  
 } oh;  
 /* The size of the above structure is assumed not to dealign things,    */  
 /* and to be a multiple of the word length.                             */  
   
 #define DEBUG_BYTES (sizeof (oh) + sizeof (word))  
 #undef ROUNDED_UP_WORDS  
 #define ROUNDED_UP_WORDS(n) BYTES_TO_WORDS((n) + WORDS_TO_BYTES(1) - 1)  
   
   
 #ifdef SAVE_CALL_CHAIN  
 #   define ADD_CALL_CHAIN(base, ra) GC_save_callers(((oh *)(base)) -> oh_ci)  
 #   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)  
 #else  
 # ifdef GC_ADD_CALLER  
 #   define ADD_CALL_CHAIN(base, ra) ((oh *)(base)) -> oh_ci[0].ci_pc = (ra)  
 #   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)  
 # else  
 #   define ADD_CALL_CHAIN(base, ra)  
 #   define PRINT_CALL_CHAIN(base)  
 # endif  
 #endif  
   
 /* Check whether object with base pointer p has debugging info  */  /* Check whether object with base pointer p has debugging info  */
 /* p is assumed to point to a legitimate object in our part     */  /* p is assumed to point to a legitimate object in our part     */
 /* of the heap.                                                 */  /* of the heap.                                                 */
 GC_bool GC_has_debug_info(p)  /* This excludes the check as to whether the back pointer is    */
   /* odd, which is added by the GC_HAS_DEBUG_INFO macro.          */
   /* Note that if DBG_HDRS_ALL is set, uncollectable objects      */
   /* on free lists may not have debug information set.  Thus it's */
   /* not always safe to return TRUE, even if the client does      */
   /* its part.                                                    */
   GC_bool GC_has_other_debug_info(p)
 ptr_t p;  ptr_t p;
 {  {
     register oh * ohdr = (oh *)p;      register oh * ohdr = (oh *)p;
Line 82  ptr_t p;
Line 40  ptr_t p;
     register word sz = GC_size((ptr_t) ohdr);      register word sz = GC_size((ptr_t) ohdr);
   
     if (HBLKPTR((ptr_t)ohdr) != HBLKPTR((ptr_t)body)      if (HBLKPTR((ptr_t)ohdr) != HBLKPTR((ptr_t)body)
         || sz < sizeof (oh)) {          || sz < DEBUG_BYTES + EXTRA_BYTES) {
         return(FALSE);          return(FALSE);
     }      }
     if (ohdr -> oh_sz == sz) {      if (ohdr -> oh_sz == sz) {
Line 95  ptr_t p;
Line 53  ptr_t p;
     }      }
     return(FALSE);      return(FALSE);
 }  }
   #endif
   
 #ifdef KEEP_BACK_PTRS  #ifdef KEEP_BACK_PTRS
   
   # include <stdlib.h>
   
   # if defined(LINUX) || defined(SUNOS4) || defined(SUNOS5) \
        || defined(HPUX) || defined(IRIX5) || defined(OSF1)
   #   define RANDOM() random()
   # else
   #   define RANDOM() (long)rand()
   # endif
   
   /* Store back pointer to source in dest, if that appears to be possible. */    /* Store back pointer to source in dest, if that appears to be possible. */
   /* This is not completely safe, since we may mistakenly conclude that    */    /* This is not completely safe, since we may mistakenly conclude that    */
   /* dest has a debugging wrapper.  But the error probability is very      */    /* dest has a debugging wrapper.  But the error probability is very      */
Line 105  ptr_t p;
Line 74  ptr_t p;
   /* be a pointer to the interior of an object.                            */    /* be a pointer to the interior of an object.                            */
   void GC_store_back_pointer(ptr_t source, ptr_t dest)    void GC_store_back_pointer(ptr_t source, ptr_t dest)
   {    {
     if (GC_has_debug_info(dest)) {      if (GC_HAS_DEBUG_INFO(dest)) {
       ((oh *)dest) -> oh_back_ptr = (ptr_t)HIDE_POINTER(source);        ((oh *)dest) -> oh_back_ptr = HIDE_BACK_PTR(source);
     }      }
   }    }
   
Line 116  ptr_t p;
Line 85  ptr_t p;
   
   /* Store information about the object referencing dest in *base_p     */    /* Store information about the object referencing dest in *base_p     */
   /* and *offset_p.                                                     */    /* and *offset_p.                                                     */
   /*   source is root ==> *base_p = 0, *offset_p = address              */    /*   source is root ==> *base_p = address, *offset_p = 0              */
   /*   source is heap object ==> *base_p != 0, *offset_p = offset       */    /*   source is heap object ==> *base_p != 0, *offset_p = offset       */
   /*   Returns 1 on success, 0 if source couldn't be determined.        */    /*   Returns 1 on success, 0 if source couldn't be determined.        */
   /* Dest can be any address within a heap object.                      */    /* Dest can be any address within a heap object.                      */
Line 125  ptr_t p;
Line 94  ptr_t p;
     oh * hdr = (oh *)GC_base(dest);      oh * hdr = (oh *)GC_base(dest);
     ptr_t bp;      ptr_t bp;
     ptr_t bp_base;      ptr_t bp_base;
     if (!GC_has_debug_info((ptr_t) hdr)) return GC_NO_SPACE;      if (!GC_HAS_DEBUG_INFO((ptr_t) hdr)) return GC_NO_SPACE;
     bp = hdr -> oh_back_ptr;      bp = REVEAL_POINTER(hdr -> oh_back_ptr);
     if (MARKED_FOR_FINALIZATION == bp) return GC_FINALIZER_REFD;      if (MARKED_FOR_FINALIZATION == bp) return GC_FINALIZER_REFD;
     if (0 == bp) return GC_UNREFERENCED;      if (MARKED_FROM_REGISTER == bp) return GC_REFD_FROM_REG;
     bp = REVEAL_POINTER(bp);      if (NOT_MARKED == bp) return GC_UNREFERENCED;
   #   if ALIGNMENT == 1
         /* Heuristically try to fix off by 1 errors we introduced by      */
         /* insisting on even addresses.                                   */
         {
           ptr_t alternate_ptr = bp + 1;
           ptr_t target = *(ptr_t *)bp;
           ptr_t alternate_target = *(ptr_t *)alternate_ptr;
   
           if (alternate_target >= GC_least_plausible_heap_addr
               && alternate_target <= GC_greatest_plausible_heap_addr
               && (target < GC_least_plausible_heap_addr
                   || target > GC_greatest_plausible_heap_addr)) {
               bp = alternate_ptr;
           }
         }
   #   endif
     bp_base = GC_base(bp);      bp_base = GC_base(bp);
     if (0 == bp_base) {      if (0 == bp_base) {
       *base_p = bp;        *base_p = bp;
       *offset_p = 0;        *offset_p = 0;
       return GC_REFD_FROM_ROOT;        return GC_REFD_FROM_ROOT;
     } else {      } else {
       if (GC_has_debug_info(bp_base)) bp_base += sizeof(oh);        if (GC_HAS_DEBUG_INFO(bp_base)) bp_base += sizeof(oh);
       *base_p = bp_base;        *base_p = bp_base;
       *offset_p = bp - bp_base;        *offset_p = bp - bp_base;
       return GC_REFD_FROM_HEAP;        return GC_REFD_FROM_HEAP;
Line 149  ptr_t p;
Line 134  ptr_t p;
   void *GC_generate_random_heap_address(void)    void *GC_generate_random_heap_address(void)
   {    {
     int i;      int i;
     int heap_offset = random() % GC_heapsize;      long heap_offset = RANDOM();
       if (GC_heapsize > RAND_MAX) {
           heap_offset *= RAND_MAX;
           heap_offset += RANDOM();
       }
       heap_offset %= GC_heapsize;
           /* This doesn't yield a uniform distribution, especially if     */
           /* e.g. RAND_MAX = 1.5* GC_heapsize.  But for typical cases,    */
           /* it's not too bad.                                            */
     for (i = 0; i < GC_n_heap_sects; ++ i) {      for (i = 0; i < GC_n_heap_sects; ++ i) {
         int size = GC_heap_sects[i].hs_bytes;          int size = GC_heap_sects[i].hs_bytes;
         if (heap_offset < size) {          if (heap_offset < size) {
Line 177  ptr_t p;
Line 170  ptr_t p;
     }      }
   }    }
   
   /* Force a garbage collection and generate a backtrace from a */    /* Print back trace for p */
   /* random heap address.                                       */    void GC_print_backtrace(void *p)
   void GC_generate_random_backtrace(void)  
   {    {
     void * current;      void *current = p;
     int i;      int i;
     void * base;  
     size_t offset;  
     GC_ref_kind source;      GC_ref_kind source;
     GC_gcollect();      size_t offset;
     current = GC_generate_random_valid_address();      void *base;
     GC_printf1("Chose address 0x%lx in object\n", (unsigned long)current);  
     GC_print_heap_obj(GC_base(current));      GC_print_heap_obj(GC_base(current));
     GC_err_printf0("\n");      GC_err_printf0("\n");
     for (i = 0; ; ++i) {      for (i = 0; ; ++i) {
Line 207  ptr_t p;
Line 197  ptr_t p;
         case GC_REFD_FROM_ROOT:          case GC_REFD_FROM_ROOT:
           GC_err_printf1("root at 0x%lx\n", (unsigned long)base);            GC_err_printf1("root at 0x%lx\n", (unsigned long)base);
           goto out;            goto out;
           case GC_REFD_FROM_REG:
             GC_err_printf0("root in register\n");
             goto out;
         case GC_FINALIZER_REFD:          case GC_FINALIZER_REFD:
           GC_err_printf0("list of finalizable objects\n");            GC_err_printf0("list of finalizable objects\n");
           goto out;            goto out;
Line 221  ptr_t p;
Line 214  ptr_t p;
     }      }
     out:;      out:;
   }    }
   
     /* Force a garbage collection and generate a backtrace from a */
     /* random heap address.                                       */
     void GC_generate_random_backtrace(void)
     {
       void * current;
       GC_gcollect();
       current = GC_generate_random_valid_address();
       GC_printf1("Chose address 0x%lx in object\n", (unsigned long)current);
       GC_print_backtrace(current);
     }
   
 #endif /* KEEP_BACK_PTRS */  #endif /* KEEP_BACK_PTRS */
   
   # define CROSSES_HBLK(p, sz) \
           (((word)(p + sizeof(oh) + sz - 1) ^ (word)p) >= HBLKSIZE)
 /* Store debugging info into p.  Return displaced pointer. */  /* Store debugging info into p.  Return displaced pointer. */
 /* Assumes we don't hold allocation lock.                  */  /* Assumes we don't hold allocation lock.                  */
 ptr_t GC_store_debug_info(p, sz, string, integer)  ptr_t GC_store_debug_info(p, sz, string, integer)
 register ptr_t p;       /* base pointer */  register ptr_t p;       /* base pointer */
 word sz;        /* bytes */  word sz;        /* bytes */
 char * string;  GC_CONST char * string;
 word integer;  word integer;
 {  {
     register word * result = (word *)((oh *)p + 1);      register word * result = (word *)((oh *)p + 1);
Line 239  word integer;
Line 245  word integer;
     /* But that's expensive.  And this way things should only appear    */      /* But that's expensive.  And this way things should only appear    */
     /* inconsistent while we're in the handler.                         */      /* inconsistent while we're in the handler.                         */
     LOCK();      LOCK();
       GC_ASSERT(GC_size(p) >= sizeof(oh) + sz);
       GC_ASSERT(!(SMALL_OBJ(sz) && CROSSES_HBLK(p, sz)));
 #   ifdef KEEP_BACK_PTRS  #   ifdef KEEP_BACK_PTRS
       ((oh *)p) -> oh_back_ptr = 0;        ((oh *)p) -> oh_back_ptr = HIDE_BACK_PTR(NOT_MARKED);
 #   endif  #   endif
   #   ifdef MAKE_BACK_GRAPH
         ((oh *)p) -> oh_bg_ptr = HIDE_BACK_PTR((ptr_t)0);
   #   endif
     ((oh *)p) -> oh_string = string;      ((oh *)p) -> oh_string = string;
     ((oh *)p) -> oh_int = integer;      ((oh *)p) -> oh_int = integer;
     ((oh *)p) -> oh_sz = sz;  #   ifndef SHORT_DBG_HDRS
     ((oh *)p) -> oh_sf = START_FLAG ^ (word)result;        ((oh *)p) -> oh_sz = sz;
     ((word *)p)[BYTES_TO_WORDS(GC_size(p))-1] =        ((oh *)p) -> oh_sf = START_FLAG ^ (word)result;
          result[ROUNDED_UP_WORDS(sz)] = END_FLAG ^ (word)result;        ((word *)p)[BYTES_TO_WORDS(GC_size(p))-1] =
            result[SIMPLE_ROUNDED_UP_WORDS(sz)] = END_FLAG ^ (word)result;
   #   endif
     UNLOCK();      UNLOCK();
     return((ptr_t)result);      return((ptr_t)result);
 }  }
   
   #ifdef DBG_HDRS_ALL
   /* Store debugging info into p.  Return displaced pointer.         */
   /* This version assumes we do hold the allocation lock.            */
   ptr_t GC_store_debug_info_inner(p, sz, string, integer)
   register ptr_t p;       /* base pointer */
   word sz;        /* bytes */
   char * string;
   word integer;
   {
       register word * result = (word *)((oh *)p + 1);
   
       /* There is some argument that we should disable signals here.      */
       /* But that's expensive.  And this way things should only appear    */
       /* inconsistent while we're in the handler.                         */
       GC_ASSERT(GC_size(p) >= sizeof(oh) + sz);
       GC_ASSERT(!(SMALL_OBJ(sz) && CROSSES_HBLK(p, sz)));
   #   ifdef KEEP_BACK_PTRS
         ((oh *)p) -> oh_back_ptr = HIDE_BACK_PTR(NOT_MARKED);
   #   endif
   #   ifdef MAKE_BACK_GRAPH
         ((oh *)p) -> oh_bg_ptr = HIDE_BACK_PTR((ptr_t)0);
   #   endif
       ((oh *)p) -> oh_string = string;
       ((oh *)p) -> oh_int = integer;
   #   ifndef SHORT_DBG_HDRS
         ((oh *)p) -> oh_sz = sz;
         ((oh *)p) -> oh_sf = START_FLAG ^ (word)result;
         ((word *)p)[BYTES_TO_WORDS(GC_size(p))-1] =
            result[SIMPLE_ROUNDED_UP_WORDS(sz)] = END_FLAG ^ (word)result;
   #   endif
       return((ptr_t)result);
   }
   #endif
   
   #ifndef SHORT_DBG_HDRS
 /* Check the object with debugging info at ohdr         */  /* Check the object with debugging info at ohdr         */
 /* return NIL if it's OK.  Else return clobbered        */  /* return NIL if it's OK.  Else return clobbered        */
 /* address.                                             */  /* address.                                             */
Line 269  register oh * ohdr;
Line 317  register oh * ohdr;
     if (((word *)ohdr)[BYTES_TO_WORDS(gc_sz)-1] != (END_FLAG ^ (word)body)) {      if (((word *)ohdr)[BYTES_TO_WORDS(gc_sz)-1] != (END_FLAG ^ (word)body)) {
         return((ptr_t)((word *)ohdr + BYTES_TO_WORDS(gc_sz)-1));          return((ptr_t)((word *)ohdr + BYTES_TO_WORDS(gc_sz)-1));
     }      }
     if (((word *)body)[ROUNDED_UP_WORDS(ohdr -> oh_sz)]      if (((word *)body)[SIMPLE_ROUNDED_UP_WORDS(ohdr -> oh_sz)]
         != (END_FLAG ^ (word)body)) {          != (END_FLAG ^ (word)body)) {
         return((ptr_t)((word *)body + ROUNDED_UP_WORDS(ohdr -> oh_sz)));          return((ptr_t)((word *)body + SIMPLE_ROUNDED_UP_WORDS(ohdr -> oh_sz)));
     }      }
     return(0);      return(0);
 }  }
   #endif /* !SHORT_DBG_HDRS */
   
 void GC_print_obj(p)  void GC_print_obj(p)
 ptr_t p;  ptr_t p;
 {  {
     register oh * ohdr = (oh *)GC_base(p);      register oh * ohdr = (oh *)GC_base(p);
   
       GC_ASSERT(!I_HOLD_LOCK());
     GC_err_printf1("0x%lx (", ((unsigned long)ohdr + sizeof(oh)));      GC_err_printf1("0x%lx (", ((unsigned long)ohdr + sizeof(oh)));
     GC_err_puts(ohdr -> oh_string);      GC_err_puts(ohdr -> oh_string);
     GC_err_printf2(":%ld, sz=%ld)\n", (unsigned long)(ohdr -> oh_int),  #   ifdef SHORT_DBG_HDRS
                                       (unsigned long)(ohdr -> oh_sz));        GC_err_printf1(":%ld)\n", (unsigned long)(ohdr -> oh_int));
   #   else
         GC_err_printf2(":%ld, sz=%ld)\n", (unsigned long)(ohdr -> oh_int),
                                           (unsigned long)(ohdr -> oh_sz));
   #   endif
     PRINT_CALL_CHAIN(ohdr);      PRINT_CALL_CHAIN(ohdr);
 }  }
   
 void GC_debug_print_heap_obj_proc(p)  # if defined(__STDC__) || defined(__cplusplus)
 ptr_t p;      void GC_debug_print_heap_obj_proc(ptr_t p)
   # else
       void GC_debug_print_heap_obj_proc(p)
       ptr_t p;
   # endif
 {  {
     if (GC_has_debug_info(p)) {      GC_ASSERT(!I_HOLD_LOCK());
       if (GC_HAS_DEBUG_INFO(p)) {
         GC_print_obj(p);          GC_print_obj(p);
     } else {      } else {
         GC_default_print_heap_obj_proc(p);          GC_default_print_heap_obj_proc(p);
     }      }
 }  }
   
   #ifndef SHORT_DBG_HDRS
 void GC_print_smashed_obj(p, clobbered_addr)  void GC_print_smashed_obj(p, clobbered_addr)
 ptr_t p, clobbered_addr;  ptr_t p, clobbered_addr;
 {  {
     register oh * ohdr = (oh *)GC_base(p);      register oh * ohdr = (oh *)GC_base(p);
   
       GC_ASSERT(!I_HOLD_LOCK());
     GC_err_printf2("0x%lx in object at 0x%lx(", (unsigned long)clobbered_addr,      GC_err_printf2("0x%lx in object at 0x%lx(", (unsigned long)clobbered_addr,
                                                 (unsigned long)p);                                                  (unsigned long)p);
     if (clobbered_addr <= (ptr_t)(&(ohdr -> oh_sz))      if (clobbered_addr <= (ptr_t)(&(ohdr -> oh_sz))
Line 320  ptr_t p, clobbered_addr;
Line 381  ptr_t p, clobbered_addr;
         PRINT_CALL_CHAIN(ohdr);          PRINT_CALL_CHAIN(ohdr);
     }      }
 }  }
   #endif
   
 void GC_check_heap_proc();  void GC_check_heap_proc GC_PROTO((void));
   
   void GC_print_all_smashed_proc GC_PROTO((void));
   
   void GC_do_nothing() {}
   
 void GC_start_debugging()  void GC_start_debugging()
 {  {
     GC_check_heap = GC_check_heap_proc;  #   ifndef SHORT_DBG_HDRS
         GC_check_heap = GC_check_heap_proc;
         GC_print_all_smashed = GC_print_all_smashed_proc;
   #   else
         GC_check_heap = GC_do_nothing;
         GC_print_all_smashed = GC_do_nothing;
   #   endif
     GC_print_heap_obj = GC_debug_print_heap_obj_proc;      GC_print_heap_obj = GC_debug_print_heap_obj_proc;
     GC_debugging_started = TRUE;      GC_debugging_started = TRUE;
     GC_register_displacement((word)sizeof(oh));      GC_register_displacement((word)sizeof(oh));
Line 342  void GC_start_debugging()
Line 414  void GC_start_debugging()
     GC_register_displacement((word)sizeof(oh) + offset);      GC_register_displacement((word)sizeof(oh) + offset);
 }  }
   
 # ifdef GC_ADD_CALLER  
 #   define EXTRA_ARGS word ra, char * s, int i  
 #   define OPT_RA ra,  
 # else  
 #   define EXTRA_ARGS char * s, int i  
 #   define OPT_RA  
 # endif  
   
 # ifdef __STDC__  # ifdef __STDC__
     GC_PTR GC_debug_malloc(size_t lb, EXTRA_ARGS)      GC_PTR GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
 # else  # else
     GC_PTR GC_debug_malloc(lb, s, i)      GC_PTR GC_debug_malloc(lb, s, i)
     size_t lb;      size_t lb;
Line 378  void GC_start_debugging()
Line 442  void GC_start_debugging()
     return (GC_store_debug_info(result, (word)lb, s, (word)i));      return (GC_store_debug_info(result, (word)lb, s, (word)i));
 }  }
   
   # ifdef __STDC__
       GC_PTR GC_debug_malloc_ignore_off_page(size_t lb, GC_EXTRA_PARAMS)
   # else
       GC_PTR GC_debug_malloc_ignore_off_page(lb, s, i)
       size_t lb;
       char * s;
       int i;
   #   ifdef GC_ADD_CALLER
           --> GC_ADD_CALLER not implemented for K&R C
   #   endif
   # endif
   {
       GC_PTR result = GC_malloc_ignore_off_page(lb + DEBUG_BYTES);
   
       if (result == 0) {
           GC_err_printf1("GC_debug_malloc_ignore_off_page(%ld) returning NIL (",
                          (unsigned long) lb);
           GC_err_puts(s);
           GC_err_printf1(":%ld)\n", (unsigned long)i);
           return(0);
       }
       if (!GC_debugging_started) {
           GC_start_debugging();
       }
       ADD_CALL_CHAIN(result, ra);
       return (GC_store_debug_info(result, (word)lb, s, (word)i));
   }
   
   # ifdef __STDC__
       GC_PTR GC_debug_malloc_atomic_ignore_off_page(size_t lb, GC_EXTRA_PARAMS)
   # else
       GC_PTR GC_debug_malloc_atomic_ignore_off_page(lb, s, i)
       size_t lb;
       char * s;
       int i;
   #   ifdef GC_ADD_CALLER
           --> GC_ADD_CALLER not implemented for K&R C
   #   endif
   # endif
   {
       GC_PTR result = GC_malloc_atomic_ignore_off_page(lb + DEBUG_BYTES);
   
       if (result == 0) {
           GC_err_printf1("GC_debug_malloc_atomic_ignore_off_page(%ld)"
                          " returning NIL (", (unsigned long) lb);
           GC_err_puts(s);
           GC_err_printf1(":%ld)\n", (unsigned long)i);
           return(0);
       }
       if (!GC_debugging_started) {
           GC_start_debugging();
       }
       ADD_CALL_CHAIN(result, ra);
       return (GC_store_debug_info(result, (word)lb, s, (word)i));
   }
   
   # ifdef DBG_HDRS_ALL
   /*
    * An allocation function for internal use.
    * Normally internally allocated objects do not have debug information.
    * But in this case, we need to make sure that all objects have debug
    * headers.
    * We assume debugging was started in collector initialization,
    * and we already hold the GC lock.
    */
     GC_PTR GC_debug_generic_malloc_inner(size_t lb, int k)
     {
       GC_PTR result = GC_generic_malloc_inner(lb + DEBUG_BYTES, k);
   
       if (result == 0) {
           GC_err_printf1("GC internal allocation (%ld bytes) returning NIL\n",
                          (unsigned long) lb);
           return(0);
       }
       ADD_CALL_CHAIN(result, GC_RETURN_ADDR);
       return (GC_store_debug_info_inner(result, (word)lb, "INTERNAL", (word)0));
     }
   
     GC_PTR GC_debug_generic_malloc_inner_ignore_off_page(size_t lb, int k)
     {
       GC_PTR result = GC_generic_malloc_inner_ignore_off_page(
                                                   lb + DEBUG_BYTES, k);
   
       if (result == 0) {
           GC_err_printf1("GC internal allocation (%ld bytes) returning NIL\n",
                          (unsigned long) lb);
           return(0);
       }
       ADD_CALL_CHAIN(result, GC_RETURN_ADDR);
       return (GC_store_debug_info_inner(result, (word)lb, "INTERNAL", (word)0));
     }
   # endif
   
 #ifdef STUBBORN_ALLOC  #ifdef STUBBORN_ALLOC
 # ifdef __STDC__  # ifdef __STDC__
     GC_PTR GC_debug_malloc_stubborn(size_t lb, EXTRA_ARGS)      GC_PTR GC_debug_malloc_stubborn(size_t lb, GC_EXTRA_PARAMS)
 # else  # else
     GC_PTR GC_debug_malloc_stubborn(lb, s, i)      GC_PTR GC_debug_malloc_stubborn(lb, s, i)
     size_t lb;      size_t lb;
Line 444  GC_PTR p;
Line 601  GC_PTR p;
     GC_end_stubborn_change(q);      GC_end_stubborn_change(q);
 }  }
   
 #endif /* STUBBORN_ALLOC */  #else /* !STUBBORN_ALLOC */
   
 # ifdef __STDC__  # ifdef __STDC__
     GC_PTR GC_debug_malloc_atomic(size_t lb, EXTRA_ARGS)      GC_PTR GC_debug_malloc_stubborn(size_t lb, GC_EXTRA_PARAMS)
 # else  # else
       GC_PTR GC_debug_malloc_stubborn(lb, s, i)
       size_t lb;
       char * s;
       int i;
   # endif
   {
       return GC_debug_malloc(lb, OPT_RA s, i);
   }
   
   void GC_debug_change_stubborn(p)
   GC_PTR p;
   {
   }
   
   void GC_debug_end_stubborn_change(p)
   GC_PTR p;
   {
   }
   
   #endif /* !STUBBORN_ALLOC */
   
   # ifdef __STDC__
       GC_PTR GC_debug_malloc_atomic(size_t lb, GC_EXTRA_PARAMS)
   # else
     GC_PTR GC_debug_malloc_atomic(lb, s, i)      GC_PTR GC_debug_malloc_atomic(lb, s, i)
     size_t lb;      size_t lb;
     char * s;      char * s;
Line 472  GC_PTR p;
Line 653  GC_PTR p;
 }  }
   
 # ifdef __STDC__  # ifdef __STDC__
     GC_PTR GC_debug_malloc_uncollectable(size_t lb, EXTRA_ARGS)      GC_PTR GC_debug_malloc_uncollectable(size_t lb, GC_EXTRA_PARAMS)
 # else  # else
     GC_PTR GC_debug_malloc_uncollectable(lb, s, i)      GC_PTR GC_debug_malloc_uncollectable(lb, s, i)
     size_t lb;      size_t lb;
Line 480  GC_PTR p;
Line 661  GC_PTR p;
     int i;      int i;
 # endif  # endif
 {  {
     GC_PTR result = GC_malloc_uncollectable(lb + DEBUG_BYTES);      GC_PTR result = GC_malloc_uncollectable(lb + UNCOLLECTABLE_DEBUG_BYTES);
   
     if (result == 0) {      if (result == 0) {
         GC_err_printf1("GC_debug_malloc_uncollectable(%ld) returning NIL (",          GC_err_printf1("GC_debug_malloc_uncollectable(%ld) returning NIL (",
Line 498  GC_PTR p;
Line 679  GC_PTR p;
   
 #ifdef ATOMIC_UNCOLLECTABLE  #ifdef ATOMIC_UNCOLLECTABLE
 # ifdef __STDC__  # ifdef __STDC__
     GC_PTR GC_debug_malloc_atomic_uncollectable(size_t lb, EXTRA_ARGS)      GC_PTR GC_debug_malloc_atomic_uncollectable(size_t lb, GC_EXTRA_PARAMS)
 # else  # else
     GC_PTR GC_debug_malloc_atomic_uncollectable(lb, s, i)      GC_PTR GC_debug_malloc_atomic_uncollectable(lb, s, i)
     size_t lb;      size_t lb;
Line 506  GC_PTR p;
Line 687  GC_PTR p;
     int i;      int i;
 # endif  # endif
 {  {
     GC_PTR result = GC_malloc_atomic_uncollectable(lb + DEBUG_BYTES);      GC_PTR result =
           GC_malloc_atomic_uncollectable(lb + UNCOLLECTABLE_DEBUG_BYTES);
   
     if (result == 0) {      if (result == 0) {
         GC_err_printf1(          GC_err_printf1(
Line 531  GC_PTR p;
Line 713  GC_PTR p;
     GC_PTR p;      GC_PTR p;
 # endif  # endif
 {  {
     register GC_PTR base = GC_base(p);      register GC_PTR base;
     register ptr_t clobbered;      register ptr_t clobbered;
   
       if (0 == p) return;
       base = GC_base(p);
     if (base == 0) {      if (base == 0) {
         GC_err_printf1("Attempt to free invalid pointer %lx\n",          GC_err_printf1("Attempt to free invalid pointer %lx\n",
                        (unsigned long)p);                         (unsigned long)p);
         if (p != 0) ABORT("free(invalid pointer)");          ABORT("free(invalid pointer)");
     }      }
     if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {      if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {
         GC_err_printf1(          GC_err_printf1(
                   "GC_debug_free called on pointer %lx wo debugging info\n",                    "GC_debug_free called on pointer %lx wo debugging info\n",
                   (unsigned long)p);                    (unsigned long)p);
     } else {      } else {
       clobbered = GC_check_annotated_obj((oh *)base);  #     ifndef SHORT_DBG_HDRS
       if (clobbered != 0) {          clobbered = GC_check_annotated_obj((oh *)base);
         if (((oh *)base) -> oh_sz == GC_size(base)) {          if (clobbered != 0) {
             if (((oh *)base) -> oh_sz == GC_size(base)) {
             GC_err_printf0(              GC_err_printf0(
                   "GC_debug_free: found previously deallocated (?) object at ");                    "GC_debug_free: found previously deallocated (?) object at ");
         } else {            } else {
             GC_err_printf0("GC_debug_free: found smashed location at ");              GC_err_printf0("GC_debug_free: found smashed location at ");
             }
             GC_print_smashed_obj(p, clobbered);
         }          }
         GC_print_smashed_obj(p, clobbered);          /* Invalidate size */
       }          ((oh *)base) -> oh_sz = GC_size(base);
       /* Invalidate size */  #     endif /* SHORT_DBG_HDRS */
       ((oh *)base) -> oh_sz = GC_size(base);  
     }      }
 #   ifdef FIND_LEAK      if (GC_find_leak) {
         GC_free(base);          GC_free(base);
 #   else      } else {
         {          register hdr * hhdr = HDR(p);
             register hdr * hhdr = HDR(p);          GC_bool uncollectable = FALSE;
             GC_bool uncollectable = FALSE;  
   
             if (hhdr ->  hb_obj_kind == UNCOLLECTABLE) {          if (hhdr ->  hb_obj_kind == UNCOLLECTABLE) {
                 uncollectable = TRUE;              uncollectable = TRUE;
             }  
 #           ifdef ATOMIC_UNCOLLECTABLE  
                 if (hhdr ->  hb_obj_kind == AUNCOLLECTABLE) {  
                     uncollectable = TRUE;  
                 }  
 #           endif  
             if (uncollectable) GC_free(base);  
         }          }
 #   endif  #       ifdef ATOMIC_UNCOLLECTABLE
               if (hhdr ->  hb_obj_kind == AUNCOLLECTABLE) {
                       uncollectable = TRUE;
               }
   #       endif
           if (uncollectable) GC_free(base);
       } /* !GC_find_leak */
 }  }
   
   #ifdef THREADS
   
   extern void GC_free_inner(GC_PTR p);
   
   /* Used internally; we assume it's called correctly.    */
   void GC_debug_free_inner(GC_PTR p)
   {
       GC_free_inner(GC_base(p));
   }
   #endif
   
 # ifdef __STDC__  # ifdef __STDC__
     GC_PTR GC_debug_realloc(GC_PTR p, size_t lb, EXTRA_ARGS)      GC_PTR GC_debug_realloc(GC_PTR p, size_t lb, GC_EXTRA_PARAMS)
 # else  # else
     GC_PTR GC_debug_realloc(p, lb, s, i)      GC_PTR GC_debug_realloc(p, lb, s, i)
     GC_PTR p;      GC_PTR p;
Line 631  GC_PTR p;
Line 826  GC_PTR p;
         GC_err_printf0("GC_debug_realloc: encountered bad kind\n");          GC_err_printf0("GC_debug_realloc: encountered bad kind\n");
         ABORT("bad kind");          ABORT("bad kind");
     }      }
     clobbered = GC_check_annotated_obj((oh *)base);  #   ifdef SHORT_DBG_HDRS
     if (clobbered != 0) {        old_sz = GC_size(base) - sizeof(oh);
   #   else
         clobbered = GC_check_annotated_obj((oh *)base);
         if (clobbered != 0) {
         GC_err_printf0("GC_debug_realloc: found smashed location at ");          GC_err_printf0("GC_debug_realloc: found smashed location at ");
         GC_print_smashed_obj(p, clobbered);          GC_print_smashed_obj(p, clobbered);
     }        }
     old_sz = ((oh *)base) -> oh_sz;        old_sz = ((oh *)base) -> oh_sz;
   #   endif
     if (old_sz < copy_sz) copy_sz = old_sz;      if (old_sz < copy_sz) copy_sz = old_sz;
     if (result == 0) return(0);      if (result == 0) return(0);
     BCOPY(p, result,  copy_sz);      BCOPY(p, result,  copy_sz);
Line 644  GC_PTR p;
Line 843  GC_PTR p;
     return(result);      return(result);
 }  }
   
   #ifndef SHORT_DBG_HDRS
   
   /* List of smashed objects.  We defer printing these, since we can't    */
   /* always print them nicely with the allocation lock held.              */
   /* We put them here instead of in GC_arrays, since it may be useful to  */
   /* be able to look at them with the debugger.                           */
   #define MAX_SMASHED 20
   ptr_t GC_smashed[MAX_SMASHED];
   unsigned GC_n_smashed = 0;
   
   # if defined(__STDC__) || defined(__cplusplus)
       void GC_add_smashed(ptr_t smashed)
   # else
       void GC_add_smashed(smashed)
       ptr_t smashed;
   #endif
   {
       GC_ASSERT(GC_is_marked(GC_base(smashed)));
       GC_smashed[GC_n_smashed] = smashed;
       if (GC_n_smashed < MAX_SMASHED - 1) ++GC_n_smashed;
         /* In case of overflow, we keep the first MAX_SMASHED-1   */
         /* entries plus the last one.                             */
       GC_have_errors = TRUE;
   }
   
   /* Print all objects on the list.  Clear the list.      */
   void GC_print_all_smashed_proc ()
   {
       unsigned i;
   
       GC_ASSERT(!I_HOLD_LOCK());
       if (GC_n_smashed == 0) return;
       GC_err_printf0("GC_check_heap_block: found smashed heap objects:\n");
       for (i = 0; i < GC_n_smashed; ++i) {
           GC_print_smashed_obj(GC_base(GC_smashed[i]), GC_smashed[i]);
           GC_smashed[i] = 0;
       }
       GC_n_smashed = 0;
   }
   
 /* Check all marked objects in the given block for validity */  /* Check all marked objects in the given block for validity */
 /*ARGSUSED*/  /*ARGSUSED*/
 void GC_check_heap_block(hbp, dummy)  # if defined(__STDC__) || defined(__cplusplus)
 register struct hblk *hbp;      /* ptr to current heap block            */      void GC_check_heap_block(register struct hblk *hbp, word dummy)
 word dummy;  # else
       void GC_check_heap_block(hbp, dummy)
       register struct hblk *hbp;  /* ptr to current heap block            */
       word dummy;
   # endif
 {  {
     register struct hblkhdr * hhdr = HDR(hbp);      register struct hblkhdr * hhdr = HDR(hbp);
     register word sz = hhdr -> hb_sz;      register word sz = hhdr -> hb_sz;
Line 656  word dummy;
Line 899  word dummy;
     register word *p, *plim;      register word *p, *plim;
   
     p = (word *)(hbp->hb_body);      p = (word *)(hbp->hb_body);
     word_no = HDR_WORDS;      word_no = 0;
     if (sz > MAXOBJSZ) {      if (sz > MAXOBJSZ) {
         plim = p;          plim = p;
     } else {      } else {
Line 665  word dummy;
Line 908  word dummy;
     /* go through all words in block */      /* go through all words in block */
         while( p <= plim ) {          while( p <= plim ) {
             if( mark_bit_from_hdr(hhdr, word_no)              if( mark_bit_from_hdr(hhdr, word_no)
                 && GC_has_debug_info((ptr_t)p)) {                  && GC_HAS_DEBUG_INFO((ptr_t)p)) {
                 ptr_t clobbered = GC_check_annotated_obj((oh *)p);                  ptr_t clobbered = GC_check_annotated_obj((oh *)p);
   
                 if (clobbered != 0) {                  if (clobbered != 0) GC_add_smashed(clobbered);
                     GC_err_printf0(  
                         "GC_check_heap_block: found smashed location at ");  
                     GC_print_smashed_obj((ptr_t)p, clobbered);  
                 }  
             }              }
             word_no += sz;              word_no += sz;
             p += sz;              p += sz;
Line 685  word dummy;
Line 924  word dummy;
 void GC_check_heap_proc()  void GC_check_heap_proc()
 {  {
 #   ifndef SMALL_CONFIG  #   ifndef SMALL_CONFIG
         if (sizeof(oh) & (2 * sizeof(word) - 1) != 0) {  #     ifdef ALIGN_DOUBLE
             ABORT("Alignment problem: object header has inappropriate size\n");          GC_STATIC_ASSERT((sizeof(oh) & (2 * sizeof(word) - 1)) == 0);
         }  #     else
           GC_STATIC_ASSERT((sizeof(oh) & (sizeof(word) - 1)) == 0);
   #     endif
 #   endif  #   endif
     GC_apply_to_all_blocks(GC_check_heap_block, (word)0);      GC_apply_to_all_blocks(GC_check_heap_block, (word)0);
 }  }
   
   #endif /* !SHORT_DBG_HDRS */
   
 struct closure {  struct closure {
     GC_finalization_proc cl_fn;      GC_finalization_proc cl_fn;
     GC_PTR cl_data;      GC_PTR cl_data;
Line 706  struct closure {
Line 949  struct closure {
 # endif  # endif
 {  {
     struct closure * result =      struct closure * result =
                 (struct closure *) GC_malloc(sizeof (struct closure));  #   ifdef DBG_HDRS_ALL
         (struct closure *) GC_debug_malloc(sizeof (struct closure),
                                            GC_EXTRAS);
   #   else
         (struct closure *) GC_malloc(sizeof (struct closure));
   #   endif
   
     result -> cl_fn = fn;      result -> cl_fn = fn;
     result -> cl_data = data;      result -> cl_data = data;
Line 726  struct closure {
Line 974  struct closure {
     (*(cl -> cl_fn))((GC_PTR)((char *)obj + sizeof(oh)), cl -> cl_data);      (*(cl -> cl_fn))((GC_PTR)((char *)obj + sizeof(oh)), cl -> cl_data);
 }  }
   
   /* Set ofn and ocd to reflect the values we got back.   */
   static void store_old (obj, my_old_fn, my_old_cd, ofn, ocd)
   GC_PTR obj;
   GC_finalization_proc my_old_fn;
   struct closure * my_old_cd;
   GC_finalization_proc *ofn;
   GC_PTR *ocd;
   {
       if (0 != my_old_fn) {
         if (my_old_fn != GC_debug_invoke_finalizer) {
           GC_err_printf1("Debuggable object at 0x%lx had non-debug finalizer.\n",
                          obj);
           /* This should probably be fatal. */
         } else {
           if (ofn) *ofn = my_old_cd -> cl_fn;
           if (ocd) *ocd = my_old_cd -> cl_data;
         }
       } else {
         if (ofn) *ofn = 0;
         if (ocd) *ocd = 0;
       }
   }
   
 # ifdef __STDC__  # ifdef __STDC__
     void GC_debug_register_finalizer(GC_PTR obj, GC_finalization_proc fn,      void GC_debug_register_finalizer(GC_PTR obj, GC_finalization_proc fn,
Line 740  struct closure {
Line 1010  struct closure {
     GC_PTR *ocd;      GC_PTR *ocd;
 # endif  # endif
 {  {
       GC_finalization_proc my_old_fn;
       GC_PTR my_old_cd;
     ptr_t base = GC_base(obj);      ptr_t base = GC_base(obj);
     if (0 == base || (ptr_t)obj - base != sizeof(oh)) {      if (0 == base || (ptr_t)obj - base != sizeof(oh)) {
         GC_err_printf1(          GC_err_printf1(
             "GC_register_finalizer called with non-base-pointer 0x%lx\n",              "GC_debug_register_finalizer called with non-base-pointer 0x%lx\n",
             obj);              obj);
     }      }
     GC_register_finalizer(base, GC_debug_invoke_finalizer,      if (0 == fn) {
                           GC_make_closure(fn,cd), ofn, ocd);        GC_register_finalizer(base, 0, 0, &my_old_fn, &my_old_cd);
       } else {
         GC_register_finalizer(base, GC_debug_invoke_finalizer,
                               GC_make_closure(fn,cd), &my_old_fn, &my_old_cd);
       }
       store_old(obj, my_old_fn, (struct closure *)my_old_cd, ofn, ocd);
 }  }
   
 # ifdef __STDC__  # ifdef __STDC__
Line 765  struct closure {
Line 1042  struct closure {
     GC_PTR *ocd;      GC_PTR *ocd;
 # endif  # endif
 {  {
       GC_finalization_proc my_old_fn;
       GC_PTR my_old_cd;
     ptr_t base = GC_base(obj);      ptr_t base = GC_base(obj);
     if (0 == base || (ptr_t)obj - base != sizeof(oh)) {      if (0 == base || (ptr_t)obj - base != sizeof(oh)) {
         GC_err_printf1(          GC_err_printf1(
           "GC_register_finalizer_no_order called with non-base-pointer 0x%lx\n",            "GC_debug_register_finalizer_no_order called with non-base-pointer 0x%lx\n",
           obj);            obj);
     }      }
     GC_register_finalizer_no_order(base, GC_debug_invoke_finalizer,      if (0 == fn) {
                                       GC_make_closure(fn,cd), ofn, ocd);        GC_register_finalizer_no_order(base, 0, 0, &my_old_fn, &my_old_cd);
       } else {
         GC_register_finalizer_no_order(base, GC_debug_invoke_finalizer,
                                        GC_make_closure(fn,cd), &my_old_fn,
                                        &my_old_cd);
       }
       store_old(obj, my_old_fn, (struct closure *)my_old_cd, ofn, ocd);
  }   }
   
 # ifdef __STDC__  # ifdef __STDC__
Line 790  struct closure {
Line 1075  struct closure {
     GC_PTR *ocd;      GC_PTR *ocd;
 # endif  # endif
 {  {
       GC_finalization_proc my_old_fn;
       GC_PTR my_old_cd;
     ptr_t base = GC_base(obj);      ptr_t base = GC_base(obj);
     if (0 == base || (ptr_t)obj - base != sizeof(oh)) {      if (0 == base || (ptr_t)obj - base != sizeof(oh)) {
         GC_err_printf1(          GC_err_printf1(
             "GC_register_finalizer_ignore_self called with non-base-pointer 0x%lx\n",              "GC_debug_register_finalizer_ignore_self called with non-base-pointer 0x%lx\n",
             obj);              obj);
     }      }
     GC_register_finalizer_ignore_self(base, GC_debug_invoke_finalizer,      if (0 == fn) {
                                       GC_make_closure(fn,cd), ofn, ocd);        GC_register_finalizer_ignore_self(base, 0, 0, &my_old_fn, &my_old_cd);
       } else {
         GC_register_finalizer_ignore_self(base, GC_debug_invoke_finalizer,
                                        GC_make_closure(fn,cd), &my_old_fn,
                                        &my_old_cd);
       }
       store_old(obj, my_old_fn, (struct closure *)my_old_cd, ofn, ocd);
   }
   
   #ifdef GC_ADD_CALLER
   # define RA GC_RETURN_ADDR,
   #else
   # define RA
   #endif
   
   GC_PTR GC_debug_malloc_replacement(lb)
   size_t lb;
   {
       return GC_debug_malloc(lb, RA "unknown", 0);
   }
   
   GC_PTR GC_debug_realloc_replacement(p, lb)
   GC_PTR p;
   size_t lb;
   {
       return GC_debug_realloc(p, lb, RA "unknown", 0);
 }  }
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.7
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>