Changeset 13188

Timestamp:

Nov 10, 2009, 5:17:34 PM (15 years ago)

Author:

gz

Message:

Merge r13175 (x8632 fix)

Location:

branches/working-0711/ccl/lisp-kernel

Files:

• image.c (modified) (2 diffs)
• x86-gc.c (modified) (1 diff)

branches/working-0711/ccl/lisp-kernel/image.c

@@ -65 +65 @@
         int skip = ((int) start[1])+1;
 #else
-        int skip = ((unsigned short)start[1])+1;
         extern void update_self_references(LispObj *);
+        extern natural imm_word_count(LispObj);
+
+        natural skip = (natural)imm_word_count(((LispObj)start)+fulltag_misc)+1;
         update_self_references(start);
 #endif
@@ -91 +93 @@
       ++start;
     }
+  }
+  if (start > end) {
+    Bug(NULL, "Overran area bounds in relocate_area_contents");
   }
 }

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

@@ -28 +28 @@
 
 #ifdef X8632
-static inline natural
+inline natural
 imm_word_count(LispObj fn)
 {