piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-27 00:00:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into interpreter-fixes

Browse Source
This commit is contained in:
Jaklyy
2024-08-30 19:33:16 -04:00
parent 0003821738 4f6498c99c
commit f0bd2b9051
43 changed files with 4441 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ARM.cpp
View File

@ -632,6 +632,7 @@ void ARMv5::Execute()
while (NDS.ARM9Timestamp < NDS.ARM9Target)
{
#ifdef JIT_ENABLED
if constexpr (mode == CPUExecuteMode::JIT)
{
u32 instrAddr = R[15] - ((CPSR&0x20)?2:4);
@ -670,6 +671,7 @@ void ARMv5::Execute()
}
}
else
#endif
{
if (CPSR & 0x20) // THUMB
{
@ -784,6 +786,7 @@ void ARMv4::Execute()
while (NDS.ARM7Timestamp < NDS.ARM7Target)
{
#ifdef JIT_ENABLED
if constexpr (mode == CPUExecuteMode::JIT)
{
u32 instrAddr = R[15] - ((CPSR&0x20)?2:4);
@ -821,6 +824,7 @@ void ARMv4::Execute()
}
}
else
#endif
{
if (CPSR & 0x20) // THUMB
{