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

2
desmume/src/NDSSystem.cpp
View File

@ -2622,6 +2622,7 @@ 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 //copy the arm9 program to the address specified by rom header
u32 src = header->ARM9src; u32 src = header->ARM9src;
u32 dst = header->ARM9cpy; u32 dst = header->ARM9cpy;
@ -2641,6 +2642,7 @@ void NDS_Reset()
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);