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

core: don't execute builtin SWI when intvec is relocated to an abnormal location

This commit is contained in:
zeromus 2010-02-01 05:23:20 +00:00
parent b18a6d62ab
commit a440388cda
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desmume/src/arm_instructions.cpp
View File

@ -6845,7 +6845,14 @@ TEMPLATE static u32 FASTCALL OP_SWI(const u32 i)
return 0;
}
if(cpu->swi_tab)
//if the user has changed the intVector to point away from the nds bioses,
//then it doesn't really make any sense to use the builtin SWI's since
//the bios ones aren't getting called anyway
bool bypassBuiltinSWI =
(cpu->intVector == 0x00000000 && PROCNUM==0)
|| (cpu->intVector == 0xFFFF0000 && PROCNUM==1);
if(cpu->swi_tab && !bypassBuiltinSWI)
{
swinum &= 0x1F;
//printf("%d ARM SWI %d \n",PROCNUM,swinum);

9
desmume/src/thumb_instructions.cpp
View File

@ -959,7 +959,14 @@ TEMPLATE static u32 FASTCALL OP_SWI_THUMB(const u32 i)
return 0;
}
if(cpu->swi_tab) {
//if the user has changed the intVector to point away from the nds bioses,
//then it doesn't really make any sense to use the builtin SWI's since
//the bios ones aren't getting called anyway
bool bypassBuiltinSWI =
(cpu->intVector == 0x00000000 && PROCNUM==0)
|| (cpu->intVector == 0xFFFF0000 && PROCNUM==1);
if(cpu->swi_tab && !bypassBuiltinSWI) {
//zero 25-dec-2008 - in arm, we were masking to 0x1F.
//this is probably safer since an invalid opcode could crash the emu
//zero 30-jun-2009 - but they say that the ideas 0xFF should crash the device...