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

Diff for /OpenXM_contrib2/asir2000/gc/obj_map.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 1 
Line 1 
 /*  /*
  * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers   * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
  * Copyright (c) 1991, 1992 by Xerox Corporation.  All rights reserved.   * Copyright (c) 1991, 1992 by Xerox Corporation.  All rights reserved.
    * Copyright (c) 1999-2001 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 11 
Line 12 
  * 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, October 9, 1995 1:09 pm PDT */  
   
 /* Routines for maintaining maps describing heap block  /* Routines for maintaining maps describing heap block
  * layouts for various object sizes.  Allows fast pointer validity checks   * layouts for various object sizes.  Allows fast pointer validity checks
Line 19 
Line 19 
  * with slow division.   * with slow division.
  */   */
   
 # include "gc_priv.h"  # include "private/gc_priv.h"
   
 char * GC_invalid_map = 0;  map_entry_type * GC_invalid_map = 0;
   
 /* Invalidate the object map associated with a block.   Free blocks     */  /* Invalidate the object map associated with a block.   Free blocks     */
 /* are identified by invalid maps.                                      */  /* are identified by invalid maps.                                      */
Line 31  hdr *hhdr;
Line 31  hdr *hhdr;
     register int displ;      register int displ;
   
     if (GC_invalid_map == 0) {      if (GC_invalid_map == 0) {
         GC_invalid_map = GC_scratch_alloc(MAP_SIZE);          GC_invalid_map = (map_entry_type *)GC_scratch_alloc(MAP_SIZE);
         if (GC_invalid_map == 0) {          if (GC_invalid_map == 0) {
             GC_err_printf0(              GC_err_printf0(
                 "Cant initialize GC_invalid_map: insufficient memory\n");                  "Cant initialize GC_invalid_map: insufficient memory\n");
Line 54  hdr *hhdr;
Line 54  hdr *hhdr;
     GC_word offset;      GC_word offset;
 # endif  # endif
 {  {
 # ifndef ALL_INTERIOR_POINTERS  
     DCL_LOCK_STATE;      DCL_LOCK_STATE;
   
     DISABLE_SIGNALS();      DISABLE_SIGNALS();
Line 62  hdr *hhdr;
Line 61  hdr *hhdr;
     GC_register_displacement_inner(offset);      GC_register_displacement_inner(offset);
     UNLOCK();      UNLOCK();
     ENABLE_SIGNALS();      ENABLE_SIGNALS();
 # endif  
 }  }
   
 void GC_register_displacement_inner(offset)  void GC_register_displacement_inner(offset)
 word offset;  word offset;
 {  {
 # ifndef ALL_INTERIOR_POINTERS  
     register unsigned i;      register unsigned i;
       word map_entry = BYTES_TO_WORDS(offset);
   
     if (offset > MAX_OFFSET) {      if (offset >= VALID_OFFSET_SZ) {
         ABORT("Bad argument to GC_register_displacement");          ABORT("Bad argument to GC_register_displacement");
     }      }
       if (map_entry > MAX_OFFSET) map_entry = OFFSET_TOO_BIG;
     if (!GC_valid_offsets[offset]) {      if (!GC_valid_offsets[offset]) {
       GC_valid_offsets[offset] = TRUE;        GC_valid_offsets[offset] = TRUE;
       GC_modws_valid_offsets[offset % sizeof(word)] = TRUE;        GC_modws_valid_offsets[offset % sizeof(word)] = TRUE;
       for (i = 0; i <= MAXOBJSZ; i++) {        if (!GC_all_interior_pointers) {
           for (i = 0; i <= MAXOBJSZ; i++) {
           if (GC_obj_map[i] != 0) {            if (GC_obj_map[i] != 0) {
              if (i == 0) {               if (i == 0) {
                GC_obj_map[i][offset + HDR_BYTES] = (char)BYTES_TO_WORDS(offset);                 GC_obj_map[i][offset] = (map_entry_type)map_entry;
              } else {               } else {
                register unsigned j;                 register unsigned j;
                register unsigned lb = WORDS_TO_BYTES(i);                 register unsigned lb = WORDS_TO_BYTES(i);
   
                if (offset < lb) {                 if (offset < lb) {
                  for (j = offset + HDR_BYTES; j < HBLKSIZE; j += lb) {                   for (j = offset; j < HBLKSIZE; j += lb) {
                    GC_obj_map[i][j] = (char)BYTES_TO_WORDS(offset);                     GC_obj_map[i][j] = (map_entry_type)map_entry;
                  }                   }
                }                 }
              }               }
           }            }
           }
       }        }
     }      }
 # endif  
 }  }
   
   
Line 105  word sz;
Line 105  word sz;
 {  {
     register unsigned obj_start;      register unsigned obj_start;
     register unsigned displ;      register unsigned displ;
     register char * new_map;      register map_entry_type * new_map;
       word map_entry;
   
     if (sz > MAXOBJSZ) sz = 0;      if (sz > MAXOBJSZ) sz = 0;
     if (GC_obj_map[sz] != 0) {      if (GC_obj_map[sz] != 0) {
         return(TRUE);          return(TRUE);
     }      }
     new_map = GC_scratch_alloc(MAP_SIZE);      new_map = (map_entry_type *)GC_scratch_alloc(MAP_SIZE);
     if (new_map == 0) return(FALSE);      if (new_map == 0) return(FALSE);
 #   ifdef PRINTSTATS  #   ifdef PRINTSTATS
         GC_printf1("Adding block map for size %lu\n", (unsigned long)sz);          GC_printf1("Adding block map for size %lu\n", (unsigned long)sz);
Line 120  word sz;
Line 121  word sz;
         MAP_ENTRY(new_map,displ) = OBJ_INVALID;          MAP_ENTRY(new_map,displ) = OBJ_INVALID;
     }      }
     if (sz == 0) {      if (sz == 0) {
         for(displ = 0; displ <= MAX_OFFSET; displ++) {          for(displ = 0; displ <= HBLKSIZE; displ++) {
             if (OFFSET_VALID(displ)) {              if (OFFSET_VALID(displ)) {
                 MAP_ENTRY(new_map,displ+HDR_BYTES) = BYTES_TO_WORDS(displ);                  map_entry = BYTES_TO_WORDS(displ);
                   if (map_entry > MAX_OFFSET) map_entry = OFFSET_TOO_BIG;
                   MAP_ENTRY(new_map,displ) = (map_entry_type)map_entry;
             }              }
         }          }
     } else {      } else {
         for (obj_start = HDR_BYTES;          for (obj_start = 0;
              obj_start + WORDS_TO_BYTES(sz) <= HBLKSIZE;               obj_start + WORDS_TO_BYTES(sz) <= HBLKSIZE;
              obj_start += WORDS_TO_BYTES(sz)) {               obj_start += WORDS_TO_BYTES(sz)) {
              for (displ = 0; displ < WORDS_TO_BYTES(sz); displ++) {               for (displ = 0; displ < WORDS_TO_BYTES(sz); displ++) {
                  if (OFFSET_VALID(displ)) {                   if (OFFSET_VALID(displ)) {
                        map_entry = BYTES_TO_WORDS(displ);
                        if (map_entry > MAX_OFFSET) map_entry = OFFSET_TOO_BIG;
                      MAP_ENTRY(new_map, obj_start + displ) =                       MAP_ENTRY(new_map, obj_start + displ) =
                                                 BYTES_TO_WORDS(displ);                                                  (map_entry_type)map_entry;
                  }                   }
              }               }
         }          }
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>