Changeset 11748 for trunk/source/lisp-kernel/x86-gc.c

Timestamp:

Feb 17, 2009, 3:09:46 PM (12 years ago)

Author:

gb

Message:

In compact_dynamic_heap(), don't call update_self_references() if
'skip' (non-node words in the function) is 0.

Be paranoid about this in update_self_references(), too, but it's
more important to check in the caller, since update_self_references()
operates on the destination vector after the non-node words have been
copied. (If 0 non-nodes are copied, the destination vector will have
a random value for the non-node word count and random offsets in the
self-reference table.)

? (ccl::allocate-typed-vector :function 9)
#<a funny-looking function, at this point>
? (process-run-function "at the wrong time" (lambda () (gc)))

File:

• trunk/source/lisp-kernel/x86-gc.c (modified) (2 diffs)

trunk/source/lisp-kernel/x86-gc.c

@@ -1859 +1859 @@
 
   i = ((unsigned short *)node)[2];
-  offset = node[--i];
-  while (offset) {
-    *(LispObj *)(p + offset) = fn;
+  if (i) {
     offset = node[--i];
+    while (offset) {
+      *(LispObj *)(p + offset) = fn;
+      offset = node[--i];
+    }
   }    
 }
@@ -1935 +1937 @@
 #endif
             *dest++ = node;
-            elements -= skip;
-            while(skip--) {
-              *dest++ = *src++;
-            }
+            if (skip) {
+              elements -= skip;
+              while(skip--) {
+                *dest++ = *src++;
+              }
 #ifdef X8632
-            update_self_references(f);
-#endif
+              update_self_references(f);
+#endif
+            }
             while(elements--) {
               *dest++ = node_forwarding_address(*src++);