[Guile-commits] 142/437: Make current test cases pass in armv7l.

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit 66cb4452d74ea507be2b1f11742942a2727d09f5
Author: pcpa <address@hidden>
Date:   Wed Dec 5 23:48:40 2012 -0200

    Make current test cases pass in armv7l.
    
        * lib/jit_arm-vfp.c: Correct regression found in armv7l with
        latest test cases.
---
 ChangeLog         | 5 +++++
 lib/jit_arm-vfp.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8d5de2..825d973 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-12-05 Paulo Andrade <address@hidden>
 
+       * lib/jit_arm-vfp.c: Correct regression found in armv7l with
+       latest test cases.
+
+2012-12-05 Paulo Andrade <address@hidden>
+
        * check/ldstxi.tst, check/ldstxr.tst: Correct wrong argument
        order for 32 bit mode tests.
 
diff --git a/lib/jit_arm-vfp.c b/lib/jit_arm-vfp.c
index 344f010..77dffb7 100644
--- a/lib/jit_arm-vfp.c
+++ b/lib/jit_arm-vfp.c
@@ -2197,7 +2197,7 @@ _vfp_stxr_f(jit_state_t *_jit, jit_int32_t r0, 
jit_int32_t r1, jit_int32_t r2)
     jit_int32_t                reg;
     if (jit_fpr_p(r2)) {
        reg = jit_get_reg(jit_class_gpr);
-       addr(rn(reg), r1, r2);
+       addr(rn(reg), r0, r1);
        VSTR_F32(r2, rn(reg), 0);
        jit_unget_reg(reg);
     }
@@ -2210,7 +2210,7 @@ _vfp_stxr_d(jit_state_t *_jit, jit_int32_t r0, 
jit_int32_t r1, jit_int32_t r2)
 {
     jit_int32_t                reg;
     reg = jit_get_reg(jit_class_gpr);
-    addr(rn(reg), r1, r2);
+    addr(rn(reg), r0, r1);
     if (jit_fpr_p(r2))
        VSTR_F64(r2, rn(reg), 0);
     else {