Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-22 21:58:57 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ARM7: fix for "39in1" (MAME) and removed a duplicate line [Tim Schuerewegen]

Browse Source
This commit is contained in:
Miodrag Milanovic 2011-01-01 17:44:37 +00:00
parent 3fe6ec4278
commit 6ac3011fa9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/cpu/arm7/arm7core.c
View File

@ -731,7 +731,6 @@ static void arm7_check_irq_state(arm_state *cpustate)
SET_CPSR(temp); /* Mask IRQ */ SET_CPSR(temp); /* Mask IRQ */
} }
if ((COPRO_CTRL & COPRO_CTRL_MMU_EN) && (COPRO_CTRL & COPRO_CTRL_INTVEC_ADJUST)) R15 |= 0xFFFF0000; if ((COPRO_CTRL & COPRO_CTRL_MMU_EN) && (COPRO_CTRL & COPRO_CTRL_INTVEC_ADJUST)) R15 |= 0xFFFF0000;
if ((COPRO_CTRL & COPRO_CTRL_MMU_EN) && (COPRO_CTRL & COPRO_CTRL_INTVEC_ADJUST)) R15 |= 0xFFFF0000;
cpustate->pendingSwi = 0; cpustate->pendingSwi = 0;
return; return;
} }
@ -1796,10 +1795,13 @@ static void HandleMemBlock(arm_state *cpustate, UINT32 insn)
SwitchMode(cpustate, temp & 3); SwitchMode(cpustate, temp & 3);
} }
} }
}
// note: the next statement should be located within the previous "if" statement (right?), however, doing so will break "39in1"
// LDM PC - takes 1 extra cycle // LDM PC - takes 1 extra cycle
ARM7_ICOUNT -= 1; ARM7_ICOUNT -= 1;
} }
}
else else
{ {
/* Decrementing */ /* Decrementing */