0.pre7.88:

[sbcl.git] / src / code / target-alieneval.lisp

diff --git a/src/code/target-alieneval.lisp b/src/code/target-alieneval.lisp
index 67daaec..eafe1e7 100644 (file)
--- a/src/code/target-alieneval.lisp
+++ b/src/code/target-alieneval.lisp
@@ -325,7 +325,7 @@
        (let* ((field (slot-or-lose type slot))
              (offset (alien-record-field-offset field))
              (field-type (alien-record-field-type field)))
-        (%sap-alien (sap+ (alien-sap alien) (/ offset sb!vm:byte-bits))
+        (%sap-alien (sap+ (alien-sap alien) (/ offset sb!vm:n-byte-bits))
                     (make-alien-pointer-type :to field-type)))))))
 \f
 ;;;; the DEREF operator
@@ -341,7 +341,7 @@
     (etypecase type
       (alien-pointer-type
        (when (cdr indices)
-        (error "too many indices when derefing ~S: ~D"
+        (error "too many indices when DEREF'ing ~S: ~W"
                type
                (length indices)))
        (let ((element-type (alien-pointer-type-to type)))
@@ -353,7 +353,7 @@
                     0))))
       (alien-array-type
        (unless (= (length indices) (length (alien-array-type-dimensions type)))
-        (error "incorrect number of indices when derefing ~S: ~D"
+        (error "incorrect number of indices when DEREF'ing ~S: ~W"
                type (length indices)))
        (labels ((frob (dims indices offset)
                  (if (null dims)
@@ -399,7 +399,7 @@
           (type list indices)
           (optimize (inhibit-warnings 3)))
   (multiple-value-bind (target-type offset) (deref-guts alien indices)
-    (%sap-alien (sap+ (alien-value-sap alien) (/ offset sb!vm:byte-bits))
+    (%sap-alien (sap+ (alien-value-sap alien) (/ offset sb!vm:n-byte-bits))
                (make-alien-pointer-type :to target-type))))
 \f
 ;;;; accessing heap alien variables
@@ -495,11 +495,11 @@
           (optimize (inhibit-warnings 3)))
   (if (or (alien-pointer-type-p target-type)
          (alien-array-type-p target-type)
-         (alien-function-type-p target-type))
+         (alien-fun-type-p target-type))
       (let ((alien-type (alien-value-type alien)))
        (if (or (alien-pointer-type-p alien-type)
                (alien-array-type-p alien-type)
-               (alien-function-type-p alien-type))
+               (alien-fun-type-p alien-type))
            (naturalize (alien-value-sap alien) target-type)
            (error "~S cannot be casted." alien)))
       (error "cannot cast to alien type ~S" (unparse-alien-type target-type))))
@@ -516,8 +516,8 @@
        (values (ceiling bits
                         (ecase units
                           (:bits 1)
-                          (:bytes sb!vm:byte-bits)
-                          (:words sb!vm:word-bits))))
+                          (:bytes sb!vm:n-byte-bits)
+                          (:words sb!vm:n-word-bits))))
        (error "unknown size for alien type ~S"
               (unparse-alien-type alien-type)))))
 \f
@@ -558,14 +558,14 @@
     (typecase type
       (alien-pointer-type
        (apply #'alien-funcall (deref alien) args))
-      (alien-function-type
-       (unless (= (length (alien-function-type-arg-types type))
+      (alien-fun-type
+       (unless (= (length (alien-fun-type-arg-types type))
                  (length args))
-        (error "wrong number of arguments for ~S~%expected ~D, got ~D"
+        (error "wrong number of arguments for ~S~%expected ~W, got ~W"
                type
-               (length (alien-function-type-arg-types type))
+               (length (alien-fun-type-arg-types type))
                (length args)))
-       (let ((stub (alien-function-type-stub type)))
+       (let ((stub (alien-fun-type-stub type)))
         (unless stub
           (setf stub
                 (let ((fun (gensym))
@@ -574,7 +574,7 @@
                            `(lambda (,fun ,@parms)
                               (declare (type (alien ,type) ,fun))
                               (alien-funcall ,fun ,@parms)))))
-          (setf (alien-function-type-stub type) stub))
+          (setf (alien-fun-type-stub type) stub))
         (apply stub alien args)))
       (t
        (error "~S is not an alien function." alien)))))
@@ -653,7 +653,7 @@
         ;; anyway, and (2) such a declamation can be (especially for
         ;; alien values) both messy to do by hand and very important
         ;; for performance of later code which uses the return value.
-        (declaim (ftype (function (mapcar (constantly t) ',args)
+        (declaim (ftype (function ,(mapcar (constantly t) args)
                                   (alien ,result-type))
                         ,lisp-name))