haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target/arm: Hoist pc_next to a local variable in thumb_tr_translate_insn

Browse source 
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-11-03 00:03:45 -04:00 committed by Peter Maydell
parent bf9dd2aa5f
commit 0bb72bca7c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/arm/translate.c
View file

@ -9618,25 +9618,25 @@ static void thumb_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
{ {
DisasContext *dc = container_of(dcbase, DisasContext, base); DisasContext *dc = container_of(dcbase, DisasContext, base);
CPUARMState *env = cpu->env_ptr; CPUARMState *env = cpu->env_ptr;
uint32_t pc = dc->base.pc_next;
uint32_t insn; uint32_t insn;
bool is_16bit; bool is_16bit;
if (arm_pre_translate_insn(dc)) { if (arm_pre_translate_insn(dc)) {
dc->base.pc_next += 2; dc->base.pc_next = pc + 2;
return; return;
} }
dc->pc_curr = dc->base.pc_next; dc->pc_curr = pc;
insn = arm_lduw_code(env, &dc->base, dc->base.pc_next, dc->sctlr_b); insn = arm_lduw_code(env, &dc->base, pc, dc->sctlr_b);
is_16bit = thumb_insn_is_16bit(dc, dc->base.pc_next, insn); is_16bit = thumb_insn_is_16bit(dc, dc->base.pc_next, insn);
dc->base.pc_next += 2; pc += 2;
if (!is_16bit) { if (!is_16bit) {
uint32_t insn2 = arm_lduw_code(env, &dc->base, dc->base.pc_next, uint32_t insn2 = arm_lduw_code(env, &dc->base, pc, dc->sctlr_b);
dc->sctlr_b);
insn = insn << 16 | insn2; insn = insn << 16 | insn2;
dc->base.pc_next += 2; pc += 2;
} }
dc->base.pc_next = pc;
dc->insn = insn; dc->insn = insn;
if (dc->pstate_il) { if (dc->pstate_il) {