target/arm: Use tcg_constant in handle_msr_i

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20220426163043.100432-6-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-26 09:30:01 -07:00 committed by Peter Maydell
parent bc9eb3a367
commit 181115d906
1 changed files with 3 additions and 10 deletions

View File

@ -1615,7 +1615,6 @@ static void gen_axflag(void)
static void handle_msr_i(DisasContext *s, uint32_t insn, static void handle_msr_i(DisasContext *s, uint32_t insn,
unsigned int op1, unsigned int op2, unsigned int crm) unsigned int op1, unsigned int op2, unsigned int crm)
{ {
TCGv_i32 t1;
int op = op1 << 3 | op2; int op = op1 << 3 | op2;
/* End the TB by default, chaining is ok. */ /* End the TB by default, chaining is ok. */
@ -1674,9 +1673,7 @@ static void handle_msr_i(DisasContext *s, uint32_t insn,
if (s->current_el == 0) { if (s->current_el == 0) {
goto do_unallocated; goto do_unallocated;
} }
t1 = tcg_const_i32(crm & PSTATE_SP); gen_helper_msr_i_spsel(cpu_env, tcg_constant_i32(crm & PSTATE_SP));
gen_helper_msr_i_spsel(cpu_env, t1);
tcg_temp_free_i32(t1);
break; break;
case 0x19: /* SSBS */ case 0x19: /* SSBS */
@ -1704,15 +1701,11 @@ static void handle_msr_i(DisasContext *s, uint32_t insn,
break; break;
case 0x1e: /* DAIFSet */ case 0x1e: /* DAIFSet */
t1 = tcg_const_i32(crm); gen_helper_msr_i_daifset(cpu_env, tcg_constant_i32(crm));
gen_helper_msr_i_daifset(cpu_env, t1);
tcg_temp_free_i32(t1);
break; break;
case 0x1f: /* DAIFClear */ case 0x1f: /* DAIFClear */
t1 = tcg_const_i32(crm); gen_helper_msr_i_daifclear(cpu_env, tcg_constant_i32(crm));
gen_helper_msr_i_daifclear(cpu_env, t1);
tcg_temp_free_i32(t1);
/* For DAIFClear, exit the cpu loop to re-evaluate pending IRQs. */ /* For DAIFClear, exit the cpu loop to re-evaluate pending IRQs. */
s->base.is_jmp = DISAS_UPDATE_EXIT; s->base.is_jmp = DISAS_UPDATE_EXIT;
break; break;