X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fcore.lisp;h=c4b2f7f5cf93c88c40b413e6bbc71ffe7a91945a;hb=75b52379bdc2269961af6a1308eca63610f38ac3;hp=3d29e1914a0d1cb9ff931238e981483bab417fcf;hpb=5ec8d0c1c8b7939818b75118b472fac1af554f9a;p=sbcl.git

diff --git a/src/compiler/generic/core.lisp b/src/compiler/generic/core.lisp
index 3d29e19..c4b2f7f 100644
--- a/src/compiler/generic/core.lisp
+++ b/src/compiler/generic/core.lisp
@@ -31,7 +31,7 @@
   (debug-info () :type list))
 
 ;;; Note the existence of FUNCTION.
-(defun note-function (info function object)
+(defun note-fun (info function object)
   (declare (type function function)
 	   (type core-object object))
   (let ((patch-table (core-object-patch-table object)))
@@ -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))
@@ -57,17 +57,22 @@
 			 (error "undefined assembler routine: ~S" name)))
 		    (:foreign
 		     (aver (stringp name))
-		     (or (foreign-symbol-address-as-integer name)
-			 (error "unknown foreign symbol: ~S")))
+		     ;; FOREIGN-SYMBOL-ADDRESS-AS-INTEGER signals an error
+		     ;; if the symbol isn't found.
+		     (foreign-symbol-address-as-integer name))
+		    #!+linkage-table
+		    (:foreign-dataref
+		     (aver (stringp name))
+		     (foreign-symbol-address-as-integer name t))
 		    #!+x86
 		    (: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.
-(defun reference-core-function (code-obj i fun object)
+;;; 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.
+(defun reference-core-fun (code-obj i fun object)
   (declare (type core-object object) (type functional fun)
 	   (type index i))
   (let* ((info (leaf-info fun))