Changeset 13817

Timestamp:

Jun 14, 2010, 3:10:36 AM (14 years ago)

Author:

Gary Byers

Message:

extract-fulltag-fixnum: don't put tag in what may be a node reg.
lri: fix parenthesization.
Make the fact that some things that handle overflow out-of-line set
arg_z explicit (failing to do that confused the register-tracking
code.) Screw: should really treat them as :calls, since they
sometimes do subprim calls.

File:

• branches/arm/compiler/ARM/arm-vinsns.lisp (modified) (7 diffs)

branches/arm/compiler/ARM/arm-vinsns.lisp

@@ -785 +785 @@
 (define-arm-vinsn extract-fulltag-fixnum (((tag :imm))
                                           ((object :lisp)))
-  (and tag object (:$ arm::fulltagmask))
-  (mov tag (:lsl tag (:$ arm::fixnumshift))))
+  (mov tag (:lsl object (:$ arm::fixnumshift)))
+  (and tag tag (:$ (ash arm::fulltagmask arm::fixnumshift))))
 
 (define-arm-vinsn extract-typecode (((code :u8))
@@ -1735 +1735 @@
            (:pred < intval #x10000))
      (mov dest (:$ (:apply logand #xff00 intval)))
-     ((:not (:pred = 0 (:apply logand #xff intval)))))
+     ((:not (:pred = 0 (:apply logand #xff intval)))
       (orr dest dest (:$ (:apply logand #xff intval)))))
     ((:not (:and (:pred >= intval 0)
@@ -1743 +1743 @@
      (:word intval)
      (:code)
-     (ldr dest :const)))
+     (ldr dest :const)))))
 
 
@@ -2276 +2276 @@
   :done)
 
-(define-arm-vinsn negate-fixnum-overflow-ool (()
+(define-arm-vinsn negate-fixnum-overflow-ool (((result (:lisp #.arm::arg_z)))
                                               ((src :imm))
                                               )
@@ -2371 +2371 @@
   ((:not (:pred = count 0))
    (mov temp (:asr src (:$ count)))
-   (bic dest src (:$ arm::fixnummask))))
+   (bic dest temp (:$ arm::fixnummask))))
 
 (define-arm-vinsn %ilsr (((dest :imm))
@@ -2468 +2468 @@
 
 
-(define-arm-vinsn fixnum-add-overflow-ool (()
+(define-arm-vinsn fixnum-add-overflow-ool (((result (:lisp #.arm::arg_z)))
                                            ((x :imm)
                                             (y :imm))
@@ -2535 +2535 @@
 
 
-(define-arm-vinsn fixnum-sub-overflow-ool (()
+(define-arm-vinsn fixnum-sub-overflow-ool (((result (:lisp #.arm::arg_z)))
                                            ((x :imm)
                                             (y :imm)))