X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsaptran.lisp;h=178e61e5d550d11bfece0226f33bff4c6bd30bd8;hb=dc33d6a6b84f8338e603759cec8e25da29055d50;hp=f709ceabb939765169e5ff9c69c32dd7d09bdeb8;hpb=15ecd1ada227a60bcb3a660a4924c8d9449cb997;p=sbcl.git diff --git a/src/compiler/saptran.lisp b/src/compiler/saptran.lisp index f709cea..178e61e 100644 --- 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>)