X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-tran.lisp;h=92dac91f5cd78a8fc6de3b889709e8d8a4df2b4d;hb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;hp=9f22eb0d16c58913f4422a9746207d78c8bc6188;hpb=ce3935c80e46e3f5fbaeab82eb1ccabe82cb44f9;p=sbcl.git

diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp
index 9f22eb0..92dac91 100644
--- a/src/compiler/generic/vm-tran.lisp
+++ b/src/compiler/generic/vm-tran.lisp
@@ -54,20 +54,7 @@
     ;; to hand-expand it ourselves.)
     (let ((element-type-specifier (type-specifier element-ctype)))
       `(multiple-value-bind (array index)
-	   ;; FIXME: All this noise should move into a
-	   ;; %DATA-VECTOR-AND-INDEX function, and there should be
-	   ;; DEFTRANSFORMs for %DATA-VECTOR-AND-INDEX to optimize the
-	   ;; function call away when the array is known to be simple,
-	   ;; and to specialize to
-	   ;; %DATA-VECTOR-AND-INDEX-IN-VECTOR-CASE when the array is
-	   ;; known to have only one dimension.
-	   (if (array-header-p array)
-	       (%with-array-data array index nil)
-	       (let ((array array))
-		 (declare (type (simple-array ,element-type-specifier 1)
-				array))
-		 (%check-bound array 0 index)
-		 (values array index)))
+	   (%data-vector-and-index array index)
 	 (declare (type (simple-array ,element-type-specifier 1) array))
 	 (data-vector-ref array index)))))
 
@@ -100,22 +87,10 @@
        "Upgraded element type of array is not known at compile time."))
     (let ((element-type-specifier (type-specifier element-ctype)))
       `(multiple-value-bind (array index)
-	   ;; FIXME: All this noise should move into a
-	   ;; %DATA-VECTOR-AND-INDEX function, and there should be
-	   ;; DEFTRANSFORMs for %DATA-VECTOR-AND-INDEX to optimize the
-	   ;; function call away when the array is known to be simple,
-	   ;; and to specialize to
-	   ;; %DATA-VECTOR-AND-INDEX-IN-VECTOR-CASE when the array is
-	   ;; known to have only one dimension.
-	   (if (array-header-p array)
-	       (%with-array-data array index nil)
-	       (let ((array array))
-		 (declare (type (simple-array ,element-type-specifier 1)
-				array))
-		 (%check-bound array 0 index)
-		 (values array index)))
-	 (data-vector-set (truly-the (simple-array ,element-type-specifier 1)
-				     array)
+	   (%data-vector-and-index array index)
+	 (declare (type (simple-array ,element-type-specifier 1) array)
+	          (type ,element-type-specifier new-value))
+	 (data-vector-set array
 			  index
 			  new-value)))))
 
@@ -137,6 +112,29 @@
                           index
                           new-value)))))
 
+(defoptimizer (%data-vector-and-index derive-type) ((array index))
+  (let ((atype (continuation-type array)))
+    (when (array-type-p atype)
+      (values-specifier-type
+       `(values (simple-array ,(type-specifier
+                                (array-type-specialized-element-type atype))
+                              (*))
+                index)))))
+
+(deftransform %data-vector-and-index ((array index)
+                                     (simple-array t)
+                                     *
+                                     :important t)
+
+  ;; We do this solely for the -OR-GIVE-UP side effect, since we want
+  ;; to know that the type can be figured out in the end before we
+  ;; proceed, but we don't care yet what the type will turn out to be.
+  (upgraded-element-type-specifier-or-give-up array)
+
+  '(if (array-header-p array)
+       (values (%array-data-vector array) index)
+       (values array index)))
+
 ;;; transforms for getting at simple arrays of (UNSIGNED-BYTE N) when (< N 8)
 ;;;
 ;;; FIXME: In CMU CL, these were commented out with #+NIL. Why? Should
@@ -266,6 +264,42 @@
 		     (type index index end-1))
 	    (setf (%raw-bits result-bit-array index)
 		  (32bit-logical-not (%raw-bits bit-array index))))))))
+
+(deftransform bit-vector-= ((x y) (simple-bit-vector simple-bit-vector))
+  `(and (= (length x) (length y))
+        (let ((length (length x)))
+	  (or (= length 0)
+	      (do* ((i sb!vm:vector-data-offset (+ i 1))
+		    (end-1 (+ sb!vm:vector-data-offset
+			      (floor (1- length) sb!vm:n-word-bits))))
+		   ((= i end-1)
+		    (let* ((extra (mod length sb!vm:n-word-bits))
+			   (mask (1- (ash 1 extra)))
+			   (numx
+			    (logand
+			     (ash mask
+				  ,(ecase sb!c:*backend-byte-order*
+				     (:little-endian 0)
+				     (:big-endian
+				      '(- sb!vm:n-word-bits extra))))
+			     (%raw-bits x i)))
+			   (numy
+			    (logand
+			     (ash mask
+				  ,(ecase sb!c:*backend-byte-order*
+				     (:little-endian 0)
+				     (:big-endian
+				      '(- sb!vm:n-word-bits extra))))
+			     (%raw-bits y i))))
+		      (declare (type (integer 0 31) extra)
+			       (type (unsigned-byte 32) mask numx numy))
+		      (= numx numy)))
+		(declare (type index i end-1))
+		(let ((numx (%raw-bits x i))
+		      (numy (%raw-bits y i)))
+		  (declare (type (unsigned-byte 32) numx numy))
+		  (unless (= numx numy)
+		    (return nil))))))))
 
 ;;;; %BYTE-BLT