Code refactoring regarding GC_PUSH_ONE_HEAP (mark)

* finalize.c (GC_ignore_self_finalize_mark_proc): Pass
GC_mark_stack_top to GC_PUSH_ONE_HEAP.
* mark.c (PUSH_GRANULE): Likewise.
* include/private/gc_pmark.h (GC_PUSH_ONE_HEAP): Replace
hard-coded GC_mark_stack_top with mark_stack_top argument; reformat
comment; add missing brackets.

diff --git a/finalize.c b/finalize.c
index 56f62f1f9985ce7ef18e22684d3d475e4c9decde..f66d76e00013b50238d475f1032ab9cbfff73f96 100644 (file)
--- a/finalize.c
+++ b/finalize.c
@@ -335,7 +335,7 @@ STATIC void GC_ignore_self_finalize_mark_proc(ptr_t p)
     for (q = p; q <= scan_limit; q += ALIGNMENT) {
         r = *(word *)q;
         if ((ptr_t)r < p || (ptr_t)r > target_limit) {
-            GC_PUSH_ONE_HEAP(r, q);
+            GC_PUSH_ONE_HEAP(r, q, GC_mark_stack_top);
         }
     }
 }

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index 42fbb20481d529cf67a8d0ca85b0af4364d64263..04aa8c3cd7181bf21264fa09c1699975cb789a73 100644 (file)
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -392,18 +392,14 @@ exit_label: ; \
       }
 #endif
 
-
-/*
- * As above, but interior pointer recognition as for
- * normal heap pointers.
- */
-#define GC_PUSH_ONE_HEAP(p,source) \
-    FIXUP_POINTER(p); \
-    if ((ptr_t)(p) >= (ptr_t)GC_least_plausible_heap_addr \
-         && (ptr_t)(p) < (ptr_t)GC_greatest_plausible_heap_addr) { \
-      GC_mark_stack_top = GC_mark_and_push( \
-                            (void *)(p), GC_mark_stack_top, \
-                            GC_mark_stack_limit, (void * *)(source)); \
+/* As above, but interior pointer recognition as for normal heap pointers. */
+#define GC_PUSH_ONE_HEAP(p,source,mark_stack_top) \
+    { \
+      FIXUP_POINTER(p); \
+      if ((ptr_t)(p) >= (ptr_t)GC_least_plausible_heap_addr \
+          && (ptr_t)(p) < (ptr_t)GC_greatest_plausible_heap_addr) \
+        mark_stack_top = GC_mark_and_push((void *)(p), mark_stack_top, \
+                                GC_mark_stack_limit, (void * *)(source)); \
     }
 
 /* Mark starting at mark stack entry top (incl.) down to        */

diff --git a/mark.c b/mark.c
index 87e2b4a981816dd2e87856deb8a5ee685b3b2b3c..5bef7f9e70036904685232eaa7e26a49c7cfcc5d 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -1537,25 +1537,25 @@ GC_INNER void GC_push_all_stack(ptr_t bottom, ptr_t top)
 #   define USE_PUSH_MARKED_ACCELERATORS
 #   define PUSH_GRANULE(q) \
                 { word qcontents = (q)[0]; \
-                  GC_PUSH_ONE_HEAP(qcontents, (q)); }
+                  GC_PUSH_ONE_HEAP(qcontents, q, GC_mark_stack_top); }
 # elif GC_GRANULE_WORDS == 2
 #   define USE_PUSH_MARKED_ACCELERATORS
 #   define PUSH_GRANULE(q) \
                 { word qcontents = (q)[0]; \
-                  GC_PUSH_ONE_HEAP(qcontents, (q)); \
+                  GC_PUSH_ONE_HEAP(qcontents, q, GC_mark_stack_top); \
                   qcontents = (q)[1]; \
-                  GC_PUSH_ONE_HEAP(qcontents, (q)+1); }
+                  GC_PUSH_ONE_HEAP(qcontents, (q)+1, GC_mark_stack_top); }
 # elif GC_GRANULE_WORDS == 4
 #   define USE_PUSH_MARKED_ACCELERATORS
 #   define PUSH_GRANULE(q) \
                 { word qcontents = (q)[0]; \
-                  GC_PUSH_ONE_HEAP(qcontents, (q)); \
+                  GC_PUSH_ONE_HEAP(qcontents, q, GC_mark_stack_top); \
                   qcontents = (q)[1]; \
-                  GC_PUSH_ONE_HEAP(qcontents, (q)+1); \
+                  GC_PUSH_ONE_HEAP(qcontents, (q)+1, GC_mark_stack_top); \
                   qcontents = (q)[2]; \
-                  GC_PUSH_ONE_HEAP(qcontents, (q)+2); \
+                  GC_PUSH_ONE_HEAP(qcontents, (q)+2, GC_mark_stack_top); \
                   qcontents = (q)[3]; \
-                  GC_PUSH_ONE_HEAP(qcontents, (q)+3); }
+                  GC_PUSH_ONE_HEAP(qcontents, (q)+3, GC_mark_stack_top); }
 # endif
 #endif /* !USE_MARK_BYTES && MARK_BIT_PER_GRANULE */