Changeset 13260

Timestamp:

Dec 7, 2009, 4:39:21 PM (15 years ago)

Author:

Gary Byers

Message:

Handle locatives (xpPC) and TRAs in purify(). (At least try to
pick up the case where the function has already been forwarded;
this can probably be fooled in some pathological cases.)

File:

• branches/purify/source/lisp-kernel/x86-gc.c (modified) (4 diffs)

branches/purify/source/lisp-kernel/x86-gc.c

@@ -2256 +2256 @@
 
 
-  /* Leave a trail of breadcrumbs.  Or maybe just one breadcrumb. */
-  /* Actually, it's best to always leave a trail, for two reasons.
-     a) We may be walking the same heap that we're leaving forwaring
-     pointers in, so we don't want garbage that we leave behind to
-     look like a header.
-     b) We'd like to be able to forward code-vector locatives, and
-     it's easiest to do so if we leave a {forward_marker, dnode_locative}
-     pair at every doubleword in the old vector.
-     */
   while(physbytes) {
     *old++ = (BytePtr) forward_marker;
@@ -2281 +2272 @@
 
 Boolean
-copy_reference(LispObj *ref, BytePtr low, BytePtr high, area *dest, int what)
+purify_locref(LispObj *ref,  BytePtr low, BytePtr high, area *dest, int what)
 {
   LispObj obj = *ref, header, new;
@@ -2287 +2278 @@
   Boolean changed = false;
 
+  if ((((BytePtr)ptr_from_lispobj(obj)) > low) &&
+      (((BytePtr)ptr_from_lispobj(obj)) < high)) {
+    header = deref(obj, 0);
+    if (header == forward_marker) { /* already copied */
+      *ref = (untag(deref(obj,1)) + tag);
+      changed = true;
+    } else {
+      header_tag = fulltag_of(header);
+      if ((what == PURIFY_ALL) ||
+          ((what & PURIFY_IVECTORS) &&
+           immheader_tag_p(header_tag) &&
+           header_subtag(header) != subtag_macptr) ||
+          ((what & PURIFY_FUNCTIONS) &&
+           immutable_function_p(obj))) {
+        new = purify_object(obj, dest);
+        *ref = new;
+        changed = (new != obj);
+      }
+    }
+  }
+  return changed;
+}
+
+Boolean
+copy_reference(LispObj *ref, BytePtr low, BytePtr high, area *dest, int what)
+{
+  LispObj obj = *ref;
+  natural tag = fulltag_of(obj);
+
   if (
 #ifdef X8664
-      (tag != fulltag_tra_0) && (tag != fulltag_tra_1)
+      (tag == fulltag_tra_0) || (tag == fulltag_tra_1)
 #endif
 #ifdef X8632
-      tag != fulltag_tra
+      tag == fulltag_tra
 #endif
       ) {
-    if (is_node_fulltag(tag) &&
-        (((BytePtr)ptr_from_lispobj(obj)) > low) &&
-        (((BytePtr)ptr_from_lispobj(obj)) < high)) {
-      header = deref(obj, 0);
-      if (header == forward_marker) { /* already copied */
-        *ref = (untag(deref(obj,1)) + tag);
-        changed = true;
-      } else {
-        header_tag = fulltag_of(header);
-        if ((what == PURIFY_ALL) ||
-            ((what & PURIFY_IVECTORS) &&
-             immheader_tag_p(header_tag) &&
-             header_subtag(header) != subtag_macptr) ||
-            ((what & PURIFY_FUNCTIONS) &&
-             immutable_function_p(obj))) {
-          new = purify_object(obj, dest);
-          *ref = new;
-          changed = (new != obj);
-        }
-      }
-    }
-  }
-  return changed;
-}
+    what = PURIFY_NOTHING;
+  }
+  if (is_node_fulltag(tag)) {
+    return purify_locref(ref,low,high,dest,what);
+  }
+  return false;
+}
+
 
 
@@ -2469 +2473 @@
   copy_reference(&(regs[Itemp1]), low, high, to, what);
   copy_reference(&(regs[Itemp2]), low, high, to, what);
-#if 0
-  purify_locref(&(regs[Iip]), low, high, to, what);
-#endif
+
+  purify_locref(&(regs[Iip]), low, high, to, PURIFY_NOTHING);
+
 #else
 #endif