0.pre7.60:

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

diff --git a/src/code/bit-bash.lisp b/src/code/bit-bash.lisp
index 1753747..1933baf 100644 (file)
--- a/src/code/bit-bash.lisp
+++ b/src/code/bit-bash.lisp
@@ -14,7 +14,7 @@
 ;;;; constants and types
 
 ;;; the number of bits to process at a time
-(defconstant unit-bits sb!vm:word-bits)
+(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))
@@ -111,7 +111,7 @@
   (let ((address (sap-int sap)))
     (values (int-sap #!-alpha (32bit-logical-andc2 address 3)
                     #!+alpha (ash (ash address -2) 2))
-           (+ (* (logand address 3) byte-bits) offset))))
+           (+ (* (logand address 3) n-byte-bits) offset))))
 
 #!-sb-fluid (declaim (inline word-sap-ref %set-word-sap-ref))
 (defun word-sap-ref (sap offset)
@@ -501,17 +501,19 @@
 (defun copy-byte-vector-to-system-area (bv sap &optional (offset 0))
   ;; FIXME: There should be a type like SB!VM:BYTE so that we can write this
   ;; type as (SIMPLE-ARRAY SB!VM:BYTE 1). Except BYTE is an external symbol of
-  ;; package CL; so maybe SB!VM:VM-BYTE?
+  ;; 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 fixnum offset))
-  ;; FIXME: Actually it looks as though this, and most other calls
-  ;; to COPY-TO-SYSTEM-AREA, could be written more concisely with BYTE-BLT.
-  ;; Except that the DST-END-DST-START convention for the length is confusing.
-  ;; Perhaps I could rename BYTE-BLT to BYTE-BLIT and replace the
-  ;; DST-END argument with an N-BYTES argument?
+  ;; FIXME: Actually it looks as though this, and most other calls to
+  ;; COPY-TO-SYSTEM-AREA, could be written more concisely with
+  ;; %BYTE-BLT. Except that the DST-END-DST-START convention for the
+  ;; length is confusing. Perhaps I could rename %BYTE-BLT to
+  ;; %BYTE-BLIT (and correspondingly rename the corresponding VOP) and
+  ;; replace the DST-END argument with an N-BYTES argument?
   (copy-to-system-area bv
-                      (* sb!vm:vector-data-offset sb!vm:word-bits)
+                      (* vector-data-offset n-word-bits)
                       sap
                       offset
-                      (* (length bv) sb!vm:byte-bits)))
+                      (* (length bv) n-byte-bits)))