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

Diff for /OpenXM_contrib2/asir2000/gc/ptr_chck.c between version 1.1 and 1.2

version 1.1, 1999/12/03 07:39:10 version 1.2, 2001/04/20 07:39:19
Line 10 
Line 10 
  * 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.
  */   */
 /* Boehm, September 19, 1995 1:26 pm PDT */  
   
 #include "gc_priv.h"  /*
 #include "gc_mark.h"   * These are checking routines calls to which could be inserted by a
    * preprocessor to validate C pointer arithmetic.
    */
   
   #include "private/gc_pmark.h"
   
 #ifdef __STDC__  #ifdef __STDC__
 void GC_default_same_obj_print_proc(GC_PTR p, GC_PTR q)  void GC_default_same_obj_print_proc(GC_PTR p, GC_PTR q)
 #else  #else
Line 69  void (*GC_same_obj_print_proc) GC_PROTO((GC_PTR, GC_PT
Line 72  void (*GC_same_obj_print_proc) GC_PROTO((GC_PTR, GC_PT
            h = FORWARDED_ADDR(h, hhdr);             h = FORWARDED_ADDR(h, hhdr);
            hhdr = HDR(h);             hhdr = HDR(h);
         }          }
         limit = (ptr_t)((word *)h + HDR_WORDS + hhdr -> hb_sz);          limit = (ptr_t)((word *)h + hhdr -> hb_sz);
         if ((ptr_t)p >= limit || (ptr_t)q >= limit || (ptr_t)q < (ptr_t)h ) {          if ((ptr_t)p >= limit || (ptr_t)q >= limit || (ptr_t)q < (ptr_t)h ) {
             goto fail;              goto fail;
         }          }
Line 83  void (*GC_same_obj_print_proc) GC_PROTO((GC_PTR, GC_PT
Line 86  void (*GC_same_obj_print_proc) GC_PROTO((GC_PTR, GC_PT
         goto fail;          goto fail;
       }        }
     } else {      } else {
 #     ifdef ALL_INTERIOR_POINTERS        register int map_entry;
         register map_entry_type map_entry;        register int pdispl = HBLKDISPL(p);
         register int pdispl;  
         map_entry = MAP_ENTRY((hhdr -> hb_map), pdispl);
         pdispl = HBLKDISPL(p);        if (map_entry > CPP_MAX_OFFSET) {
         map_entry = MAP_ENTRY((hhdr -> hb_map), pdispl);           map_entry = BYTES_TO_WORDS(pdispl) % BYTES_TO_WORDS(sz);
         if (map_entry == OBJ_INVALID) {           if (HBLKPTR(p) != HBLKPTR(q)) goto fail;
             goto fail;                  /* W/o this check, we might miss an error if    */
         } else {                  /* q points to the first object on a page, and  */
             base = (char *)((word)p & ~(WORDS_TO_BYTES(1) - 1));                  /* points just before the page.                 */
             base -= WORDS_TO_BYTES(map_entry);        }
         }        base = (char *)((word)p & ~(WORDS_TO_BYTES(1) - 1));
 #     else        base -= WORDS_TO_BYTES(map_entry);
         register int offset = HBLKDISPL(p) - HDR_BYTES;  
         register word correction = offset % sz;  
   
         if (HBLKPTR(p) != HBLKPTR(q)) {  
             /* The following computation otherwise fails in this case */  
             goto fail;  
         }  
         base = (ptr_t)p - correction;  
 #     endif  
       limit = base + sz;        limit = base + sz;
     }      }
     /* [base, limit) delimits the object containing p, if any.  */      /* [base, limit) delimits the object containing p, if any.  */
Line 137  void (*GC_is_valid_displacement_print_proc) GC_PROTO((
Line 131  void (*GC_is_valid_displacement_print_proc) GC_PROTO((
   
 /* Check that if p is a pointer to a heap page, then it points to       */  /* Check that if p is a pointer to a heap page, then it points to       */
 /* a valid displacement within a heap object.                           */  /* a valid displacement within a heap object.                           */
 /* Uninteresting with ALL_INTERIOR_POINTERS.                            */  /* Uninteresting with GC_all_interior_pointers.                         */
 /* Always returns its argument.                                         */  /* Always returns its argument.                                         */
 /* Note that we don't lock, since nothing relevant about the header     */  /* Note that we don't lock, since nothing relevant about the header     */
 /* should change while we have a valid object pointer to the block.     */  /* should change while we have a valid object pointer to the block.     */
Line 158  void (*GC_is_valid_displacement_print_proc) GC_PROTO((
Line 152  void (*GC_is_valid_displacement_print_proc) GC_PROTO((
     hhdr = HDR((word)p);      hhdr = HDR((word)p);
     if (hhdr == 0) return(p);      if (hhdr == 0) return(p);
     h = HBLKPTR(p);      h = HBLKPTR(p);
 #   ifdef ALL_INTERIOR_POINTERS      if (GC_all_interior_pointers) {
         while (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {          while (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
            h = FORWARDED_ADDR(h, hhdr);             h = FORWARDED_ADDR(h, hhdr);
            hhdr = HDR(h);             hhdr = HDR(h);
         }          }
 #   endif      }
     if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {      if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
         goto fail;          goto fail;
     }      }
Line 252  ptr_t p;
Line 246  ptr_t p;
   
             if (GC_is_static_root(p)) return(p);              if (GC_is_static_root(p)) return(p);
             /* Else do it again correctly:      */              /* Else do it again correctly:      */
 #           if (defined(DYNAMIC_LOADING) || defined(MSWIN32) || defined(PCR)) \  #           if (defined(DYNAMIC_LOADING) || defined(MSWIN32) || \
                   defined(MSWINCE) || defined(PCR)) \
                 && !defined(SRC_M3)                  && !defined(SRC_M3)
                 DISABLE_SIGNALS();                  DISABLE_SIGNALS();
                 GC_register_dynamic_libraries();                  GC_register_dynamic_libraries();
Line 270  ptr_t p;
Line 265  ptr_t p;
             if (HBLKPTR(base) != HBLKPTR(p)) hhdr = HDR((word)p);              if (HBLKPTR(base) != HBLKPTR(p)) hhdr = HDR((word)p);
             descr = hhdr -> hb_descr;              descr = hhdr -> hb_descr;
     retry:      retry:
             switch(descr & DS_TAGS) {              switch(descr & GC_DS_TAGS) {
                 case DS_LENGTH:                  case GC_DS_LENGTH:
                     if ((word)((ptr_t)p - (ptr_t)base) > (word)descr) goto fail;                      if ((word)((ptr_t)p - (ptr_t)base) > (word)descr) goto fail;
                     break;                      break;
                 case DS_BITMAP:                  case GC_DS_BITMAP:
                     if ((ptr_t)p - (ptr_t)base                      if ((ptr_t)p - (ptr_t)base
                          >= WORDS_TO_BYTES(BITMAP_BITS)                           >= WORDS_TO_BYTES(BITMAP_BITS)
                          || ((word)p & (sizeof(word) - 1))) goto fail;                           || ((word)p & (sizeof(word) - 1))) goto fail;
                     if (!((1 << (WORDSZ - ((ptr_t)p - (ptr_t)base) - 1))                      if (!((1 << (WORDSZ - ((ptr_t)p - (ptr_t)base) - 1))
                           & descr)) goto fail;                            & descr)) goto fail;
                     break;                      break;
                 case DS_PROC:                  case GC_DS_PROC:
                     /* We could try to decipher this partially.         */                      /* We could try to decipher this partially.         */
                     /* For now we just punt.                            */                      /* For now we just punt.                            */
                     break;                      break;
                 case DS_PER_OBJECT:                  case GC_DS_PER_OBJECT:
                     descr = *(word *)((ptr_t)base + (descr & ~DS_TAGS));                      if ((signed_word)descr >= 0) {
                         descr = *(word *)((ptr_t)base + (descr & ~GC_DS_TAGS));
                       } else {
                         ptr_t type_descr = *(ptr_t *)base;
                         descr = *(word *)(type_descr
                                 - (descr - (GC_DS_PER_OBJECT
                                             - GC_INDIR_PER_OBJ_BIAS)));
                       }
                     goto retry;                      goto retry;
             }              }
             return(p);              return(p);
Line 305  size_t how_much;
Line 307  size_t how_much;
     GC_PTR initial = *p;      GC_PTR initial = *p;
     GC_PTR result = GC_same_obj((GC_PTR)((word)initial + how_much), initial);      GC_PTR result = GC_same_obj((GC_PTR)((word)initial + how_much), initial);
   
 #   ifndef ALL_INTERIOR_POINTERS      if (!GC_all_interior_pointers) {
         (void) GC_is_valid_displacement(result);          (void) GC_is_valid_displacement(result);
 #   endif      }
     return (*p = result);      return (*p = result);
 }  }
   
Line 318  size_t how_much;
Line 320  size_t how_much;
     GC_PTR initial = *p;      GC_PTR initial = *p;
     GC_PTR result = GC_same_obj((GC_PTR)((word)initial + how_much), initial);      GC_PTR result = GC_same_obj((GC_PTR)((word)initial + how_much), initial);
   
 #   ifndef ALL_INTERIOR_POINTERS      if (!GC_all_interior_pointers) {
         (void) GC_is_valid_displacement(result);          (void) GC_is_valid_displacement(result);
 #   endif      }
     *p = result;      *p = result;
     return(initial);      return(initial);
 }  }
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>