In preparation of removing the cpu_ldl_code wrapper, inline it. Use the return address argument.
Since Alpha instructions are always stored in little-endian order, replace MO_TE -> MO_LE. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/alpha/mem_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/alpha/mem_helper.c b/target/alpha/mem_helper.c index 2113fe33ae2..572ea9cb418 100644 --- a/target/alpha/mem_helper.c +++ b/target/alpha/mem_helper.c @@ -24,13 +24,15 @@ static void do_unaligned_access(CPUAlphaState *env, vaddr addr, uintptr_t retaddr) { + CPUState *cs = env_cpu(env); + MemOpIdx oi = make_memop_idx(MO_LEUL, cpu_mmu_index(cs, true)); uint64_t pc; uint32_t insn; cpu_restore_state(env_cpu(env), retaddr); pc = env->pc; - insn = cpu_ldl_code(env, pc); + insn = cpu_ldl_code_mmu(env, pc, oi, retaddr); env->trap_arg0 = addr; env->trap_arg1 = insn >> 26; /* opcode */ -- 2.52.0
