From: Nathan F. <nf...@us...> - 2004-08-04 22:15:43
|
Update of /cvsroot/sbcl/sbcl/src/compiler/generic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22473/src/compiler/generic Modified Files: vm-fndb.lisp vm-tran.lisp vm-type.lisp Log Message: 0.8.13.26: * Rename {32,64}BIT-LOGICAL-FOO to WORD-LOGICAL-FOO in all ports. This builds and passes all tests on x86, but I am unsure about its effects on other ports. * Declare SB!VM:WORD with DEF!TYPE so it is known to both the host compiler and the cross-compiler (and we can use it in DEFKNOWN declarations, e.g.) * Fix errors in debug.impure.lisp test Index: vm-fndb.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-fndb.lisp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- vm-fndb.lisp 4 Aug 2004 15:55:04 -0000 1.22 +++ vm-fndb.lisp 4 Aug 2004 22:15:33 -0000 1.23 @@ -174,14 +174,14 @@ sb!vm:word (foldable flushable movable)) -(defknown 32bit-logical-not (sb!vm:word) sb!vm:word +(defknown word-logical-not (sb!vm:word) sb!vm:word (foldable flushable movable)) -(defknown (32bit-logical-and 32bit-logical-nand - 32bit-logical-or 32bit-logical-nor - 32bit-logical-xor 32bit-logical-eqv - 32bit-logical-andc1 32bit-logical-andc2 - 32bit-logical-orc1 32bit-logical-orc2) +(defknown (word-logical-and word-logical-nand + word-logical-or word-logical-nor + word-logical-xor word-logical-eqv + word-logical-andc1 word-logical-andc2 + word-logical-orc1 word-logical-orc2) (sb!vm:word sb!vm:word) sb!vm:word (foldable flushable movable)) Index: vm-tran.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-tran.lisp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- vm-tran.lisp 4 Aug 2004 15:55:04 -0000 1.47 +++ vm-tran.lisp 4 Aug 2004 22:15:33 -0000 1.48 @@ -258,16 +258,16 @@ (setf (%raw-bits result-bit-array index) (,',wordfun (%raw-bits bit-array-1 index) (%raw-bits bit-array-2 index)))))))))) - (def bit-and 32bit-logical-and) - (def bit-ior 32bit-logical-or) - (def bit-xor 32bit-logical-xor) - (def bit-eqv 32bit-logical-eqv) - (def bit-nand 32bit-logical-nand) - (def bit-nor 32bit-logical-nor) - (def bit-andc1 32bit-logical-andc1) - (def bit-andc2 32bit-logical-andc2) - (def bit-orc1 32bit-logical-orc1) - (def bit-orc2 32bit-logical-orc2)) + (def bit-and word-logical-and) + (def bit-ior word-logical-or) + (def bit-xor word-logical-xor) + (def bit-eqv word-logical-eqv) + (def bit-nand word-logical-nand) + (def bit-nor word-logical-nor) + (def bit-andc1 word-logical-andc1) + (def bit-andc2 word-logical-andc2) + (def bit-orc1 word-logical-orc1) + (def bit-orc2 word-logical-orc2)) (deftransform bit-not ((bit-array result-bit-array) @@ -296,12 +296,12 @@ sb!vm:n-word-bits)))) ((= index end-1) (setf (%raw-bits result-bit-array index) - (32bit-logical-not (%raw-bits bit-array index))) + (word-logical-not (%raw-bits bit-array index))) result-bit-array) (declare (optimize (speed 3) (safety 0)) (type index index end-1)) (setf (%raw-bits result-bit-array index) - (32bit-logical-not (%raw-bits bit-array index)))))))) + (word-logical-not (%raw-bits bit-array index)))))))) (deftransform bit-vector-= ((x y) (simple-bit-vector simple-bit-vector)) `(and (= (length x) (length y)) Index: vm-type.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-type.lisp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- vm-type.lisp 26 Jul 2004 10:24:40 -0000 1.20 +++ vm-type.lisp 4 Aug 2004 22:15:33 -0000 1.21 @@ -16,7 +16,7 @@ ;;;; FIXME: I'm not sure where to put this. -- WHN 19990817 -(deftype sb!vm:word () `(unsigned-byte ,sb!vm:n-word-bits)) +(def!type sb!vm:word () `(unsigned-byte ,sb!vm:n-word-bits)) ;;;; implementation-dependent DEFTYPEs |