aboutsummaryrefslogtreecommitdiff
path: root/target-sh4
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2011-01-15 13:50:38 +0100
committerAurelien Jarno <aurelien@aurel32.net>2011-01-15 13:50:38 +0100
commit0c16e71e6a96a91e65c2a2e7b14b86423a21dd94 (patch)
tree0f7a701c34bfca86a22476cb7c576783e96b43d9 /target-sh4
parent2d5b50749adeda4e45066290deec19aa8e2322c3 (diff)
downloadqemu-0c16e71e6a96a91e65c2a2e7b14b86423a21dd94.zip
qemu-0c16e71e6a96a91e65c2a2e7b14b86423a21dd94.tar.gz
qemu-0c16e71e6a96a91e65c2a2e7b14b86423a21dd94.tar.bz2
target-sh4: correct use of ! and &
Fix wrong usage of ! and & in MMU related functions. Thanks to Blue Swirl for reporting the issue. Reported-by: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target-sh4')
-rw-r--r--target-sh4/helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index 2343366..45449ea 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -380,7 +380,7 @@ static int get_mmu_address(CPUState * env, target_ulong * physical,
MMU_DTLB_VIOLATION_READ;
} else if ((rw == 1) && !(matching->pr & 1)) {
n = MMU_DTLB_VIOLATION_WRITE;
- } else if ((rw == 1) & !matching->d) {
+ } else if ((rw == 1) && !matching->d) {
n = MMU_DTLB_INITIAL_WRITE;
} else {
*prot = PAGE_READ;
@@ -430,7 +430,7 @@ static int get_physical_address(CPUState * env, target_ulong * physical,
}
/* If MMU is disabled, return the corresponding physical page */
- if (!env->mmucr & MMUCR_AT) {
+ if (!(env->mmucr & MMUCR_AT)) {
*physical = address & 0x1FFFFFFF;
*prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
return MMU_OK;