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

misaligned pc..........

This commit is contained in:
Jaklyy 2024-09-20 23:47:40 -04:00
parent 157e9c5b04
commit 8d451dff48
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ARM.cpp
View File

@ -837,6 +837,7 @@ void ARMv4::Execute()
{ {
// attempt to delay t bit changes without a pipeline flush (msr) by one instruction // attempt to delay t bit changes without a pipeline flush (msr) by one instruction
Thumb = CPSR & 0x20; Thumb = CPSR & 0x20;
bool fix = !Thumb;
if constexpr (mode == CPUExecuteMode::InterpreterGDB) if constexpr (mode == CPUExecuteMode::InterpreterGDB)
GdbCheckC(); GdbCheckC();
@ -845,17 +846,17 @@ void ARMv4::Execute()
// but if the code fetch takes more than 1 cycle(?) it can take effect early for just the code fetch // but if the code fetch takes more than 1 cycle(?) it can take effect early for just the code fetch
if (!Thumb && (NDS.ARM7MemTimings[CodeCycles][2] > 1)) [[unlikely]] // checkme if (!Thumb && (NDS.ARM7MemTimings[CodeCycles][2] > 1)) [[unlikely]] // checkme
{ {
R[15] = (R[15] + 4) & ~0x3; R[15] += 4;
CurInstr = NextInstr[0]; CurInstr = NextInstr[0];
NextInstr[0] = NextInstr[1]; NextInstr[0] = NextInstr[1];
NextInstr[1] = CodeRead32(R[15]); NextInstr[1] = CodeRead32(R[15] & ~3);
} }
else else [[likely]]
{ {
R[15] += 2; R[15] += 2;
CurInstr = NextInstr[0]; CurInstr = NextInstr[0];
NextInstr[0] = NextInstr[1]; NextInstr[0] = NextInstr[1];
NextInstr[1] = CodeRead16(R[15]); NextInstr[1] = CodeRead16(R[15] & ~1);
} }
if (IRQ && !(CPSR & 0x80)) TriggerIRQ<mode>(); if (IRQ && !(CPSR & 0x80)) TriggerIRQ<mode>();
@ -865,6 +866,12 @@ void ARMv4::Execute()
u32 icode = (CurInstr >> 6) & 0x3FF; u32 icode = (CurInstr >> 6) & 0x3FF;
ARMInterpreter::THUMBInstrTable[icode](this); ARMInterpreter::THUMBInstrTable[icode](this);
} }
if (fix) [[unlikely]] // attempt at fixing flushless t bit changes
{
R[15] += 2; // yes it can end up misaligned. that's correct.
NextInstr[1] = CodeRead32(R[15] & ~3);
}
} }
else else
{ {
@ -878,17 +885,17 @@ void ARMv4::Execute()
// but if the code fetch takes more than 1 cycle(?) it can take effect early for just the code fetch // but if the code fetch takes more than 1 cycle(?) it can take effect early for just the code fetch
if (Thumb && (NDS.ARM7MemTimings[CodeCycles][2] > 1)) [[unlikely]] // checkme? if (Thumb && (NDS.ARM7MemTimings[CodeCycles][2] > 1)) [[unlikely]] // checkme?
{ {
R[15] = (R[15] + 4) & ~0x3; R[15] += 4;
CurInstr = NextInstr[0]; CurInstr = NextInstr[0];
NextInstr[0] = NextInstr[1]; NextInstr[0] = NextInstr[1];
NextInstr[1] = CodeRead16(R[15]); NextInstr[1] = CodeRead16(R[15] & ~1);
} }
else else [[likely]]
{ {
R[15] = (R[15] + 4) & ~0x3; R[15] += 4;
CurInstr = NextInstr[0]; CurInstr = NextInstr[0];
NextInstr[0] = NextInstr[1]; NextInstr[0] = NextInstr[1];
NextInstr[1] = CodeRead32(R[15]); NextInstr[1] = CodeRead32(R[15] & ~3);
} }
if (IRQ && !(CPSR & 0x80)) TriggerIRQ<mode>(); if (IRQ && !(CPSR & 0x80)) TriggerIRQ<mode>();