]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
target/moxie: Fix tlb_fill
authorRichard Henderson <richard.henderson@linaro.org>
Tue, 14 Nov 2017 10:29:34 +0000 (11:29 +0100)
committerRichard Henderson <richard.henderson@linaro.org>
Thu, 28 Dec 2017 01:20:44 +0000 (17:20 -0800)
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>
target/moxie/helper.c

index 2ecee89f1149666135e2c5714cdcff18ac9c9f88..6890ffd71c63178db48165caac67ea096abdb5cb 100644 (file)
@@ -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)