Merge remote-tracking branch 'mst/tags/for_anthony' into staging

[qemu.git] / target-lm32 / helper.c

diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index a0a839990602b35d30faf767dc6c8623e90e977c..03fa5fbe283c847f8fe7a9d08a8bc319573f4bb3 100644 (file)
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -39,7 +39,12 @@ int cpu_lm32_handle_mmu_fault(CPULM32State *env, target_ulong address, int rw,
 
 hwaddr cpu_get_phys_page_debug(CPULM32State *env, target_ulong addr)
 {
-    return addr & TARGET_PAGE_MASK;
+    addr &= TARGET_PAGE_MASK;
+    if (env->flags & LM32_FLAG_IGNORE_MSB) {
+        return addr & 0x7fffffff;
+    } else {
+        return addr;
+    }
 }
 
 void lm32_cpu_do_interrupt(CPUState *cs)