diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-04-17 10:43:42 -0700 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-04-22 14:44:54 +0100 |
| commit | c89a9d139bc8ba39c0d88840da47cc69ff9037d5 (patch) | |
| tree | 59e6a9b7f974e9c52d488dfba64d2fcb32a49d37 | |
| parent | 099d1c20883a26e540086695559ca1e4dcd66fa1 (diff) | |
| download | qemu-c89a9d139bc8ba39c0d88840da47cc69ff9037d5.zip qemu-c89a9d139bc8ba39c0d88840da47cc69ff9037d5.tar.gz qemu-c89a9d139bc8ba39c0d88840da47cc69ff9037d5.tar.bz2 | |
target/arm: Simplify aa32 DISAS_WFI
The length of the previous insn may be computed from
the difference of start and end addresses.
Use tcg_constant_i32 while we're at it.
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>
| -rw-r--r-- | target/arm/translate.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/arm/translate.c b/target/arm/translate.c index 086dc0d..d09692c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9870,18 +9870,14 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) /* nothing more to generate */ break; case DISAS_WFI: - { - TCGv_i32 tmp = tcg_const_i32((dc->thumb && - !(dc->insn & (1U << 31))) ? 2 : 4); - - gen_helper_wfi(cpu_env, tmp); - tcg_temp_free_i32(tmp); - /* The helper doesn't necessarily throw an exception, but we + gen_helper_wfi(cpu_env, + tcg_constant_i32(dc->base.pc_next - dc->pc_curr)); + /* + * The helper doesn't necessarily throw an exception, but we * must go back to the main loop to check for interrupts anyway. */ tcg_gen_exit_tb(NULL, 0); break; - } case DISAS_WFE: gen_helper_wfe(cpu_env); break; |