Changeset 13278

Timestamp:

Dec 9, 2009, 10:35:18 AM (15 years ago)

Author:

gz

Message:

Ignore refbits for population.data

Location:

branches/working-0711/ccl/lisp-kernel

Files:

• gc-common.c (modified) (3 diffs)
• x86-gc.c (modified) (1 diff)

branches/working-0711/ccl/lisp-kernel/gc-common.c

@@ -1222 +1222 @@
       */
       LispObj this = lisp_global(WEAKVLL); /* all populations as of last gc */
+      LispObj *tenured_low = (LispObj *)tenured_area->low;
+      natural tenured_dnodes = area_dnode(GCarealow, tenured_low);
+      bitvector refbits = tenured_area->refbits;
+
       while (this) {
         LispObj *base = ptr_from_lispobj(this);
@@ -1229 +1233 @@
           base[1] = GCweakvll;
           GCweakvll = ptr_to_lispobj(base);
+          /* Since will be doing weak processing, don't treat the data as root */
+          dnode = area_dnode(&base[3], tenured_low);
+          if (dnode < tenured_dnodes) {
+            clr_bit(refbits, dnode);
+          }
         }
         else {
@@ -1379 +1388 @@
     reap_gcable_ptrs();
 
+    /* Restore population data refbits for forwarding */
+    if (GCn_ephemeral_dnodes) {
+      LispObj *tenured_low = (LispObj *)tenured_area->low;
+      natural tenured_dnodes = area_dnode(GCarealow, tenured_low);
+      bitvector refbits = tenured_area->refbits;
+      LispObj this = lisp_global(WEAKVLL);
+
+      while (this) {
+        LispObj *base = ptr_from_lispobj(this);
+        natural dnode = area_dnode(&base[3], tenured_low);
+        if ((dnode < tenured_dnodes) && (base[3] >= GCarealow)) {
+          set_bit(refbits, dnode);
+        }
+        this = base[1];
+      }
+    }
+
     GCrelocptr = global_reloctab;
     GCfirstunmarked = calculate_relocation();

branches/working-0711/ccl/lisp-kernel/x86-gc.c

@@ -1205 +1205 @@
         ref_dnode = area_dnode(start, base);
         if (!ref_bit(refbits, ref_dnode)) {
-          Bug(NULL, "Missing memoization in doublenode at 0x%08X", start);
+          Bug(NULL, "Missing memoization in doublenode at 0x" LISP "\n", start);
           set_bit(refbits, ref_dnode);
         }