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

core: 

- another fix SWI 4/5 (fixed bug #2781521);
This commit is contained in:
mtabachenko 2009-11-12 17:29:18 +00:00
parent e3276828f6
commit b438ec39b7
4 changed files with 30 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/armcpu.cpp
View File

@ -218,8 +218,6 @@ void armcpu_init(armcpu_t *armcpu, u32 adr)
armcpu->waitIRQ = FALSE;
armcpu->wirq = FALSE;
armcpu->newIrqFlags = 0;
#ifdef GDB_STUB
armcpu->irq_flag = 0;
#endif

4
desmume/src/armcpu.h
View File

@ -175,8 +175,6 @@ typedef struct armcpu_t
BOOL wIRQ;
BOOL wirq;
u32 newIrqFlags;
u32 (* *swi_tab)();
#ifdef GDB_STUB
@ -224,8 +222,6 @@ static INLINE void setIF(int PROCNUM, u32 flag)
{
MMU.reg_IF[PROCNUM] |= flag;
if(ARMPROC.waitIRQ)
ARMPROC.newIrqFlags |= flag;
extern void NDS_Reschedule();
NDS_Reschedule();
}

69
desmume/src/bios.cpp
View File

@ -216,49 +216,40 @@ TEMPLATE static u32 WaitByLoop()
TEMPLATE u32 intrWaitARM()
{
u32 intrFlagAdr = 0;
u32 intr = 0;
u32 intrFlag = 0;
u32 intrFlagAdr = 0;
u32 intr = 0;
u32 intrFlag = 0;
BOOL noDiscard = ((cpu->R[0] == 0) && (PROCNUM == ARMCPU_ARM7));
//emu_halt();
if(PROCNUM == ARMCPU_ARM7)
{
intrFlagAdr = 0x380FFF8;
} else {
intrFlagAdr = (((armcp15_t *)(cpu->coproc[15]))->DTCMRegion&0xFFFFF000)+0x3FF8;
}
intr = _MMU_read32<PROCNUM>(intrFlagAdr);
intrFlag = (cpu->R[1] & intr);
//INFO("ARM%c: wait for IRQ r0=0x%02X, r1=0x%08X - 0x%08X (flag 0x%08X)\n", PROCNUM?'7':'9', cpu->R[0], cpu->R[1], intr, intrFlag);
if(!noDiscard)
intrFlag &= cpu->newIrqFlags;
//BOOL noDiscard = ((cpu->R[0] == 0) && (PROCNUM == ARMCPU_ARM7));
// http://nocash.emubase.de/gbatek.htm#bioshaltfunctions
// SWI 04h (GBA/NDS7/NDS9) - IntrWait
// ... The function forcefully sets IME=1. ...
_MMU_write32<PROCNUM>(0x04000208, 1);
if(PROCNUM == ARMCPU_ARM7)
intrFlagAdr = 0x380FFF8;
else
intrFlagAdr = (((armcp15_t *)(cpu->coproc[15]))->DTCMRegion&0xFFFFF000)+0x3FF8;
if(intrFlag)
{
// si une(ou plusieurs) des interruptions que l'on attend s'est(se sont) produite(s)
// on efface son(les) occurence(s).
intr ^= intrFlag;
cpu->newIrqFlags ^= intrFlag;
_MMU_write32<PROCNUM>(intrFlagAdr, intr);
//cpu->switchMode(oldmode[cpu->proc_ID]);
return 1;
}
u32 instructAddr = cpu->instruct_adr;
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
cpu->waitIRQ = 1;
//oldmode[cpu->proc_ID] = cpu->switchMode(SVC);
intr = _MMU_read32<PROCNUM>(intrFlagAdr);
intrFlag = (cpu->R[1] & intr);
return 1;
//INFO("ARM%c: wait for IRQ r0=0x%02X, r1=0x%08X - 0x%08X (flag 0x%08X)\n", PROCNUM?'7':'9', cpu->R[0], cpu->R[1], intr, intrFlag);
//if(!noDiscard)
// intrFlag &= cpu->newIrqFlags;
_MMU_write32<PROCNUM>(0x04000208, 1); // set IME=1
if (intrFlag)
{
intr ^= intrFlag;
if (intr)
_MMU_write32<PROCNUM>(intrFlagAdr, intr);
return wait4IRQ<PROCNUM>();
}
u32 instructAddr = cpu->instruct_adr;
cpu->R[15] = instructAddr;
cpu->next_instruction = instructAddr;
cpu->waitIRQ = 1;
cpu->wirq = 1;
return 1;
}
TEMPLATE static u32 waitVBlankARM()

2
desmume/src/saves.cpp
View File

@ -103,7 +103,6 @@ SFORMAT SF_ARM7[]={
{ "7Wai", 4, 1, &NDS_ARM7.waitIRQ },
{ "7wIR", 4, 1, &NDS_ARM7.wIRQ, },
{ "7wir", 4, 1, &NDS_ARM7.wirq, },
{ "7NIF", 4, 1, &NDS_ARM7.newIrqFlags},
{ 0 }
};
@ -141,7 +140,6 @@ SFORMAT SF_ARM9[]={
{ "9Wai", 4, 1, &NDS_ARM9.waitIRQ},
{ "9wIR", 4, 1, &NDS_ARM9.wIRQ},
{ "9wir", 4, 1, &NDS_ARM9.wirq},
{ "9NIF", 4, 1, &NDS_ARM9.newIrqFlags},
{ 0 }
};