aboutsummaryrefslogtreecommitdiff
path: root/target-lm32/helper.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2013-03-23 14:23:26 +0000
committerBlue Swirl <blauwirbel@gmail.com>2013-03-23 14:23:26 +0000
commitf7c61bf8fc1b05613b49d1dd2300d1a1fbc927de (patch)
tree3c25bcedc8bceaf355720888604c8c251f3c68c4 /target-lm32/helper.c
parentd76bb73549fcac07524aea5135280ea533a94fd6 (diff)
parentb1e5fff4afd0c47148b0d9f9341887ae2c3eb9af (diff)
downloadqemu-f7c61bf8fc1b05613b49d1dd2300d1a1fbc927de.zip
qemu-f7c61bf8fc1b05613b49d1dd2300d1a1fbc927de.tar.gz
qemu-f7c61bf8fc1b05613b49d1dd2300d1a1fbc927de.tar.bz2
Merge branch 'for-upstream' of git://github.com/mwalle/qemu
* 'for-upstream' of git://github.com/mwalle/qemu: configure: rename OpenGL feature to GLX configure: proper OpenGL/GLX probe target-lm32: use HELPER() macro target-lm32: flush tlb after clearing env target-lm32: remove dead code target-lm32: fix cmpgui and cmpgeui opcodes tests: tcg: lm32: add more test cases target-lm32: don't log cpu state in translation lm32_uart: fix receive buffering milkymist-uart: fix receive buffering lm32-dis: fix NULL pointer dereference target-lm32: fix debug memory access
Diffstat (limited to 'target-lm32/helper.c')
-rw-r--r--target-lm32/helper.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index a0a8399..03fa5fb 100644
--- 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)