Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/src/compiler/generic
In directory sc8-pr-cvs1:/tmp/cvs-serv5449/src/compiler/generic

Modified Files:
	core.lisp target-core.lisp 
Log Message:
0.8.6.42:
	Nikodemus Siivola patchery
	... fix FIXME for obscurity of *fixup* structure
	... fix compile with FSHOW defined


Index: core.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/core.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- core.lisp	14 Aug 2003 17:16:12 -0000	1.10
+++ core.lisp	20 Dec 2003 12:08:10 -0000	1.11
@@ -42,14 +42,14 @@
   (values))
 
 ;;; Do "load-time" fixups on the code vector.
-(defun do-core-fixups (code fixups)
-  (declare (list fixups))
-  (dolist (info fixups)
-    (let* ((kind (first info))
-	   (fixup (second info))
+(defun do-core-fixups (code fixup-notes)
+  (declare (list fixup-notes))
+  (dolist (note fixup-notes)
+    (let* ((kind (fixup-note-kind note))
+	   (fixup (fixup-note-fixup note))
+	   (position (fixup-note-position note))
 	   (name (fixup-name fixup))
 	   (flavor (fixup-flavor fixup))
-	   (offset (third info))
 	   (value (ecase flavor
 		    (:assembly-routine
 		     (aver (symbolp name))
@@ -63,7 +63,7 @@
 		    (:code-object
 		     (aver (null name))
 		     (values (get-lisp-obj-address code) t)))))
-      (sb!vm:fixup-code-object code offset value kind))))
+      (sb!vm:fixup-code-object code position value kind))))
 
 ;;; Stick a reference to the function FUN in CODE-OBJECT at index I. If the
 ;;; function hasn't been compiled yet, make a note in the patch table.

Index: target-core.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/target-core.lisp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- target-core.lisp	14 Jan 2002 02:12:02 -0000	1.14
+++ target-core.lisp	20 Dec 2003 12:08:11 -0000	1.15
@@ -35,11 +35,11 @@
 
 ;;; Dump a component to core. We pass in the assembler fixups, code
 ;;; vector and node info.
-(defun make-core-component (component segment length trace-table fixups object)
+(defun make-core-component (component segment length trace-table fixup-notes object)
   (declare (type component component)
 	   (type sb!assem:segment segment)
 	   (type index length)
-	   (list trace-table fixups)
+	   (list trace-table fixup-notes)
 	   (type core-object object))
   (without-gcing
     (let* ((2comp (component-info component))
@@ -71,7 +71,7 @@
 	 (copy-byte-vector-to-system-area v fill-ptr)
 	 (setf fill-ptr (sap+ fill-ptr (length v)))))
 
-      (do-core-fixups code-obj fixups)
+      (do-core-fixups code-obj fixup-notes)
 
       (dolist (entry (ir2-component-entries 2comp))
 	(make-fun-entry entry code-obj object))