diff options
| author | Richard Henderson | 2021-07-27 23:00:20 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-13 17:46:11 +0200 |
| commit | 1a2eaf9e3897b0c51ef65e676c9bbd125506dafd (patch) | |
| tree | af75f8338825ecaa0f1ece977543bb98ebb01d88 /target/arm/m_helper.c | |
| parent | target/sparc: Use cpu_*_mmu instead of helper_*_mmu (diff) | |
| download | qemu-1a2eaf9e3897b0c51ef65e676c9bbd125506dafd.tar.gz qemu-1a2eaf9e3897b0c51ef65e676c9bbd125506dafd.tar.xz qemu-1a2eaf9e3897b0c51ef65e676c9bbd125506dafd.zip | |
target/arm: Use cpu_*_mmu instead of helper_*_mmu
The helper_*_mmu functions were the only thing available
when this code was written. This could have been adjusted
when we added cpu_*_mmuidx_ra, but now we can most easily
use the newest set of interfaces.
Cc: qemu-arm@nongnu.org
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/arm/m_helper.c')
| -rw-r--r-- | target/arm/m_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c index 62aa12c9d8..2c9922dc29 100644 --- a/target/arm/m_helper.c +++ b/target/arm/m_helper.c @@ -1947,9 +1947,9 @@ static bool do_v7m_function_return(ARMCPU *cpu) * do them as secure, so work out what MMU index that is. */ mmu_idx = arm_v7m_mmu_idx_for_secstate(env, true); - oi = make_memop_idx(MO_LE, arm_to_core_mmu_idx(mmu_idx)); - newpc = helper_le_ldul_mmu(env, frameptr, oi, 0); - newpsr = helper_le_ldul_mmu(env, frameptr + 4, oi, 0); + oi = make_memop_idx(MO_LEUL, arm_to_core_mmu_idx(mmu_idx)); + newpc = cpu_ldl_le_mmu(env, frameptr, oi, 0); + newpsr = cpu_ldl_le_mmu(env, frameptr + 4, oi, 0); /* Consistency checks on new IPSR */ newpsr_exc = newpsr & XPSR_EXCP; |