hopefully fix the DMA bug without breaking everything this time.

This commit is contained in:
StapleButter 2017-04-13 04:16:57 +02:00
parent c62e160b26
commit 2380c2f4ea
3 changed files with 8 additions and 3 deletions

View File

@ -325,7 +325,11 @@ s32 ARM::Execute()
{
if (Halted)
{
if (NDS::HaltInterrupted(Num))
if (Halted == 2)
{
Halted = 0;
}
else if (NDS::HaltInterrupted(Num))
{
Halted = 0;
if (NDS::IME[Num]&1)

View File

@ -43,6 +43,7 @@ public:
void Halt(u32 halt)
{
if (halt==2 && Halted==1) return;
Halted = halt;
}

View File

@ -561,12 +561,12 @@ void StopCPU(u32 cpu, u32 mask)
if (cpu)
{
CPUStop |= (mask << 16);
//ARM7->Halt(2);
ARM7->Halt(2);
}
else
{
CPUStop |= mask;
//ARM9->Halt(2);
ARM9->Halt(2);
}
}