0.8.0.24:

[sbcl.git] / src / code / bit-bash.lisp

diff --git a/src/code/bit-bash.lisp b/src/code/bit-bash.lisp
index 68865a9..23f58ec 100644 (file)
--- a/src/code/bit-bash.lisp
+++ b/src/code/bit-bash.lisp
@@ -17,7 +17,7 @@
 (defconstant unit-bits n-word-bits)
 
 ;;; the maximum number of bits that can be dealt with in a single call
-(defconstant max-bits (ash most-positive-fixnum -2))
+(defconstant max-bits (ash sb!xc:most-positive-fixnum -2))
 
 (deftype unit ()
   `(unsigned-byte ,unit-bits))
@@ -39,20 +39,20 @@
 ;;; A particular implementation must offer either VOPs to translate
 ;;; these, or DEFTRANSFORMs to convert them into something supported
 ;;; by the architecture.
-(macrolet ((def-frob (name &rest args)
+(macrolet ((def (name &rest args)
             `(defun ,name ,args
                (,name ,@args))))
-  (def-frob 32bit-logical-not x)
-  (def-frob 32bit-logical-and x y)
-  (def-frob 32bit-logical-or x y)
-  (def-frob 32bit-logical-xor x y)
-  (def-frob 32bit-logical-nor x y)
-  (def-frob 32bit-logical-eqv x y)
-  (def-frob 32bit-logical-nand x y)
-  (def-frob 32bit-logical-andc1 x y)
-  (def-frob 32bit-logical-andc2 x y)
-  (def-frob 32bit-logical-orc1 x y)
-  (def-frob 32bit-logical-orc2 x y))
+  (def 32bit-logical-not x)
+  (def 32bit-logical-and x y)
+  (def 32bit-logical-or x y)
+  (def 32bit-logical-xor x y)
+  (def 32bit-logical-nor x y)
+  (def 32bit-logical-eqv x y)
+  (def 32bit-logical-nand x y)
+  (def 32bit-logical-andc1 x y)
+  (def 32bit-logical-andc2 x y)
+  (def 32bit-logical-orc1 x y)
+  (def 32bit-logical-orc2 x y))
 
 ;;; Shift NUMBER by the low-order bits of COUNTOID, adding zero bits
 ;;; at the "end" and removing bits from the "start". On big-endian
@@ -504,7 +504,7 @@
   ;; package CL, and shadowing it would be too ugly; so maybe SB!VM:VMBYTE?
   ;; (And then N-BYTE-BITS would be N-VMBYTE-BITS and so forth?)
   (declare (type (simple-array (unsigned-byte 8) 1) bv))
-  (declare (type sap sap))
+  (declare (type system-area-pointer sap))
   (declare (type fixnum offset))
   ;; FIXME: Actually it looks as though this, and most other calls to
   ;; COPY-TO-SYSTEM-AREA, could be written more concisely with