aboutsummaryrefslogtreecommitdiff
path: root/tcg/ppc64
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-12 03:16:57 +0200
committermalc <av1474@comtv.ru>2012-05-15 00:53:31 +0400
commitc82e5848e21b7ef5d03310f50ef64ed7d006f5d9 (patch)
treeee9bcad1f28f56c16c3604b09bfb2fd24af50610 /tcg/ppc64
parent9cc31772bf45a3002fd3886e32ab31f9b396b4da (diff)
downloadqemu-c82e5848e21b7ef5d03310f50ef64ed7d006f5d9.zip
qemu-c82e5848e21b7ef5d03310f50ef64ed7d006f5d9.tar.gz
qemu-c82e5848e21b7ef5d03310f50ef64ed7d006f5d9.tar.bz2
tcg/ppc64: Don't hardcode register numbers for qemu_ld/st
Facilitates using r3 for prepended AREG0. Signed-off-by: Andreas F?rber <afaerber@suse.de> Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'tcg/ppc64')
-rw-r--r--tcg/ppc64/tcg-target.c16
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 TCGArg *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
@@ -669,8 +669,9 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)
#endif
/* slow path */
- tcg_out_mov (s, TCG_TYPE_I64, 3, addr_reg);
- tcg_out_movi (s, TCG_TYPE_I64, 4, mem_index);
+ ir = 3;
+ tcg_out_mov (s, TCG_TYPE_I64, ir++, addr_reg);
+ tcg_out_movi (s, TCG_TYPE_I64, ir++, mem_index);
#ifdef CONFIG_TCG_PASS_AREG0
/* XXX/FIXME: suboptimal */
@@ -799,7 +800,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *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
@@ -825,9 +826,10 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)
#endif
/* 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 = 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);
#ifdef CONFIG_TCG_PASS_AREG0
/* XXX/FIXME: suboptimal */