aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-06-08 00:52:43 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-08 00:52:44 -0700
commit32167ca6cd795b619f4327d83f643a0805735ead (patch)
tree559f356741f61d59fe45158b469c0e004ed7d684
parent47d2b2c5ffedb6b37319154137b286026eeb636c (diff)
parentf15a9e8294ea7b8441415b8a45490dbfd5eb3bd5 (diff)
downloadexternal_qemu-32167ca6cd795b619f4327d83f643a0805735ead.zip
external_qemu-32167ca6cd795b619f4327d83f643a0805735ead.tar.gz
external_qemu-32167ca6cd795b619f4327d83f643a0805735ead.tar.bz2
Merge "[MIPS] TLBRET_DIRTY is a valid return value from get_physical_address"
-rw-r--r--target-mips/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-mips/helper.c b/target-mips/helper.c
index ec87114..12caf34 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -324,7 +324,7 @@ target_phys_addr_t cpu_mips_translate_address(CPUState *env, target_ulong addres
access_type = ACCESS_INT;
ret = get_physical_address(env, &physical, &prot,
address, rw, access_type);
- if (ret != TLBRET_MATCH) {
+ if (ret != TLBRET_MATCH || ret != TLBRET_DIRTY) {
raise_mmu_exception(env, address, rw, ret);
return -1LL;
} else {