mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-22 22:01:06 -06:00
reconcile DSi and JIT, fastmem for x64 and Windows
This commit is contained in:
23
src/ARM.cpp
23
src/ARM.cpp
@ -21,12 +21,15 @@
|
||||
#include "DSi.h"
|
||||
#include "ARM.h"
|
||||
#include "ARMInterpreter.h"
|
||||
#include "ARMJIT.h"
|
||||
#include "Config.h"
|
||||
#include "AREngine.h"
|
||||
#include "ARMJIT.h"
|
||||
#include "Config.h"
|
||||
|
||||
#ifdef JIT_ENABLED
|
||||
#include "ARMJIT.h"
|
||||
#include "ARMJIT_Memory.h"
|
||||
#endif
|
||||
|
||||
// instruction timing notes
|
||||
//
|
||||
@ -109,6 +112,12 @@ void ARM::Reset()
|
||||
|
||||
CodeMem.Mem = NULL;
|
||||
|
||||
#ifdef JIT_ENABLED
|
||||
FastBlockLookup = NULL;
|
||||
FastBlockLookupStart = 0;
|
||||
FastBlockLookupSize = 0;
|
||||
#endif
|
||||
|
||||
// zorp
|
||||
JumpTo(ExceptionBase);
|
||||
}
|
||||
@ -752,6 +761,12 @@ void ARMv4::Execute()
|
||||
|
||||
if (Halted == 2)
|
||||
Halted = 0;
|
||||
|
||||
if (Halted == 4)
|
||||
{
|
||||
DSi::SoftReset();
|
||||
Halted = 2;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef JIT_ENABLED
|
||||
@ -820,6 +835,12 @@ void ARMv4::ExecuteJIT()
|
||||
|
||||
if (Halted == 2)
|
||||
Halted = 0;
|
||||
|
||||
if (Halted == 4)
|
||||
{
|
||||
DSi::SoftReset();
|
||||
Halted = 2;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user