Changeset 14557

Timestamp:

Jan 6, 2011, 10:40:44 AM (14 years ago)

Author:

Gary Byers

Message:

%fixnum-to-double: make the single-float temp an arg, as a a short-term
approach.

(Because of the way that ARM FPRs are aliased - d0 maps to both s0 and s1 -
any code that deals with both single and doubles needs to be more careful
about aliasing than it likely is.)

Fixes ticket:804.

Location:

trunk/source/compiler/ARM

Files:

• arm-vinsns.lisp (modified) (1 diff)
• arm2.lisp (modified) (1 diff)

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

@@ -1278 +1278 @@
 (define-arm-vinsn (fixnum->double :predicatable)
     (((dest :double-float))
-     ((src :lisp))
-     ((imm :s32)
-      (temp :single-float)))
+     ((src :lisp)
+      (temp :single-float))
+     ((imm :s32)))
   (mov imm (:asr src (:$ arm::fixnumshift)))
   (fmsr temp imm)

trunk/source/compiler/ARM/arm2.lisp

@@ -8545 +8545 @@
 (defarm2 arm2-%fixnum-to-double %fixnum-to-double (seg vreg xfer arg)
   (with-fp-target () (dreg :double-float)
-    (let* ((r (arm2-one-untargeted-reg-form seg arg arm::arg_z)))
+    (let* ((sreg (make-wired-lreg (* (hard-regspec-value dreg) 2) :mode hard-reg-class-fpr-mode-single))
+           (r (arm2-one-untargeted-reg-form seg arg arm::arg_z)))
       (unless (or (acode-fixnum-form-p arg)
                   *arm2-reckless*)
         (! trap-unless-fixnum r))
-      (! fixnum->double dreg r)
+      (! fixnum->double dreg r sreg)
       (<- dreg)
       (^))))