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

Remove bogus static function declaration in header

This commit is contained in:
Emmanuel Gil Peyrot 2020-11-27 20:18:10 +01:00
parent eab1fb9583
commit baccf00674
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desmume/src/NDSSystem.cpp
View File

@ -2630,6 +2630,16 @@ bool NDS_FakeBoot()
return true; return true;
} }
static void NDS_CurrentCPUInfoToNDSError(NDSError &ndsError)
{
ndsError.programCounterARM9 = NDS_ARM9.R[15];
ndsError.instructionARM9 = NDS_ARM9.instruction;
ndsError.instructionAddrARM9 = NDS_ARM9.instruct_adr;
ndsError.programCounterARM7 = NDS_ARM7.R[15];
ndsError.instructionARM7 = NDS_ARM7.instruction;
ndsError.instructionAddrARM7 = NDS_ARM7.instruct_adr;
}
bool _HACK_DONT_STOPMOVIE = false; bool _HACK_DONT_STOPMOVIE = false;
void NDS_Reset() void NDS_Reset()
{ {
@ -3161,16 +3171,6 @@ NDSError NDS_GetLastError()
return _lastNDSError; return _lastNDSError;
} }
static void NDS_CurrentCPUInfoToNDSError(NDSError &ndsError)
{
ndsError.programCounterARM9 = NDS_ARM9.R[15];
ndsError.instructionARM9 = NDS_ARM9.instruction;
ndsError.instructionAddrARM9 = NDS_ARM9.instruct_adr;
ndsError.programCounterARM7 = NDS_ARM7.R[15];
ndsError.instructionARM7 = NDS_ARM7.instruction;
ndsError.instructionAddrARM7 = NDS_ARM7.instruct_adr;
}
void emu_halt(EmuHaltReasonCode reasonCode, NDSErrorTag errorTag) void emu_halt(EmuHaltReasonCode reasonCode, NDSErrorTag errorTag)
{ {
switch (reasonCode) switch (reasonCode)

1
desmume/src/NDSSystem.h
View File

@ -192,7 +192,6 @@ struct NDS_header
extern void debug(); extern void debug();
NDSError NDS_GetLastError(); NDSError NDS_GetLastError();
static void NDS_CurrentCPUInfoToNDSError(NDSError &ndsError);
void emu_halt(EmuHaltReasonCode reasonCode, NDSErrorTag errorTag); void emu_halt(EmuHaltReasonCode reasonCode, NDSErrorTag errorTag);
extern u64 nds_timer; extern u64 nds_timer;