X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffd-stream.lisp;h=2bf7810d42ff20c68969110e5bbc597004f4ce41;hb=50305b602c3953440af716137a56f50cd204375d;hp=c6a105275a82ee01262f02e5f8b0c2dca6c386f3;hpb=d3df7e8508d37a831ecf06a2c42ddb6ede1d99fa;p=sbcl.git

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index c6a1052..2bf7810 100644
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -316,37 +316,37 @@
 	    ((<= bytes space)
 	     (if (system-area-pointer-p thing)
 		 (system-area-copy thing
-				   (* start sb!vm:byte-bits)
+				   (* start sb!vm:n-byte-bits)
 				   (fd-stream-obuf-sap fd-stream)
-				   (* tail sb!vm:byte-bits)
-				   (* bytes sb!vm:byte-bits))
+				   (* tail sb!vm:n-byte-bits)
+				   (* bytes sb!vm:n-byte-bits))
 		 ;; FIXME: There should be some type checking somewhere to
 		 ;; verify that THING here is a vector, not just <not a SAP>.
 		 (copy-to-system-area thing
-				      (+ (* start sb!vm:byte-bits)
+				      (+ (* start sb!vm:n-byte-bits)
 					 (* sb!vm:vector-data-offset
-					    sb!vm:word-bits))
+					    sb!vm:n-word-bits))
 				      (fd-stream-obuf-sap fd-stream)
-				      (* tail sb!vm:byte-bits)
-				      (* bytes sb!vm:byte-bits)))
+				      (* tail sb!vm:n-byte-bits)
+				      (* bytes sb!vm:n-byte-bits)))
 	     (setf (fd-stream-obuf-tail fd-stream) newtail))
 	    ((<= bytes len)
 	     (flush-output-buffer fd-stream)
 	     (if (system-area-pointer-p thing)
 		 (system-area-copy thing
-				   (* start sb!vm:byte-bits)
+				   (* start sb!vm:n-byte-bits)
 				   (fd-stream-obuf-sap fd-stream)
 				   0
-				   (* bytes sb!vm:byte-bits))
+				   (* bytes sb!vm:n-byte-bits))
 		 ;; FIXME: There should be some type checking somewhere to
 		 ;; verify that THING here is a vector, not just <not a SAP>.
 		 (copy-to-system-area thing
-				      (+ (* start sb!vm:byte-bits)
+				      (+ (* start sb!vm:n-byte-bits)
 					 (* sb!vm:vector-data-offset
-					    sb!vm:word-bits))
+					    sb!vm:n-word-bits))
 				      (fd-stream-obuf-sap fd-stream)
 				      0
-				      (* bytes sb!vm:byte-bits)))
+				      (* bytes sb!vm:n-byte-bits)))
 	     (setf (fd-stream-obuf-tail fd-stream) bytes))
 	    (t
 	     (flush-output-buffer fd-stream)
@@ -429,8 +429,8 @@
 	     (setf (fd-stream-ibuf-tail stream) 0))
 	    (t
 	     (decf tail head)
-	     (system-area-copy ibuf-sap (* head sb!vm:byte-bits)
-			       ibuf-sap 0 (* tail sb!vm:byte-bits))
+	     (system-area-copy ibuf-sap (* head sb!vm:n-byte-bits)
+			       ibuf-sap 0 (* tail sb!vm:n-byte-bits))
 	     (setf head 0)
 	     (setf (fd-stream-ibuf-head stream) 0)
 	     (setf (fd-stream-ibuf-tail stream) tail))))
@@ -580,9 +580,10 @@
   (declare (type index start end))
   (let* ((length (- end start))
 	 (string (make-string length)))
-    (copy-from-system-area sap (* start sb!vm:byte-bits)
-			   string (* sb!vm:vector-data-offset sb!vm:word-bits)
-			   (* length sb!vm:byte-bits))
+    (copy-from-system-area sap (* start sb!vm:n-byte-bits)
+			   string (* sb!vm:vector-data-offset
+				     sb!vm:n-word-bits)
+			   (* length sb!vm:n-byte-bits))
     string))
 
 ;;; the N-BIN method for FD-STREAMs