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

Merge commit '4b57416552ec2fa95216e2b044559f215723bf70' into melonDSi

Browse Source
This commit is contained in:
Arisotura
2020-05-30 03:12:42 +02:00
parent f5eeca67b4 4b57416552
commit 2327de2423
88 changed files with 2428 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ARM.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright 2016-2019 Arisotura
Copyright 2016-2020 Arisotura
This file is part of melonDS.
@ -20,6 +20,7 @@
#include "NDS.h"
#include "ARM.h"
#include "ARMInterpreter.h"
#include "AREngine.h"
// instruction timing notes
@ -227,6 +228,8 @@ void ARMv5::JumpTo(u32 addr, bool restorecpsr)
PrefetchAbort();
return;
}*/
NDS::MonitorARM9Jump(addr);
}
void ARMv4::JumpTo(u32 addr, bool restorecpsr)
@ -405,6 +408,14 @@ void ARM::TriggerIRQ()
R_IRQ[2] = oldcpsr;
R[14] = R[15] + (oldcpsr & 0x20 ? 2 : 0);
JumpTo(ExceptionBase + 0x18);
// ARDS cheat support
// normally, those work by hijacking the ARM7 VBlank handler
if (Num == 1)
{
if ((NDS::IF[1] & NDS::IE[1]) & (1<<NDS::IRQ_VBlank))
AREngine::RunCheats();
}
}
void ARMv5::PrefetchAbort()