X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Farray.lisp;h=966cb7aab2215b8ef938a196845df743822676c3;hb=902e93736a0888aa6b04dc328b1eb328423bf426;hp=7228e6ddb8fba93ba90926d06d29d9eadd103b6a;hpb=8097f555eb90f15c51b96e20bd88db15757247b9;p=sbcl.git

diff --git a/src/compiler/x86/array.lisp b/src/compiler/x86/array.lisp
index 7228e6d..966cb7a 100644
--- a/src/compiler/x86/array.lisp
+++ b/src/compiler/x86/array.lisp
@@ -271,10 +271,11 @@
 	       (unsigned-reg
 		(let ((shift (* extra ,bits)))
 		  (unless (zerop shift)
-		    (inst ror old shift)
-		    (inst and old (lognot ,(1- (ash 1 bits))))
-		    (inst or old value)
-		    (inst rol old shift)))))
+		    (inst ror old shift))
+                  (inst and old (lognot ,(1- (ash 1 bits))))
+                  (inst or old value)
+		  (unless (zerop shift)
+                    (inst rol old shift)))))
 	     (inst mov (make-ea :dword :base object
 				:disp (- (* (+ word vector-data-offset)
 					    n-word-bytes)
@@ -1242,12 +1243,12 @@
 
 ;;; simple-string
 
-(define-vop (data-vector-ref/simple-string)
+(define-vop (data-vector-ref/simple-base-string)
   (:translate data-vector-ref)
   (:policy :fast-safe)
   (:args (object :scs (descriptor-reg))
 	 (index :scs (unsigned-reg)))
-  (:arg-types simple-string positive-fixnum)
+  (:arg-types simple-base-string positive-fixnum)
   (:temporary (:sc unsigned-reg ; byte-reg
 		   :offset eax-offset ; al-offset
 		   :target value
@@ -1263,12 +1264,12 @@
 			    other-pointer-lowtag)))
     (move value al-tn)))
 
-(define-vop (data-vector-ref-c/simple-string)
+(define-vop (data-vector-ref-c/simple-base-string)
   (:translate data-vector-ref)
   (:policy :fast-safe)
   (:args (object :scs (descriptor-reg)))
   (:info index)
-  (:arg-types simple-string (:constant (signed-byte 30)))
+  (:arg-types simple-base-string (:constant (signed-byte 30)))
   (:temporary (:sc unsigned-reg :offset eax-offset :target value
 		   :from (:eval 0) :to (:result 0))
 	      eax)
@@ -1282,13 +1283,13 @@
 			    other-pointer-lowtag)))
     (move value al-tn)))
 
-(define-vop (data-vector-set/simple-string)
+(define-vop (data-vector-set/simple-base-string)
   (:translate data-vector-set)
   (:policy :fast-safe)
   (:args (object :scs (descriptor-reg) :to (:eval 0))
 	 (index :scs (unsigned-reg) :to (:eval 0))
 	 (value :scs (base-char-reg)))
-  (:arg-types simple-string positive-fixnum base-char)
+  (:arg-types simple-base-string positive-fixnum base-char)
   (:results (result :scs (base-char-reg)))
   (:result-types base-char)
   (:generator 5
@@ -1298,13 +1299,13 @@
 	  value)
     (move result value)))
 
-(define-vop (data-vector-set/simple-string-c)
+(define-vop (data-vector-set/simple-base-string-c)
   (:translate data-vector-set)
   (:policy :fast-safe)
   (:args (object :scs (descriptor-reg) :to (:eval 0))
 	 (value :scs (base-char-reg)))
   (:info index)
-  (:arg-types simple-string (:constant (signed-byte 30)) base-char)
+  (:arg-types simple-base-string (:constant (signed-byte 30)) base-char)
   (:results (result :scs (base-char-reg)))
   (:result-types base-char)
   (:generator 4