0.9.2.26: refactoring internals of foreign linkage

[sbcl.git] / src / compiler / saptran.lisp

diff --git a/src/compiler/saptran.lisp b/src/compiler/saptran.lisp
index f709cea..178e61e 100644 (file)
--- a/src/compiler/saptran.lisp
+++ b/src/compiler/saptran.lisp
@@ -14,18 +14,17 @@
 ;;;; DEFKNOWNs
 
 #!+linkage-table
-(deftransform foreign-symbol-address-as-integer ((symbol &optional datap)
-                                                (simple-string boolean))
+(deftransform foreign-symbol-address ((symbol &optional datap) (simple-string boolean))
   (if (and (constant-lvar-p symbol) (constant-lvar-p datap))
-      `(sap-int (foreign-symbol-address symbol datap))
+      `(sap-int (foreign-symbol-sap symbol datap))
       (give-up-ir1-transform)))
 
-(deftransform foreign-symbol-address ((symbol &optional datap)
+(deftransform foreign-symbol-sap ((symbol &optional datap)
                                      (simple-string &optional boolean))
     #!-linkage-table
     (if (null datap)
        (give-up-ir1-transform)
-       `(foreign-symbol-address symbol))
+       `(foreign-symbol-sap symbol))
     #!+linkage-table
     (if (and (constant-lvar-p symbol) (constant-lvar-p datap))
        (let ((name (lvar-value symbol))
@@ -33,8 +32,8 @@
          (if (or #+sb-xc-host t ; only static symbols on host
                   (not datap)
                  (find-foreign-symbol-in-table name *static-foreign-symbols*))
-             `(foreign-symbol-address ,name) ; VOP
-             `(foreign-symbol-dataref-address ,name))) ; VOP
+             `(foreign-symbol-sap ,name) ; VOP
+             `(foreign-symbol-dataref-sap ,name))) ; VOP
        (give-up-ir1-transform)))
 
 (defknown (sap< sap<= sap= sap>= sap>)