From f864037c7dfb852e5d6daa1536cd298e43690b99 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 10 Aug 2004 12:32:29 +0000 Subject: [PATCH] 0.8.13.50: Oops. Fix a few thinkos in VM-independent transformations. --- src/compiler/generic/vm-tran.lisp | 8 ++++---- version.lisp-expr | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp index 47d2d8b..9108f22 100644 --- a/src/compiler/generic/vm-tran.lisp +++ b/src/compiler/generic/vm-tran.lisp @@ -329,7 +329,7 @@ (:big-endian '(- sb!vm:n-word-bits extra)))) (%raw-bits y i)))) - (declare (type (integer 0 #.(1- sb!vm:n-word-bits)) + (declare (type (mod #.sb!vm:n-word-bits) extra) (type sb!vm:word mask numx numy)) (= numx numy))) @@ -340,7 +340,7 @@ (unless (= numx numy) (return nil)))))))) -(deftransform count ((sequence item) (simple-bit-vector bit) * +(deftransform count ((item sequence) (bit simple-bit-vector) * :policy (>= speed space)) `(let ((length (length sequence))) (if (zerop length) @@ -359,7 +359,7 @@ (:big-endian '(- sb!vm:n-word-bits extra)))) (%raw-bits sequence index)))) - (declare (type (mod #.(1- sb!vm:n-word-bits)) extra)) + (declare (type (mod #.sb!vm:n-word-bits)) extra) (declare (type sb!vm:word mask bits)) ;; could consider LOGNOT for the zero case instead of ;; doing the subtraction... @@ -411,7 +411,7 @@ (let* ((char (lvar-value item)) (code (sb!xc:char-code char)) (accum 0)) - (dotimes (i sb!vm:n-word-bytes) + (dotimes (i sb!vm:n-word-bytes accum) (setf accum (logior accum (ash code (* 8 i)))))) `(let ((code (sb!xc:char-code item))) (logior ,@(loop for i from 0 upto sb!vm:n-word-bytes diff --git a/version.lisp-expr b/version.lisp-expr index 7ce50af..84c702d 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.8.13.49" +"0.8.13.50" -- 1.7.10.4