From: Richard Henderson <richard.henderson@linaro.org>
Date: Thu, 2 May 2019 05:32:31 +0000 (-0700)
Subject: target/mips: Pass a valid error to raise_mmu_exception for user-only
X-Git-Tag: v4.1.0-rc0~110^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=995ffde9622c01f5b307cab47f9bd7962ac09db2;p=thirdparty%2Fqemu.git

target/mips: Pass a valid error to raise_mmu_exception for user-only

At present we give ret = 0, or TLBRET_MATCH.  This gets matched
by the default case, which falls through to TLBRET_BADADDR.
However, it makes more sense to use a proper value.  All of the
tlb-related exceptions are handled identically in cpu_loop.c,
so TLBRET_BADADDR is as good as any other.  Retain it.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/mips/helper.c b/target/mips/helper.c
index c44cdca3b51..cc7be7703ae 100644
--- a/target/mips/helper.c
+++ b/target/mips/helper.c
@@ -884,7 +884,7 @@ int mips_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw,
     int prot;
     int access_type;
 #endif
-    int ret = 0;
+    int ret = TLBRET_BADADDR;
 
 #if 0
     log_cpu_state(cs, 0);