0.6.8.6: applied MNA megapatch (will be edited shortly)

[sbcl.git] / src / compiler / generic / vm-tran.lisp

diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp
index a191047..ad74c20 100644 (file)
--- a/src/compiler/generic/vm-tran.lisp
+++ b/src/compiler/generic/vm-tran.lisp
@@ -11,9 +11,6 @@
 
 (in-package "SB!C")
 
-(file-comment
-  "$Header$")
-
 ;;; FIXME: It would be good to implement SB!XC:DEFCONSTANT, and use
 ;;; use that here, so that the compiler is born knowing this value.
 ;;; FIXME: Add a comment telling whether this holds for all vectors
@@ -81,22 +78,26 @@
         (declare (type (simple-array ,element-type-specifier 1) array))
         (data-vector-ref array index)))))
 
+;;; MNA: open-coded-simple-array patch
 (deftransform data-vector-ref ((array index)
                                (simple-array t))
   (let ((array-type (continuation-type array)))
     (unless (array-type-p array-type)
       (give-up-ir1-transform))
     (let ((dims (array-type-dimensions array-type)))
-      (when (or (atom dims) (= (length dims) 1))
+      (when (and (consp dims) (= (length dims) 1))
         (give-up-ir1-transform))
-      (let ((el-type (array-type-element-type array-type))
-            (total-size (if (member '* dims)
+      (let* ((el-type (array-type-element-type array-type))
+             (total-size (if (or (atom dims) (member '* dims))
                             '*
-                            (reduce #'* dims))))
-        `(data-vector-ref (truly-the (simple-array ,(type-specifier el-type)
-                                                   (,total-size))
-                                     (%array-data-vector array))
-                          index)))))
+                           (reduce #'* dims)))
+             (type-sp `(simple-array ,(type-specifier el-type)
+                        (,total-size))))
+        (if (atom dims)
+          `(let ((a (truly-the ,type-sp (%array-simp array))))
+            (data-vector-ref a index))
+          `(let ((a (truly-the ,type-sp (%array-data-vector array))))
+            (data-vector-ref a index)))))))
 
 (deftransform hairy-data-vector-set ((array index new-value)
                                     (array t t)
@@ -129,23 +130,26 @@
                          index
                          new-value)))))
 
+;;; MNA: open-coded-simple-array patch
 (deftransform data-vector-set ((array index new-value)
                               (simple-array t t))
   (let ((array-type (continuation-type array)))
     (unless (array-type-p array-type)
       (give-up-ir1-transform))
     (let ((dims (array-type-dimensions array-type)))
-      (when (or (atom dims) (= (length dims) 1))
+      (when (and (consp dims) (= (length dims) 1))
        (give-up-ir1-transform))
-      (let ((el-type (array-type-element-type array-type))
-           (total-size (if (member '* dims)
+      (let* ((el-type (array-type-element-type array-type))
+             (total-size (if (or (atom dims) (member '* dims))
                            '*
-                           (reduce #'* dims))))
-       `(data-vector-set (truly-the (simple-array ,(type-specifier el-type)
-                                                  (,total-size))
-                                    (%array-data-vector array))
-                         index
-                         new-value)))))
+                           (reduce #'* dims)))
+             (type-sp `(simple-array ,(type-specifier el-type)
+                        (,total-size))))
+               (if (atom dims)
+           `(let ((a (truly-the ,type-sp (%array-simp array))))
+              (data-vector-set a index new-value))
+           `(let ((a (truly-the ,type-sp (%array-data-vector array))))
+              (data-vector-set a index new-value)))))))
 
 ;;; transforms for getting at simple arrays of (UNSIGNED-BYTE N) when (< N 8)
 ;;;
@@ -182,44 +186,6 @@
   (frob (simple-array (unsigned-byte 2) (*)) 2)
   (frob (simple-array (unsigned-byte 4) (*)) 4))
 \f
-;;;; simple string transforms
-;;;;
-;;;; Note: CMU CL had more of these, including transforms for
-;;;; functions which cons. In SBCL, we've gotten rid of the transforms
-;;;; for functions which cons, since our GC overhead is sufficiently
-;;;; large that it doesn't seem worth it to try to economize on
-;;;; function call overhead or on the overhead of runtime type
-;;;; dispatch in AREF.
-
-;;; FIXME: Shouldn't we be testing for legality of
-;;;   * START1, START2, END1, and END2 indices?
-;;;   * size of copied string relative to destination string?
-;;; (Either there should be tests conditional on SAFETY>=SPEED, or
-;;; the transform should be conditional on SPEED>SAFETY.)
-;;;
-;;; FIXME: Also, the transform should probably be dependent on
-;;; SPEED>SPACE.
-(deftransform replace ((string1 string2 &key (start1 0) (start2 0)
-                               end1 end2)
-                      (simple-string simple-string &rest t))
-  `(locally
-     (declare (optimize (safety 0)))
-     (bit-bash-copy string2
-                   (the index
-                        (+ (the index (* start2 sb!vm:byte-bits))
-                           ,vector-data-bit-offset))
-                   string1
-                   (the index
-                        (+ (the index (* start1 sb!vm:byte-bits))
-                           ,vector-data-bit-offset))
-                   (the index
-                        (* (min (the index (- (or end1 (length string1))
-                                              start1))
-                                (the index (- (or end2 (length string2))
-                                              start2)))
-                           sb!vm:byte-bits)))
-     string1))
-\f
 ;;;; bit vector hackery
 
 ;;; SIMPLE-BIT-VECTOR bit-array operations are transformed to a word loop that
@@ -322,3 +288,4 @@
 (deftransform eql ((x y) (double-float double-float))
   '(and (= (double-float-low-bits x) (double-float-low-bits y))
        (= (double-float-high-bits x) (double-float-high-bits y))))
+