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

Move wait4IRQ before intrWaitARM since it used by the latter.

This commit is contained in:
riccardom 2009-11-12 21:12:05 +00:00
parent f65d5965a5
commit 03214b3848
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
desmume/src/bios.cpp
View File

@ -212,6 +212,31 @@ TEMPLATE static u32 WaitByLoop()
return cpu->R[0] * 4;
}
TEMPLATE static u32 wait4IRQ()
{
//execute= FALSE;
u32 instructAddr = cpu->instruct_adr;
if(cpu->wirq)
{
if(!cpu->waitIRQ)
{
cpu->waitIRQ = 0;
cpu->wirq = 0;
//cpu->switchMode(oldmode[cpu->proc_ID]);
return 1;
}
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
return 1;
}
cpu->waitIRQ = 1;
cpu->wirq = 1;
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
//oldmode[cpu->proc_ID] = cpu->switchMode(SVC);
return 1;
}
//u32 oldmode[2];
TEMPLATE u32 intrWaitARM()
@ -259,31 +284,6 @@ TEMPLATE static u32 waitVBlankARM()
return intrWaitARM<PROCNUM>();
}
TEMPLATE static u32 wait4IRQ()
{
//execute= FALSE;
u32 instructAddr = cpu->instruct_adr;
if(cpu->wirq)
{
if(!cpu->waitIRQ)
{
cpu->waitIRQ = 0;
cpu->wirq = 0;
//cpu->switchMode(oldmode[cpu->proc_ID]);
return 1;
}
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
return 1;
}
cpu->waitIRQ = 1;
cpu->wirq = 1;
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
//oldmode[cpu->proc_ID] = cpu->switchMode(SVC);
return 1;
}
TEMPLATE static u32 sleep()
{
_MMU_write08<PROCNUM>(0x04000301, 0xC0);