0.pre7.61:

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

diff --git a/src/compiler/aliencomp.lisp b/src/compiler/aliencomp.lisp
index f586d86..80176a6 100644 (file)
--- a/src/compiler/aliencomp.lisp
+++ b/src/compiler/aliencomp.lisp
@@ -157,7 +157,7 @@
   (multiple-value-bind (slot-offset slot-type)
       (find-slot-offset-and-type alien slot)
     (/noshow "in DEFTRANSFORM %SLOT-ADDR, creating %SAP-ALIEN")
-    `(%sap-alien (sap+ (alien-sap alien) (/ ,slot-offset sb!vm:byte-bits))
+    `(%sap-alien (sap+ (alien-sap alien) (/ ,slot-offset sb!vm:n-byte-bits))
                 ',(make-alien-pointer-type :to slot-type))))
 \f
 ;;;; DEREF support
@@ -280,7 +280,7 @@
       (compute-deref-guts alien indices)
     (/noshow "in DEFTRANSFORM %DEREF-ADDR, creating (LAMBDA .. %SAP-ALIEN)")
     `(lambda (alien ,@indices-args)
-       (%sap-alien (sap+ (alien-sap alien) (/ ,offset-expr sb!vm:byte-bits))
+       (%sap-alien (sap+ (alien-sap alien) (/ ,offset-expr sb!vm:n-byte-bits))
                   ',(make-alien-pointer-type :to element-type)))))
 \f
 ;;;; support for aliens on the heap
@@ -350,11 +350,11 @@
       #!+x86 `(truly-the system-area-pointer
                         (%primitive alloc-alien-stack-space
                                     ,(ceiling (alien-type-bits alien-type)
-                                              sb!vm:byte-bits)))
+                                              sb!vm:n-byte-bits)))
       #!-x86 `(truly-the system-area-pointer
                         (%primitive alloc-number-stack-space
                                     ,(ceiling (alien-type-bits alien-type)
-                                              sb!vm:byte-bits)))
+                                              sb!vm:n-byte-bits)))
       (let* ((alien-rep-type-spec (compute-alien-rep-type alien-type))
             (alien-rep-type (specifier-type alien-rep-type-spec)))
        (cond ((csubtypep (specifier-type 'system-area-pointer)
@@ -437,10 +437,10 @@
     (if (local-alien-info-force-to-memory-p info)
       #!+x86 `(%primitive dealloc-alien-stack-space
                          ,(ceiling (alien-type-bits alien-type)
-                                   sb!vm:byte-bits))
+                                   sb!vm:n-byte-bits))
       #!-x86 `(%primitive dealloc-number-stack-space
                          ,(ceiling (alien-type-bits alien-type)
-                                   sb!vm:byte-bits))
+                                   sb!vm:n-byte-bits))
       nil)))
 \f
 ;;;; %CAST
@@ -521,7 +521,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 +572,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)))