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

NDSSystem: 

- Fix compiler error for Clang (and possibly others): "goto into protected scope". (Regression from r4696.)
This commit is contained in:
rogerman 2013-07-30 00:09:55 +00:00
parent bce045de58
commit 7f1805dcc7
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
desmume/src/NDSSystem.cpp
View File

@ -2621,27 +2621,29 @@ void NDS_Reset()
// Create the dummy firmware // Create the dummy firmware
NDS_CreateDummyFirmware(&CommonSettings.fw_config); NDS_CreateDummyFirmware(&CommonSettings.fw_config);
//copy the arm9 program to the address specified by rom header
u32 src = header->ARM9src;
u32 dst = header->ARM9cpy;
for(u32 i = 0; i < (header->ARM9binSize>>2); ++i)
{ {
_MMU_write32<ARMCPU_ARM9>(dst, T1ReadLong(MMU.CART_ROM, src)); //copy the arm9 program to the address specified by rom header
dst += 4; u32 src = header->ARM9src;
src += 4; u32 dst = header->ARM9cpy;
} for(u32 i = 0; i < (header->ARM9binSize>>2); ++i)
{
_MMU_write32<ARMCPU_ARM9>(dst, T1ReadLong(MMU.CART_ROM, src));
dst += 4;
src += 4;
}
//copy the arm7 program to the address specified by rom header //copy the arm7 program to the address specified by rom header
src = header->ARM7src; src = header->ARM7src;
dst = header->ARM7cpy; dst = header->ARM7cpy;
for(u32 i = 0; i < (header->ARM7binSize>>2); ++i) for(u32 i = 0; i < (header->ARM7binSize>>2); ++i)
{ {
_MMU_write32<ARMCPU_ARM7>(dst, T1ReadLong(MMU.CART_ROM, src)); _MMU_write32<ARMCPU_ARM7>(dst, T1ReadLong(MMU.CART_ROM, src));
dst += 4; dst += 4;
src += 4; src += 4;
}
} }
//set the cpus to an initial state with their respective programs entrypoints //set the cpus to an initial state with their respective programs entrypoints
armcpu_init(&NDS_ARM7, header->ARM7exe); armcpu_init(&NDS_ARM7, header->ARM7exe);
armcpu_init(&NDS_ARM9, header->ARM9exe); armcpu_init(&NDS_ARM9, header->ARM9exe);