Upgrade Boehm GC to 7.2alpha4.

[cacao.git] / src / mm / boehm-gc / obj_map.c

diff --git a/src/mm/boehm-gc/obj_map.c b/src/mm/boehm-gc/obj_map.c
index 8198a7e5a6b7ef5a1d7bd8d21bbbe5b53f8a029a..972ba4916265b97c74cf6bf41a2017343b551e3e 100644 (file)
--- a/src/mm/boehm-gc/obj_map.c
+++ b/src/mm/boehm-gc/obj_map.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
  * Copyright (c) 1991, 1992 by Xerox Corporation.  All rights reserved.
  * Copyright (c) 1999-2001 by Hewlett-Packard Company. All rights reserved.
@@ -12,14 +12,14 @@
  * provided the above notices are retained, and a notice that the code was
  * modified is included with the above copyright notice.
  */
-  
+
+#include "private/gc_priv.h"
+
 /* Routines for maintaining maps describing heap block
  * layouts for various object sizes.  Allows fast pointer validity checks
  * and fast location of object start locations on machines (such as SPARC)
  * with slow division.
  */
- 
-# include "private/gc_priv.h"
 
 /* Consider pointers that are offset bytes displaced from the beginning */
 /* of an object to be valid.                                            */
@@ -27,13 +27,13 @@
 GC_API void GC_CALL GC_register_displacement(size_t offset)
 {
     DCL_LOCK_STATE;
-    
+
     LOCK();
     GC_register_displacement_inner(offset);
     UNLOCK();
 }
 
-void GC_register_displacement_inner(size_t offset) 
+GC_INNER void GC_register_displacement_inner(size_t offset)
 {
     if (offset >= VALID_OFFSET_SZ) {
         ABORT("Bad argument to GC_register_displacement");
@@ -45,14 +45,14 @@ void GC_register_displacement_inner(size_t offset)
 }
 
 #ifdef MARK_BIT_PER_GRANULE
-/* Add a heap block map for objects of size granules to obj_map.       */
-/* Return FALSE on failure.                                            */
-/* A size of 0 granules is used for large objects.                     */
-GC_bool GC_add_map_entry(size_t granules)
-{
+  /* Add a heap block map for objects of size granules to obj_map.      */
+  /* Return FALSE on failure.                                           */
+  /* A size of 0 granules is used for large objects.                    */
+  GC_INNER GC_bool GC_add_map_entry(size_t granules)
+  {
     unsigned displ;
     short * new_map;
-    
+
     if (granules > BYTES_TO_GRANULES(MAXOBJBYTES)) granules = 0;
     if (GC_obj_map[granules] != 0) {
         return(TRUE);
@@ -61,29 +61,30 @@ GC_bool GC_add_map_entry(size_t granules)
     if (new_map == 0) return(FALSE);
     if (GC_print_stats)
         GC_log_printf("Adding block map for size of %u granules (%u bytes)\n",
-                 (unsigned)granules, (unsigned)(GRANULES_TO_BYTES(granules)));
+                  (unsigned)granules, (unsigned)(GRANULES_TO_BYTES(granules)));
     if (granules == 0) {
       for (displ = 0; displ < BYTES_TO_GRANULES(HBLKSIZE); displ++) {
         new_map[displ] = 1;  /* Nonzero to get us out of marker fast path. */
       }
     } else {
       for (displ = 0; displ < BYTES_TO_GRANULES(HBLKSIZE); displ++) {
-       new_map[displ] = (short)(displ % granules);
+        new_map[displ] = (short)(displ % granules);
       }
     }
     GC_obj_map[granules] = new_map;
     return(TRUE);
-}
+  }
 #endif
 
-static GC_bool offsets_initialized = FALSE;
-
-void GC_initialize_offsets(void)
+GC_INNER void GC_initialize_offsets(void)
 {
+    static GC_bool offsets_initialized = FALSE;
+
     if (!offsets_initialized) {
       int i;
       if (GC_all_interior_pointers) {
-       for (i = 0; i < VALID_OFFSET_SZ; ++i) GC_valid_offsets[i] = TRUE;
+        for (i = 0; i < VALID_OFFSET_SZ; ++i)
+          GC_valid_offsets[i] = TRUE;
       }
       offsets_initialized = TRUE;
     }