Changeset 9466 for branches

Timestamp:

May 13, 2008, 12:00:27 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

Add update_self_references() for x8632. Call it in compact_dynamic_heap().

Endian-related tweak to dnode_forwarding_address().

Trivia: there are 3 separate versions of update_self_references running
around. In addition to this one in C, there's one in LAP (used by the
compiler when creating functions) and another in Lisp, used by the cross-
dumper.

File:

• branches/ia32/lisp-kernel/x86-gc.c (modified) (5 diffs)

branches/ia32/lisp-kernel/x86-gc.c

@@ -143 +143 @@
 #ifdef X8632
     {
-      LispObj fun;
+      LispObj fun = 0;
 
       if (*(unsigned char *)n == RECOVER_FN_OPCODE)
@@ -2078 +2078 @@
   pagelet = dnode >> 5;
   nbits = dnode & 0x1f;
-  near_bits = ((unsigned short *)GCdynamic_markbits)[dnode>>4];
+  /* On little-endian x86, we have to flip the low bit of dnode>>4 to
+     get the near_bits from the appropriate half-word. */
+  near_bits = ((unsigned short *)GCdynamic_markbits)[(dnode>>4)^1];
 
   if (nbits < 16) {
@@ -2480 +2482 @@
 }
 
+#ifdef X8632
+void
+update_self_references(LispObj *node)
+{
+  LispObj fn = fulltag_misc + (LispObj)node;
+  unsigned char *p = (unsigned char *)node;
+  natural i, offset;
+
+  i = ((unsigned short *)node)[2] - 2;
+  offset = node[i];
+  while (offset) {
+    *(LispObj *)(p + offset) = fn;
+    offset = node[--i];
+  }    
+}
+#endif
 
 /*
@@ -2547 +2565 @@
 #ifdef X8632
             int skip = *((unsigned short *)src);
+            LispObj *f = dest;
 #else
             int skip = *((int *)src);
@@ -2555 +2574 @@
               *dest++ = *src++;
             }
+            update_self_references(f);
             while(elements--) {
               *dest++ = node_forwarding_address(*src++);