[Desmume-cvs] SF.net SVN: desmume:[3791] trunk/desmume/src/NDSSystem.cpp

[<ze...@us...>]

Revision: 3791
          http://desmume.svn.sourceforge.net/desmume/?rev=3791&view=rev
Author:   zeromus
Date:     2010-09-27 23:04:56 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
fix copy paste error in changed irq code, fix regressions (freezes in some games)

Modified Paths:
--------------
    trunk/desmume/src/NDSSystem.cpp

Modified: trunk/desmume/src/NDSSystem.cpp
===================================================================
--- trunk/desmume/src/NDSSystem.cpp	2010-09-27 19:45:16 UTC (rev 3790)
+++ trunk/desmume/src/NDSSystem.cpp	2010-09-27 23:04:56 UTC (rev 3791)
@@ -1556,7 +1556,7 @@
 		//arm7 vmatch
 		T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 4);
 		if(T1ReadWord(MMU.ARM7_REG, 4) & 32)
-			NDS_makeIrq(ARMCPU_ARM9,IRQ_BIT_LCD_VMATCH);
+			NDS_makeIrq(ARMCPU_ARM7,IRQ_BIT_LCD_VMATCH);
 	}
 	else
 		T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFB);
@@ -1765,7 +1765,6 @@
 
 FORCEINLINE void arm9log()
 {
-	//if(currFrameCounter>19) dolog=true;
 #ifdef LOG_ARM9
 	if(dolog)
 	{
@@ -2067,7 +2066,10 @@
 	}
 
 	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);
+	}
 }
 
 void execHardware_interrupts()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.