X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fbit-bash.lisp;h=bd25d4b809942c20e458ce9c856b66e61d62b7d6;hb=f2218c68ed978533fc46830ac81f4517fefe5a2a;hp=6afe33cce59a467d34ade6b5ae53c4a6eccde2ff;hpb=b08e81cd5a06fe5d792f0be1d1c2bf3409a4ae60;p=sbcl.git

diff --git a/src/code/bit-bash.lisp b/src/code/bit-bash.lisp
index 6afe33c..bd25d4b 100644
--- a/src/code/bit-bash.lisp
+++ b/src/code/bit-bash.lisp
@@ -13,7 +13,8 @@
 
 ;;;; types
 
-(deftype bit-offset () '(integer 0 (#.sb!vm:n-word-bits)))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (deftype bit-offset () '(integer 0 (#.sb!vm:n-word-bits))))
 
 ;;;; support routines
 
@@ -21,8 +22,8 @@
 ;;; these, or DEFTRANSFORMs to convert them into something supported
 ;;; by the architecture.
 (macrolet ((def (name &rest args)
-	     `(defun ,name ,args
-		(,name ,@args))))
+             `(defun ,name ,args
+                (,name ,@args))))
   (def word-logical-not x)
   (def word-logical-and x y)
   (def word-logical-or x y)
@@ -39,32 +40,34 @@
 ;;; at the "end" and removing bits from the "start". On big-endian
 ;;; machines this is a left-shift and on little-endian machines this
 ;;; is a right-shift.
-(defun shift-towards-start (number countoid)
-  (declare (type sb!vm:word number) (fixnum countoid))
-  (let ((count (ldb (byte (1- (integer-length sb!vm:n-word-bits)) 0) countoid)))
-    (declare (type bit-offset count))
-    (if (zerop count)
-	number
-	(ecase sb!c:*backend-byte-order*
-	  (:big-endian
-	   (ash (ldb (byte (- sb!vm:n-word-bits count) 0) number) count))
-	  (:little-endian
-	   (ash number (- count)))))))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun shift-towards-start (number countoid)
+    (declare (type sb!vm:word number) (fixnum countoid))
+    (let ((count (ldb (byte (1- (integer-length sb!vm:n-word-bits)) 0) countoid)))
+      (declare (type bit-offset count))
+      (if (zerop count)
+          number
+          (ecase sb!c:*backend-byte-order*
+            (:big-endian
+               (ash (ldb (byte (- sb!vm:n-word-bits count) 0) number) count))
+            (:little-endian
+               (ash number (- count))))))))
 
 ;;; Shift NUMBER by COUNT bits, adding zero bits at the "start" and
 ;;; removing bits from the "end". On big-endian machines this is a
 ;;; right-shift and on little-endian machines this is a left-shift.
-(defun shift-towards-end (number count)
-  (declare (type sb!vm:word number) (fixnum count))
-  (let ((count (ldb (byte (1- (integer-length sb!vm:n-word-bits)) 0) count)))
-    (declare (type bit-offset count))
-    (if (zerop count)
-	number
-	(ecase sb!c:*backend-byte-order*
-	  (:big-endian
-	   (ash number (- count)))
-	  (:little-endian
-	   (ash (ldb (byte (- sb!vm:n-word-bits count) 0) number) count))))))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun shift-towards-end (number count)
+    (declare (type sb!vm:word number) (fixnum count))
+    (let ((count (ldb (byte (1- (integer-length sb!vm:n-word-bits)) 0) count)))
+      (declare (type bit-offset count))
+      (if (zerop count)
+          number
+          (ecase sb!c:*backend-byte-order*
+            (:big-endian
+               (ash number (- count)))
+            (:little-endian
+               (ash (ldb (byte (- sb!vm:n-word-bits count) 0) number) count)))))))
 
 #!-sb-fluid (declaim (inline start-mask end-mask))
 
@@ -87,18 +90,18 @@
 #!-sb-fluid (declaim (inline word-sap-ref %set-word-sap-ref))
 (defun word-sap-ref (sap offset)
   (declare (type system-area-pointer sap)
-	   (type index offset)
-	   (values sb!vm:word)
-	   (optimize (speed 3) (safety 0) #-sb-xc-host (inhibit-warnings 3)))
+           (type index offset)
+           (values sb!vm:word)
+           (optimize (speed 3) (safety 0) #-sb-xc-host (inhibit-warnings 3)))
   (sap-ref-word sap (the index (ash offset sb!vm:n-fixnum-tag-bits))))
 (defun %set-word-sap-ref (sap offset value)
   (declare (type system-area-pointer sap)
-	   (type index offset)
-	   (type sb!vm:word value)
-	   (values sb!vm:word)
-	   (optimize (speed 3) (safety 0) (inhibit-warnings 3)))
+           (type index offset)
+           (type sb!vm:word value)
+           (values sb!vm:word)
+           (optimize (speed 3) (safety 0) (inhibit-warnings 3)))
   (setf (sap-ref-word sap (the index (ash offset sb!vm:n-fixnum-tag-bits)))
-	value))
+        value))
 
 
 ;;; the actual bashers and common uses of same
@@ -149,7 +152,7 @@
                            (8  0)
                            (16 0)
                            (32 0)
-			   (64 0))))
+                           (64 0))))
          (offset `(integer 0 ,max-bytes))
          (max-word-offset (ceiling max-bytes bytes-per-word))
          (word-offset `(integer 0 ,max-word-offset))