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

fix compile error?

This commit is contained in:
zeromus 2009-11-13 01:56:10 +00:00
parent 3d353ce490
commit 926ac850ba
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
desmume/src/bios.cpp
View File

@ -211,7 +211,30 @@ TEMPLATE static u32 WaitByLoop()
return cpu->R[0] * 4; return cpu->R[0] * 4;
} }
//u32 oldmode[2]; 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 u32 intrWaitARM() TEMPLATE u32 intrWaitARM()
{ {
@ -258,31 +281,6 @@ TEMPLATE static u32 waitVBlankARM()
return intrWaitARM<PROCNUM>(); 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() TEMPLATE static u32 sleep()
{ {
_MMU_write08<PROCNUM>(0x04000301, 0xC0); _MMU_write08<PROCNUM>(0x04000301, 0xC0);