hopefully fix the DMA bug without breaking everything this time.
This commit is contained in:
parent
c62e160b26
commit
2380c2f4ea
|
@ -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)
|
||||
|
|
|
@ -43,6 +43,7 @@ public:
|
|||
|
||||
void Halt(u32 halt)
|
||||
{
|
||||
if (halt==2 && Halted==1) return;
|
||||
Halted = halt;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue