From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KVykd-00050O-J0
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 21:14:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KVykc-000505-6c
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 21:14:10 -0400
Received: from [199.232.76.173] (port=59601 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KVykc-000502-1x
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 21:14:10 -0400
Received: from savannah.gnu.org ([199.232.41.3]:42976 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <av1474@comtv.ru>) id 1KVykb-0008K5-VW
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 21:14:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <av1474@comtv.ru>) id 1KVyka-0003AM-A4
	for qemu-devel@nongnu.org; Thu, 21 Aug 2008 01:14:08 +0000
Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <malc@savannah.gnu.org>) id 1KVykZ-0003AI-Vg
	for qemu-devel@nongnu.org; Thu, 21 Aug 2008 01:14:08 +0000
MIME-Version: 1.0
Errors-To: malc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: malc <av1474@comtv.ru>
Message-Id: <E1KVykZ-0003AI-Vg@cvs.savannah.gnu.org>
Date: Thu, 21 Aug 2008 01:14:08 +0000
Subject: [Qemu-devel] [5038] Relax qemu_ld/st constraints for !SOFTMMU case
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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