From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST0xE-0004Ww-0E for qemu-devel@nongnu.org; Fri, 11 May 2012 21:17:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ST0xC-0002My-AI for qemu-devel@nongnu.org; Fri, 11 May 2012 21:17:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 12 May 2012 03:16:57 +0200 Message-Id: <1336785418-9439-2-git-send-email-afaerber@suse.de> In-Reply-To: <1336785418-9439-1-git-send-email-afaerber@suse.de> References: <1336785418-9439-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-1.1 1/2] tcg/ppc64: Don't hardcode register numbers for qemu_ld/st List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, agraf@suse.de, =?UTF-8?q?Andreas=20F=C3=A4rber?= Facilitates using r3 for prepended AREG0. Signed-off-by: Andreas F=C3=A4rber --- tcg/ppc64/tcg-target.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index d0b067b..0573a72 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -642,7 +642,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCG= Arg *args, int opc) { int addr_reg, data_reg, r0, r1, rbase, bswap; #ifdef CONFIG_SOFTMMU - int r2, mem_index, s_bits; + int r2, mem_index, s_bits, ir; void *label1_ptr, *label2_ptr; #endif =20 @@ -669,8 +669,9 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCG= Arg *args, int opc) #endif =20 /* slow path */ - tcg_out_mov (s, TCG_TYPE_I64, 3, addr_reg); - tcg_out_movi (s, TCG_TYPE_I64, 4, mem_index); + ir =3D 3; + tcg_out_mov (s, TCG_TYPE_I64, ir++, addr_reg); + tcg_out_movi (s, TCG_TYPE_I64, ir++, mem_index); =20 #ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ @@ -799,7 +800,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCG= Arg *args, int opc) { int addr_reg, r0, r1, rbase, data_reg, bswap; #ifdef CONFIG_SOFTMMU - int r2, mem_index; + int r2, mem_index, ir; void *label1_ptr, *label2_ptr; #endif =20 @@ -825,9 +826,10 @@ static void tcg_out_qemu_st (TCGContext *s, const TC= GArg *args, int opc) #endif =20 /* slow path */ - tcg_out_mov (s, TCG_TYPE_I64, 3, addr_reg); - tcg_out_rld (s, RLDICL, 4, data_reg, 0, 64 - (1 << (3 + opc))); - tcg_out_movi (s, TCG_TYPE_I64, 5, mem_index); + ir =3D 3; + tcg_out_mov (s, TCG_TYPE_I64, ir++, addr_reg); + tcg_out_rld (s, RLDICL, ir++, data_reg, 0, 64 - (1 << (3 + opc))); + tcg_out_movi (s, TCG_TYPE_I64, ir++, mem_index); =20 #ifdef CONFIG_TCG_PASS_AREG0 /* XXX/FIXME: suboptimal */ --=20 1.7.7