0.9.2.26: refactoring internals of foreign linkage

[sbcl.git] / src / compiler / x86 / c-call.lisp

diff --git a/src/compiler/x86/c-call.lisp b/src/compiler/x86/c-call.lisp
index 479c9f1..f2bd52a 100644 (file)
--- a/src/compiler/x86/c-call.lisp
+++ b/src/compiler/x86/c-call.lisp
@@ -181,8 +181,8 @@
                                     ,@(new-args))))))
         (sb!c::give-up-ir1-transform))))
 
-(define-vop (foreign-symbol-address)
-  (:translate foreign-symbol-address)
+(define-vop (foreign-symbol-sap)
+  (:translate foreign-symbol-sap)
   (:policy :fast-safe)
   (:args)
   (:arg-types (:constant simple-string))
@@ -193,8 +193,8 @@
    (inst lea res (make-fixup foreign-symbol :foreign))))
 
 #!+linkage-table
-(define-vop (foreign-symbol-dataref-address)
-  (:translate foreign-symbol-dataref-address)
+(define-vop (foreign-symbol-dataref-sap)
+  (:translate foreign-symbol-dataref-sap)
   (:policy :fast-safe)
   (:args)
   (:arg-types (:constant simple-string))
@@ -381,7 +381,7 @@ pointer to the arguments."
              (inst push eax)                       ; arg1
              (inst push (ash index 2))             ; arg0
              (inst push (get-lisp-obj-address #'enter-alien-callback)) ; function
-             (inst mov  eax (foreign-symbol-address-as-integer "funcall3"))
+             (inst mov  eax (foreign-symbol-address "funcall3"))
              (inst call eax)
              ;; now put the result into the right register
              (cond