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>
This commit is contained in:
parent
1b1138cabe
commit
1f9c446233
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user