From: Juho Snellman <jsnell@iki.fi>
Date: Fri, 28 Oct 2005 01:25:20 +0000 (+0000)
Subject: 0.9.6.5:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=2af857f0a5fd09d079d66f86572ee55e99e53d0f;p=sbcl.git

0.9.6.5:
	Specialize parts of OUTPUT-BYTES/FOO for simple strings to avoid
        HAIRY-VECTOR-DATA-REFs in the common case.
---

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 27ece7d..3609191 100644
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -993,21 +993,37 @@
           (do ()
               ((= end start))
             (setf (fd-stream-obuf-tail stream)
-                  (do* ((len (fd-stream-obuf-length stream))
-                        (sap (fd-stream-obuf-sap stream))
-                        (tail (fd-stream-obuf-tail stream)))
-                       ((or (= start end) (< (- len tail) 4)) tail)
-                    ,(if output-restart
-                         `(catch 'output-nothing
-                            (let* ((byte (aref string start))
-                                   (bits (char-code byte)))
-                              ,out-expr
-                              (incf tail ,size)))
-                         `(let* ((byte (aref string start))
-                                  (bits (char-code byte)))
-                             ,out-expr
-                             (incf tail ,size)))
-                    (incf start)))
+                  (flet ((do-it (string)
+                           (do* ((len (fd-stream-obuf-length stream))
+                                 (sap (fd-stream-obuf-sap stream))
+                                 (tail (fd-stream-obuf-tail stream)))
+                                ((or (= start end) (< (- len tail) 4)) tail)
+                             ,(if output-restart
+                                  `(catch 'output-nothing
+                                     (let* ((byte (aref string start))
+                                            (bits (char-code byte)))
+                                       ,out-expr
+                                       (incf tail ,size)))
+                                  `(let* ((byte (aref string start))
+                                          (bits (char-code byte)))
+                                     ,out-expr
+                                     (incf tail ,size)))
+                             (incf start))))
+                    (declare (inline do-it))
+                    ;; Specialized versions for the common cases of
+                    ;; SIMPLE-BASE-STRING and (SIMPLE-ARRAY CHARACTER)
+                    ;; to avoid doing a generic AREF.
+                    (etypecase string
+                      (simple-base-string
+                       (do-it (the simple-base-string string)))
+                      #!+sb-unicode
+                      ((simple-array character)
+                       ;; For some reason the type information from the
+                       ;; etypecase doesn't propagate through here without
+                       ;; an explicit THE.
+                       (do-it (the (simple-array character) string)))
+                      (string
+                       (do-it string)))))
             (when (< start end)
               (flush-output-buffer stream)))
           (when flush-p
@@ -1097,23 +1113,39 @@
           (do ()
               ((= end start))
             (setf (fd-stream-obuf-tail stream)
-                  (do* ((len (fd-stream-obuf-length stream))
-                        (sap (fd-stream-obuf-sap stream))
-                        (tail (fd-stream-obuf-tail stream)))
-                       ((or (= start end) (< (- len tail) 4)) tail)
-                    ,(if output-restart
-                         `(catch 'output-nothing
-                            (let* ((byte (aref string start))
-                                   (bits (char-code byte))
-                                   (size ,out-size-expr))
-                              ,out-expr
-                              (incf tail size)))
-                         `(let* ((byte (aref string start))
-                                 (bits (char-code byte))
-                                 (size ,out-size-expr))
-                            ,out-expr
-                            (incf tail size)))
-                    (incf start)))
+                  (flet ((do-it (string)
+                           (do* ((len (fd-stream-obuf-length stream))
+                                 (sap (fd-stream-obuf-sap stream))
+                                 (tail (fd-stream-obuf-tail stream)))
+                                ((or (= start end) (< (- len tail) 4)) tail)
+                             ,(if output-restart
+                                  `(catch 'output-nothing
+                                     (let* ((byte (aref string start))
+                                            (bits (char-code byte))
+                                            (size ,out-size-expr))
+                                       ,out-expr
+                                       (incf tail size)))
+                                  `(let* ((byte (aref string start))
+                                          (bits (char-code byte))
+                                          (size ,out-size-expr))
+                                     ,out-expr
+                                     (incf tail size)))
+                             (incf start))))
+                    (declare (inline do-it))
+                    ;; Specialized versions for the common cases of
+                    ;; SIMPLE-BASE-STRING and (SIMPLE-ARRAY CHARACTER)
+                    ;; to avoid doing a generic AREF.
+                    (etypecase string
+                      (simple-base-string
+                       (do-it (the simple-base-string string)))
+                      #!+sb-unicode
+                      ((simple-array character)
+                       ;; For some reason the type information from the
+                       ;; etypecase doesn't propagate through here without
+                       ;; an explicit THE.
+                       (do-it (the (simple-array character) string)))
+                      (string
+                       (do-it string)))))
             (when (< start end)
               (flush-output-buffer stream)))
           (when flush-p
diff --git a/version.lisp-expr b/version.lisp-expr
index cd1d6cd..fe47a93 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.6.4"
+"0.9.6.5"