SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcg/sparc: Add scratch argument to tcg_out_movi_int

Browse Source 
This will allow us to control exactly what scratch register is
used for loading the constant.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-08-05 02:16:05 +03:00
parent c71929c345
commit 92840d06fa
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tcg/sparc/tcg-target.c.inc
View File

@ -428,7 +428,8 @@ static void tcg_out_movi_imm32(TCGContext *s, TCGReg ret, int32_t arg)
} }
static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret,
tcg_target_long arg, bool in_prologue) tcg_target_long arg, bool in_prologue,
TCGReg scratch)
{ {
tcg_target_long hi, lo = (int32_t)arg; tcg_target_long hi, lo = (int32_t)arg;
tcg_target_long test, lsb; tcg_target_long test, lsb;
@ -483,16 +484,17 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret,
} else { } else {
hi = arg >> 32; hi = arg >> 32;
tcg_out_movi_imm32(s, ret, hi); tcg_out_movi_imm32(s, ret, hi);
tcg_out_movi_imm32(s, TCG_REG_T2, lo); tcg_out_movi_imm32(s, scratch, lo);
tcg_out_arithi(s, ret, ret, 32, SHIFT_SLLX); tcg_out_arithi(s, ret, ret, 32, SHIFT_SLLX);
tcg_out_arith(s, ret, ret, TCG_REG_T2, ARITH_OR); tcg_out_arith(s, ret, ret, scratch, ARITH_OR);
} }
} }
static void tcg_out_movi(TCGContext *s, TCGType type, static void tcg_out_movi(TCGContext *s, TCGType type,
TCGReg ret, tcg_target_long arg) TCGReg ret, tcg_target_long arg)
{ {
tcg_out_movi_int(s, type, ret, arg, false); tcg_debug_assert(ret != TCG_REG_T2);
tcg_out_movi_int(s, type, ret, arg, false, TCG_REG_T2);
} }
static void tcg_out_ldst_rr(TCGContext *s, TCGReg data, TCGReg a1, static void tcg_out_ldst_rr(TCGContext *s, TCGReg data, TCGReg a1,
@ -847,7 +849,7 @@ static void tcg_out_call_nodelay(TCGContext *s, const tcg_insn_unit *dest,
} else { } else {
uintptr_t desti = (uintptr_t)dest; uintptr_t desti = (uintptr_t)dest;
tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_REG_T1, tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_REG_T1,
desti & ~0xfff, in_prologue); desti & ~0xfff, in_prologue, TCG_REG_O7);
tcg_out_arithi(s, TCG_REG_O7, TCG_REG_T1, desti & 0xfff, JMPL); tcg_out_arithi(s, TCG_REG_O7, TCG_REG_T1, desti & 0xfff, JMPL);
} }
} }
@ -1023,7 +1025,8 @@ static void tcg_target_qemu_prologue(TCGContext *s)
#ifndef CONFIG_SOFTMMU #ifndef CONFIG_SOFTMMU
if (guest_base != 0) { if (guest_base != 0) {
tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, guest_base, true); tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG,
guest_base, true, TCG_REG_T1);
tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG); tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG);
} }
#endif #endif