ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix copy paste error in changed irq code, fix regressions (freezes in some games)

This commit is contained in:
zeromus 2010-09-27 23:04:56 +00:00
parent 372e35e04f
commit 053635ef55
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/NDSSystem.cpp
View File

@ -1556,7 +1556,7 @@ static void execHardware_hstart_vcount()
//arm7 vmatch //arm7 vmatch
T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 4); T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 4);
if(T1ReadWord(MMU.ARM7_REG, 4) & 32) if(T1ReadWord(MMU.ARM7_REG, 4) & 32)
NDS_makeIrq(ARMCPU_ARM9,IRQ_BIT_LCD_VMATCH); NDS_makeIrq(ARMCPU_ARM7,IRQ_BIT_LCD_VMATCH);
} }
else else
T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFB); T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFB);
@ -1765,7 +1765,6 @@ bool nds_loadstate(EMUFILE* is, int size)
FORCEINLINE void arm9log() FORCEINLINE void arm9log()
{ {
//if(currFrameCounter>19) dolog=true;
#ifdef LOG_ARM9 #ifdef LOG_ARM9
if(dolog) if(dolog)
{ {
@ -2067,7 +2066,10 @@ template<int PROCNUM> static void execHardware_interrupts_core()
} }
if(masked && MMU.reg_IME[PROCNUM] && !ARMPROC.CPSR.bits.I) if(masked && MMU.reg_IME[PROCNUM] && !ARMPROC.CPSR.bits.I)
{
printf("Executing IRQ on procnum %d with IF = %08X and IE = %08X\n",PROCNUM,IF,IE);
armcpu_irqException(&ARMPROC); armcpu_irqException(&ARMPROC);
}
} }
void execHardware_interrupts() void execHardware_interrupts()