aboutsummaryrefslogtreecommitdiff
path: root/target/unicore32/op_helper.c
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2017-11-14 11:25:35 +0100
committerRichard Henderson <richard.henderson@linaro.org>2017-12-27 17:20:44 -0800
commit65255e8efdd5fca602bcc4ff61a879939ff75f4f (patch)
tree8b830a3e370702042443b1d98c990a60837a68a4 /target/unicore32/op_helper.c
parent281f327487c9c9b1599f93c589a408bbf4a651b8 (diff)
target/*helper: don't check retaddr before calling cpu_restore_state
cpu_restore_state officially supports being passed an address it can't resolve the state for. As a result the checks in the helpers are superfluous and can be removed. This makes the code consistent with other users of cpu_restore_state. Of course this does nothing to address what to do if cpu_restore_state can't resolve the state but so far it seems this is handled elsewhere. The change was made with included coccinelle script. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> [rth: Fixed up comment indentation. Added second hunk to script to combine cpu_restore_state and cpu_loop_exit.] Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/unicore32/op_helper.c')
-rw-r--r--target/unicore32/op_helper.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/target/unicore32/op_helper.c b/target/unicore32/op_helper.c
index 0872c29faa..8788642a7f 100644
--- a/target/unicore32/op_helper.c
+++ b/target/unicore32/op_helper.c
@@ -251,11 +251,8 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,
ret = uc32_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx);
if (unlikely(ret)) {
- if (retaddr) {
- /* now we have a real cpu fault */
- cpu_restore_state(cs, retaddr);
- }
- cpu_loop_exit(cs);
+ /* now we have a real cpu fault */
+ cpu_loop_exit_restore(cs, retaddr);
}
}
#endif