aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-03-19 11:37:44 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-03-19 11:37:44 -0500
commitefeaaf1ebc0f677dc321845d74b8d6f599eb0927 (patch)
tree5a1754408470642981238ed6f89d5215e8e1cdfd
parentb8b3e75609bd39a085db7612cb7d36a1944eed23 (diff)
parent5bd33de6635577744b3c10dd3913bfe8c5ffaf40 (diff)
downloadqemu-arm-efeaaf1ebc0f677dc321845d74b8d6f599eb0927.tar.gz
Merge remote-tracking branch 'origin/master' into staging
* origin/master: tcg: fix sparc host for AREG0 free operation
-rw-r--r--tcg/sparc/tcg-target.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
index 80f0818679..491c9797d3 100644
--- a/tcg/sparc/tcg-target.c
+++ b/tcg/sparc/tcg-target.c
@@ -1061,6 +1061,17 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,
/* mov */
tcg_out_movi(s, TCG_TYPE_I32, arg2, mem_index);
+#ifdef CONFIG_TCG_PASS_AREG0
+ /* XXX/FIXME: suboptimal */
+ tcg_out_mov(s, TCG_TYPE_I32, tcg_target_call_iarg_regs[3],
+ tcg_target_call_iarg_regs[2]);
+ tcg_out_mov(s, TCG_TYPE_I64, tcg_target_call_iarg_regs[2],
+ tcg_target_call_iarg_regs[1]);
+ tcg_out_mov(s, TCG_TYPE_TL, tcg_target_call_iarg_regs[1],
+ tcg_target_call_iarg_regs[0]);
+ tcg_out_mov(s, TCG_TYPE_PTR, tcg_target_call_iarg_regs[0],
+ TCG_AREG0);
+#endif
/* XXX: move that code at the end of the TB */
/* qemu_st_helper[s_bits](arg0, arg1, arg2) */
tcg_out32(s, CALL | ((((tcg_target_ulong)qemu_st_helpers[s_bits]