Changeset 15120

Timestamp:

Dec 8, 2011, 10:16:10 AM (13 years ago)

Author:

Gary Byers

Message:

In MISC-REF-C-BIT-FIXNUM, don't try to rotate right by 0 bits.
In LOAD-CHARACTER-CONSTANT, need to set high 16 bits of result
if code >= 256 (not > 256).

File:

• trunk/source/compiler/ARM/arm-vinsns.lisp (modified) (2 diffs)

trunk/source/compiler/ARM/arm-vinsns.lisp

@@ -377 +377 @@
      ((temp :u32)))
   (ldr temp (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash (:apply ash idx -5) arm::word-shift)))))
-  (mov temp (:ror temp (:$ (:apply logand #x1f (:apply - (:apply logand idx #x1f) arm::fixnumshift)))))
+  ((:not (:pred = 0 (:apply logand #x1f (:apply - (:apply logand idx #x1f) arm::fixnumshift))))
+   (mov temp (:ror temp (:$ (:apply logand #x1f (:apply - (:apply logand idx #x1f) arm::fixnumshift))))))
   (and dest temp (:$ arm::fixnumone)))
 
@@ -3777 +3778 @@
      ((code :u32const)))
   (movw dest (:$ (:apply logior (:apply ash (:apply logand code #xff) arm::charcode-shift) arm::subtag-character)))
-  ((:pred > code 256)
+  ((:pred >= code 256)
    (movt dest (:$ (:apply ash code -8)))))