[Qemu-devel] [5038] Relax qemu_ld/st constraints for !SOFTMMU case

[malc]

Revision: 5038
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5038
Author:   malc
Date:     2008-08-21 01:14:07 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Relax qemu_ld/st constraints for !SOFTMMU case

Modified Paths:
--------------
    trunk/tcg/ppc/tcg-target.c

Modified: trunk/tcg/ppc/tcg-target.c
===================================================================
--- trunk/tcg/ppc/tcg-target.c  2008-08-20 22:39:28 UTC (rev 5037)
+++ trunk/tcg/ppc/tcg-target.c  2008-08-21 01:14:07 UTC (rev 5038)
@@ -222,6 +222,7 @@
         ct->ct |= TCG_CT_REG;
         tcg_regset_set32(ct->u.regs, 0, 0xffffffff);
         break;
+#ifdef CONFIG_SOFTMMU
     case 'L':                   /* qemu_ld constraint */
         ct->ct |= TCG_CT_REG;
         tcg_regset_set32(ct->u.regs, 0, 0xffffffff);
@@ -247,6 +248,18 @@
         tcg_regset_reset_reg(ct->u.regs, TCG_REG_R6);
         tcg_regset_reset_reg(ct->u.regs, TCG_REG_R7);
         break;
+#else
+    case 'L':
+    case 'K':
+        ct->ct |= TCG_CT_REG;
+        tcg_regset_set32(ct->u.regs, 0, 0xffffffff);
+        break;
+    case 'M':
+        ct->ct |= TCG_CT_REG;
+        tcg_regset_set32(ct->u.regs, 0, 0xffffffff);
+        tcg_regset_reset_reg(ct->u.regs, TCG_REG_R3);
+        break;
+#endif
     default:
         return -1;
     }
@@ -785,7 +798,7 @@
     /* r0 = env->tlb_table[mem_index][index].addend + addr */
 
 #else  /* !CONFIG_SOFTMMU */
-    r1 = 4;
+    r1 = 3;
     r0 = addr_reg;
 #endif