diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-04-04 23:22:27 -1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-05-15 08:55:19 +0200 |
| commit | 1f9c4462334f424d844b52c3476fb3b0ec62ab46 (patch) | |
| tree | 30c3774280acc9a30fd9b5edc07ff256a2e4bf84 | |
| parent | 1b1138cabeb6fd55438721c6d5fe373ba4fd3cd4 (diff) | |
| download | qemu-1f9c4462334f424d844b52c3476fb3b0ec62ab46.zip qemu-1f9c4462334f424d844b52c3476fb3b0ec62ab46.tar.gz qemu-1f9c4462334f424d844b52c3476fb3b0ec62ab46.tar.bz2 | |
target/riscv: Use translator_ld* for everything
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | target/riscv/translate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/riscv/translate.c b/target/riscv/translate.c index c999e94..2c27fd4 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -20,7 +20,6 @@ #include "qemu/log.h" #include "cpu.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" @@ -1082,7 +1081,7 @@ static uint32_t opcode_at(DisasContextBase *dcbase, target_ulong pc) CPUState *cpu = ctx->cs; CPURISCVState *env = cpu_env(cpu); - return cpu_ldl_code(env, pc); + return translator_ldl(env, &ctx->base, pc); } /* Include insn module translation function */ @@ -1243,7 +1242,8 @@ static void riscv_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) unsigned page_ofs = ctx->base.pc_next & ~TARGET_PAGE_MASK; if (page_ofs > TARGET_PAGE_SIZE - MAX_INSN_LEN) { - uint16_t next_insn = cpu_lduw_code(env, ctx->base.pc_next); + uint16_t next_insn = + translator_lduw(env, &ctx->base, ctx->base.pc_next); int len = insn_len(next_insn); if (!is_same_page(&ctx->base, ctx->base.pc_next + len - 1)) { |