0.7.6.27:

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

diff --git a/src/compiler/aliencomp.lisp b/src/compiler/aliencomp.lisp
index bcb569c..85f2b1a 100644 (file)
--- a/src/compiler/aliencomp.lisp
+++ b/src/compiler/aliencomp.lisp
@@ -68,7 +68,6 @@
 
 (defknown alien-funcall (alien-value &rest *) *
   (any recursive))
-(defknown %alien-funcall (system-area-pointer alien-type &rest *) *)
 \f
 ;;;; cosmetic transforms
 
@@ -186,7 +185,7 @@
     (typecase alien-type
       (alien-pointer-type
        (when (cdr indices)
-        (abort-ir1-transform "too many indices for pointer deref: ~D"
+        (abort-ir1-transform "too many indices for pointer deref: ~W"
                              (length indices)))
        (let ((element-type (alien-pointer-type-to alien-type)))
         (if indices
@@ -470,7 +469,7 @@
   (let ((alien-node (continuation-use alien)))
     (typecase alien-node
       (combination
-       (extract-function-args alien '%sap-alien 2)
+       (extract-fun-args alien '%sap-alien 2)
        '(lambda (sap type)
          (declare (ignore type))
          sap))
@@ -521,7 +520,7 @@
         (count-low-order-zeros (continuation-value thing))
         (count-low-order-zeros (continuation-use thing))))
     (combination
-     (case (continuation-function-name (combination-fun thing))
+     (case (continuation-fun-name (combination-fun thing))
        ((+ -)
        (let ((min most-positive-fixnum)
              (itype (specifier-type 'integer)))
@@ -572,7 +571,7 @@
 (deftransform ash ((value amount))
   (let ((value-node (continuation-use value)))
     (unless (and (combination-p value-node)
-                (eq (continuation-function-name (combination-fun value-node))
+                (eq (continuation-fun-name (combination-fun value-node))
                     'ash))
       (give-up-ir1-transform))
     (let ((inside-args (combination-args value-node)))
@@ -582,7 +581,7 @@
        (unless (and (constant-continuation-p inside-amount)
                     (not (minusp (continuation-value inside-amount))))
          (give-up-ir1-transform)))))
-  (extract-function-args value 'ash 2)
+  (extract-fun-args value 'ash 2)
   '(lambda (value amount1 amount2)
      (ash value (+ amount1 amount2))))
 \f
@@ -607,7 +606,7 @@
       (let ((arg-types (alien-fun-type-arg-types alien-type)))
        (unless (= (length args) (length arg-types))
          (abort-ir1-transform
-          "wrong number of arguments; expected ~D, got ~D"
+          "wrong number of arguments; expected ~W, got ~W"
           (length arg-types)
           (length args)))
        (collect ((params) (deports))