aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2017-11-14 11:29:34 +0100
committerRichard Henderson <richard.henderson@linaro.org>2017-12-27 17:20:44 -0800
commit1f5940e4642f4a2c64bcba724eaff3c28ae38c54 (patch)
treee15709e6b9b879b09f2847332ac53b01d77fab94 /target
parent65255e8efdd5fca602bcc4ff61a879939ff75f4f (diff)
downloadqemu-1f5940e4642f4a2c64bcba724eaff3c28ae38c54.zip
qemu-1f5940e4642f4a2c64bcba724eaff3c28ae38c54.tar.gz
qemu-1f5940e4642f4a2c64bcba724eaff3c28ae38c54.tar.bz2
target/moxie: Fix tlb_fill
We should not exit unless moxie_cpu_handle_mmu_fault has failed. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target')
-rw-r--r--target/moxie/helper.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/target/moxie/helper.c b/target/moxie/helper.c
index 2ecee89..6890ffd 100644
--- a/target/moxie/helper.c
+++ b/target/moxie/helper.c
@@ -36,9 +36,8 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
ret = moxie_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
if (unlikely(ret)) {
- cpu_restore_state(cs, retaddr);
+ cpu_loop_exit_restore(cs, retaddr);
}
- cpu_loop_exit(cs);
}
void helper_raise_exception(CPUMoxieState *env, int ex)