X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffd-stream.lisp;h=20a8c2fd3ae3f5e43a27facb860407a642506621;hb=ba7659c92f2b7fac7e9532a3db9114c5bdc4ab55;hp=4b6f09d19b42a70ca9f9907b3cef9fde9f65942a;hpb=e37366e7bb72bc80c6c9908efe09f94ce26add16;p=sbcl.git

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 4b6f09d..20a8c2f 100644
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -43,7 +43,7 @@
 
 (defstruct (fd-stream
 	    (:constructor %make-fd-stream)
-	    (:include lisp-stream
+	    (:include ansi-stream
 		      (misc #'fd-stream-misc-routine))
 	    (:copier nil))
 
@@ -107,7 +107,7 @@
 	 :format-control "~@<~?: ~2I~_~A~:>"
 	 :format-arguments (list note-format (list stream) (strerror errno))))
 (defun simple-file-perror (note-format pathname errno)
-  (error 'simple-stream-error
+  (error 'simple-file-error
 	 :pathname pathname
 	 :format-control "~@<~?: ~2I~_~A~:>"
 	 :format-arguments
@@ -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))))
@@ -479,6 +479,7 @@
 		 (simple-stream-perror "couldn't read from ~S" stream errno)))
 	    ((zerop count)
 	     (setf (fd-stream-listen stream) :eof)
+	     (/show0 "THROWing EOF-INPUT-CATCHER")
 	     (throw 'eof-input-catcher nil))
 	    (t
 	     (incf (fd-stream-ibuf-tail stream) count))))))
@@ -580,9 +581,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
@@ -682,8 +684,8 @@
 	(when (eql size 1)
 	  (setf (fd-stream-n-bin fd-stream) #'fd-stream-read-n-bytes)
 	  (when buffer-p
-	    (setf (lisp-stream-in-buffer fd-stream)
-		  (make-array +in-buffer-length+
+	    (setf (ansi-stream-in-buffer fd-stream)
+		  (make-array +ansi-stream-in-buffer-length+
 			      :element-type '(unsigned-byte 8)))))
 	(setf input-size size)
 	(setf input-type type)))