Changeset 7673 for branches

Timestamp:

Nov 18, 2007, 10:07:21 PM (17 years ago)

Author:

Gary Byers

Message:

Try not to lose it when marking partly-initialized function-vectors.

File:

• branches/working-0711/ccl/lisp-kernel/x86-gc.c (modified) (5 diffs)

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

@@ -373 +373 @@
           Bug(NULL, "Function 0x%lx trashed",n);
         }
+        if (prefix_nodes == 0) {
+          return;
+        }
       }
       base += (1+element_count);
@@ -430 +433 @@
 /*
   This wants to be in assembler even more than "mark_root" does.
-  For now, it does link-inversion: hard as that is to express in C,
-  reliable stack-overflow detection may be even harder ...
+  It tries to do recursive marking as long as stack space exists,
+  then reverts to link-inversion.
 */
 void
@@ -539 +542 @@
 
       if (subtag == subtag_function) {
-        if ((int)base[1] >= nmark) {
+        natural prefix_nodes = (natural) ((int) deref(base,1));
+
+        if (prefix_nodes >= nmark) {
           Bug(NULL,"Bad function at 0x%lx",n);
+        }
+        if (prefix_nodes == 0) {
+          return;
         }
         nmark -= (int)base[1];
@@ -623 +631 @@
        word is added to the aligned address of the  boundary word (restoring
        the original 'this' pointer, and we climb.
+
+       If the boundary word is 0 or the immediate-word-count is 0, we
+       climb: the function's being initialized and doesn't have any
+       embedded lisp pointers yet.
 
        Not that bad.
@@ -776 +788 @@
         element_count -= 1;
     }
-
+    if (boundary[0] != function_boundary_marker) {
+      this = (LispObj) boundary;
+      goto MarkFunctionDone;
+    }
     this = (LispObj)(base) + (tag_of(this))  + ((element_count+1) << node_shift);
     goto MarkVectorLoop;