openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Aurelien Jarno 2011-01-15 13:50:38 +01:00
parent 2d5b50749a
commit 0c16e71e6a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-sh4/helper.c
View File

@ -380,7 +380,7 @@ static int get_mmu_address(CPUState * env, target_ulong * physical,
MMU_DTLB_VIOLATION_READ; MMU_DTLB_VIOLATION_READ;
} else if ((rw == 1) && !(matching->pr & 1)) { } else if ((rw == 1) && !(matching->pr & 1)) {
n = MMU_DTLB_VIOLATION_WRITE; n = MMU_DTLB_VIOLATION_WRITE;
} else if ((rw == 1) & !matching->d) { } else if ((rw == 1) && !matching->d) {
n = MMU_DTLB_INITIAL_WRITE; n = MMU_DTLB_INITIAL_WRITE;
} else { } else {
*prot = PAGE_READ; *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 MMU is disabled, return the corresponding physical page */
if (!env->mmucr & MMUCR_AT) { if (!(env->mmucr & MMUCR_AT)) {
*physical = address & 0x1FFFFFFF; *physical = address & 0x1FFFFFFF;
*prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
return MMU_OK; return MMU_OK;