Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/src/compiler/generic
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20413/src/compiler/generic

Modified Files:
	vm-tran.lisp 
Log Message:
1.0.34.5: remove dead DATA-VECTOR-{REF,SET} transforms

The transforms for (SIMPLE-ARRAY (UNSIGNED-BYTE N)) where (< N 8) have
never been used.  Consign them to the version control bitbucket.


Index: vm-tran.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-tran.lisp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- vm-tran.lisp	28 Jun 2009 21:37:05 -0000	1.84
+++ vm-tran.lisp	6 Jan 2010 16:56:22 -0000	1.85
@@ -295,41 +295,6 @@
   '(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
-;;; we fix them or should we delete them? (Perhaps these definitions
-;;; predate the various DATA-VECTOR-REF-FOO VOPs which have
-;;; (:TRANSLATE DATA-VECTOR-REF), and are redundant now?)
-#+nil
-(macrolet
-    ((frob (type bits)
-       (let ((elements-per-word (truncate sb!vm:n-word-bits bits)))
-         `(progn
-            (deftransform data-vector-ref ((vector index)
-                                           (,type *))
-              `(multiple-value-bind (word bit)
-                   (floor index ,',elements-per-word)
-                 (ldb ,(ecase sb!vm:target-byte-order
-                         (:little-endian '(byte ,bits (* bit ,bits)))
-                         (:big-endian '(byte ,bits (- sb!vm:n-word-bits
-                                                      (* (1+ bit) ,bits)))))
-                      (%vector-raw-bits vector word))))
-            (deftransform data-vector-set ((vector index new-value)
-                                           (,type * *))
-              `(multiple-value-bind (word bit)
-                   (floor index ,',elements-per-word)
-                 (setf (ldb ,(ecase sb!vm:target-byte-order
-                               (:little-endian '(byte ,bits (* bit ,bits)))
-                               (:big-endian
-                                '(byte ,bits (- sb!vm:n-word-bits
-                                                (* (1+ bit) ,bits)))))
-                            (%vector-raw-bits vector word))
-                       new-value)))))))
-  (frob simple-bit-vector 1)
-  (frob (simple-array (unsigned-byte 2) (*)) 2)
-  (frob (simple-array (unsigned-byte 4) (*)) 4))
 
 ;;;; BIT-VECTOR hackery

Update of /cvsroot/sbcl/sbcl
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20413

Modified Files:
	version.lisp-expr 
Log Message:
1.0.34.5: remove dead DATA-VECTOR-{REF,SET} transforms

The transforms for (SIMPLE-ARRAY (UNSIGNED-BYTE N)) where (< N 8) have
never been used.  Consign them to the version control bitbucket.


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4715
retrieving revision 1.4716
diff -u -d -r1.4715 -r1.4716
--- version.lisp-expr	6 Jan 2010 05:05:43 -0000	1.4715
+++ version.lisp-expr	6 Jan 2010 16:56:22 -0000	1.4716
@@ -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".)
-"1.0.34.4"
+"1.0.34.5"

Update of /cvsroot/sbcl/sbcl
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8144

Modified Files:
	version.lisp-expr 
Log Message:
1.0.34.4: micro-optimize widetag checking on x86oids

If we are checking a range of widetags and there are no more widetags to
check, we can tweak the widetag and do a single, unsigned comparison.


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4714
retrieving revision 1.4715
diff -u -d -r1.4714 -r1.4715
--- version.lisp-expr	4 Jan 2010 15:55:21 -0000	1.4714
+++ version.lisp-expr	6 Jan 2010 05:05:43 -0000	1.4715
@@ -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".)
-"1.0.34.3"
+"1.0.34.4"

Update of /cvsroot/sbcl/sbcl/src/compiler/x86-64
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8144/src/compiler/x86-64

Modified Files:
	type-vops.lisp 
Log Message:
1.0.34.4: micro-optimize widetag checking on x86oids

If we are checking a range of widetags and there are no more widetags to
check, we can tweak the widetag and do a single, unsigned comparison.


Index: type-vops.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/x86-64/type-vops.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- type-vops.lisp	5 Jun 2009 11:36:48 -0000	1.15
+++ type-vops.lisp	6 Jan 2010 05:05:44 -0000	1.16
@@ -83,13 +83,14 @@
 (defun %test-headers (value target not-p function-p headers
                             &optional (drop-through (gen-label)))
   (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag)))
-    (multiple-value-bind (equal less-or-equal when-true when-false)
-        ;; EQUAL and LESS-OR-EQUAL are the conditions for branching to TARGET.
-        ;; WHEN-TRUE and WHEN-FALSE are the labels to branch to when we know
-        ;; it's true and when we know it's false respectively.
+    (multiple-value-bind (equal less-or-equal greater-or-equal when-true when-false)
+        ;; EQUAL, LESS-OR-EQUAL, and GREATER-OR-EQUAL are the conditions
+        ;; for branching to TARGET.  WHEN-TRUE and WHEN-FALSE are the
+        ;; labels to branch to when we know it's true and when we know
+        ;; it's false respectively.
         (if not-p
-            (values :ne :a drop-through target)
-            (values :e :na target drop-through))
+            (values :ne :a :b drop-through target)
+            (values :e :na :nb target drop-through))
       (%test-lowtag value when-false t lowtag)
       (inst mov al-tn (make-ea :byte :base value :disp (- lowtag)))
       (do ((remaining headers (cdr remaining)))
@@ -105,13 +106,28 @@
            (t
              (let ((start (car header))
                    (end (cdr header)))
-               (unless (= start bignum-widetag)
-                 (inst cmp al-tn start)
-                 (inst jmp :b when-false)) ; was :l
-               (inst cmp al-tn end)
-               (if last
-                   (inst jmp less-or-equal target)
-                   (inst jmp :be when-true))))))) ; was :le
+               (cond
+                 ((= start bignum-widetag)
+                  (inst cmp al-tn end)
+                  (if last
+                      (inst jmp less-or-equal target)
+                      (inst jmp :be when-true)))
+                 ((= end complex-array-widetag)
+                  (inst cmp al-tn start)
+                  (if last
+                      (inst jmp greater-or-equal target)
+                      (inst jmp :b when-false)))
+                 ((not last)
+                  (inst cmp al-tn start)
+                  (inst jmp :b when-false)
+                  (inst cmp al-tn end)
+                  (if last
+                      (inst jmp less-or-equal target)
+                      (inst jmp :be when-true)))
+                 (t
+                  (inst sub al-tn start)
+                  (inst cmp al-tn (- end start))
+                  (inst jmp less-or-equal target))))))))
       (emit-label drop-through))))
 
 

Update of /cvsroot/sbcl/sbcl/src/compiler/x86
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8144/src/compiler/x86

Modified Files:
	type-vops.lisp 
Log Message:
1.0.34.4: micro-optimize widetag checking on x86oids

If we are checking a range of widetags and there are no more widetags to
check, we can tweak the widetag and do a single, unsigned comparison.


Index: type-vops.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/x86/type-vops.lisp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- type-vops.lisp	5 Jun 2009 11:36:48 -0000	1.23
+++ type-vops.lisp	6 Jan 2010 05:05:44 -0000	1.24
@@ -127,18 +127,28 @@
                      ;; was true.
                      (return))
                     (t
-                     (unless (= start bignum-widetag)
-                       (inst cmp al-tn start)
-                       (if (= end complex-array-widetag)
-                           (progn
-                             (aver last)
-                             (inst jmp greater-or-equal target))
-                           (inst jmp :b when-false))) ; was :l
-                     (unless (= end complex-array-widetag)
-                       (inst cmp al-tn end)
-                       (if last
-                           (inst jmp less-or-equal target)
-                           (inst jmp :be when-true)))))))))))) ; was :le
+                     (cond
+                       ((= start bignum-widetag)
+                        (inst cmp al-tn end)
+                        (if last
+                            (inst jmp less-or-equal target)
+                            (inst jmp :be when-true)))
+                       ((= end complex-array-widetag)
+                        (inst cmp al-tn start)
+                        (if last
+                            (inst jmp greater-or-equal target)
+                            (inst jmp :b when-false)))
+                       ((not last)
+                        (inst cmp al-tn start)
+                        (inst jmp :b when-false)
+                        (inst cmp al-tn end)
+                        (if last
+                            (inst jmp less-or-equal target)
+                            (inst jmp :be when-true)))
+                       (t
+                        (inst sub al-tn start)
+                        (inst cmp al-tn (- end start))
+                        (inst jmp less-or-equal target))))))))))))
       (emit-label drop-through))))
 
 ;;;; type checking and testing