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

* scheduler revamp, simpler design

Browse Source 
* fix dumb bug of the year: ARM LDR opcodes would accidentally read twice, which fucked with things like the IPC FIFO.
This commit is contained in:
StapleButter
2017-01-31 03:54:51 +01:00
parent 348bbd8cb8
commit 594286ee5d
10 changed files with 274 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ARM.cpp
View File

@ -171,12 +171,6 @@ void ARM::JumpTo(u32 addr, bool restorecpsr)
else addr &= ~0x1;
}
if (addr == 0x02000800)
{
printf("!!!!!!!! %08X\n", R[15]);
//printf("%08X %08X %08X %08X\n", Read32(0x02000000), Read32(0x0200000C), Read32(0x02000800), Read32(0x02000804));
}
if (addr & 0x1)
{
addr &= ~0x1;
@ -320,15 +314,19 @@ void ARM::TriggerIRQ()
JumpTo(ExceptionBase + 0x18);
}
s32 ARM::Execute(s32 cyclestorun)
s32 ARM::Execute()
{
if (Halted)
{
if (NDS::HaltInterrupted(Num))
{
Halted = 0;
if (NDS::IME[Num]&1)
TriggerIRQ();
}
else
{
Cycles = cyclestorun;
Cycles = CyclesToRun;
return Cycles;
}
}
@ -337,7 +335,7 @@ s32 ARM::Execute(s32 cyclestorun)
u32 addr = R[15] - (CPSR&0x20 ? 4:8);
u32 cpsr = CPSR;
while (Cycles < cyclestorun)
while (Cycles < CyclesToRun)
{
//if(Num==1)printf("%08X %08X\n", R[15] - (CPSR&0x20 ? 4:8), NextInstr);
@ -376,8 +374,9 @@ s32 ARM::Execute(s32 cyclestorun)
// TODO optimize this shit!!!
if (Halted)
{
Cycles = cyclestorun;
return Cycles;
if (Halted == 1)
Cycles = CyclesToRun;
break;
}
if (NDS::HaltInterrupted(Num))
{
@ -390,5 +389,8 @@ s32 ARM::Execute(s32 cyclestorun)
cpsr = CPSR;
}
if (Halted == 2)
Halted = 0;
return Cycles;
}