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

fix QADD/QSUB/QDADD/QDSUB, those would write their result to the wrong register. 

also make them ARM9-only.
This commit is contained in:
StapleButter 2017-06-13 11:17:22 +02:00
parent 581a0954ad
commit bbd251ddbc
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ARM.h
View File

@ -241,4 +241,12 @@ public:
u32 debug; u32 debug;
}; };
namespace ARMInterpreter
{
void A_UNK(ARM* cpu);
void T_UNK(ARM* cpu);
}
#endif // ARM_H #endif // ARM_H

16
src/ARMInterpreter_ALU.cpp
View File

@ -985,7 +985,7 @@ void A_CLZ(ARM* cpu)
void A_QADD(ARM* cpu) void A_QADD(ARM* cpu)
{ {
// TODO: ARM9 only if (cpu->Num != 0) return A_UNK(cpu);
u32 rm = cpu->R[cpu->CurInstr & 0xF]; u32 rm = cpu->R[cpu->CurInstr & 0xF];
u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF]; u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF];
@ -997,12 +997,12 @@ void A_QADD(ARM* cpu)
cpu->CPSR |= 0x08000000; cpu->CPSR |= 0x08000000;
} }
cpu->R[(cpu->CurInstr >> 16) & 0xF] = res; cpu->R[(cpu->CurInstr >> 12) & 0xF] = res;
} }
void A_QSUB(ARM* cpu) void A_QSUB(ARM* cpu)
{ {
// TODO: ARM9 only if (cpu->Num != 0) return A_UNK(cpu);
u32 rm = cpu->R[cpu->CurInstr & 0xF]; u32 rm = cpu->R[cpu->CurInstr & 0xF];
u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF]; u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF];
@ -1014,12 +1014,12 @@ void A_QSUB(ARM* cpu)
cpu->CPSR |= 0x08000000; cpu->CPSR |= 0x08000000;
} }
cpu->R[(cpu->CurInstr >> 16) & 0xF] = res; cpu->R[(cpu->CurInstr >> 12) & 0xF] = res;
} }
void A_QDADD(ARM* cpu) void A_QDADD(ARM* cpu)
{ {
// TODO: ARM9 only if (cpu->Num != 0) return A_UNK(cpu);
u32 rm = cpu->R[cpu->CurInstr & 0xF]; u32 rm = cpu->R[cpu->CurInstr & 0xF];
u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF]; u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF];
@ -1039,12 +1039,12 @@ void A_QDADD(ARM* cpu)
cpu->CPSR |= 0x08000000; cpu->CPSR |= 0x08000000;
} }
cpu->R[(cpu->CurInstr >> 16) & 0xF] = res; cpu->R[(cpu->CurInstr >> 12) & 0xF] = res;
} }
void A_QDSUB(ARM* cpu) void A_QDSUB(ARM* cpu)
{ {
// TODO: ARM9 only if (cpu->Num != 0) return A_UNK(cpu);
u32 rm = cpu->R[cpu->CurInstr & 0xF]; u32 rm = cpu->R[cpu->CurInstr & 0xF];
u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF]; u32 rn = cpu->R[(cpu->CurInstr >> 16) & 0xF];
@ -1064,7 +1064,7 @@ void A_QDSUB(ARM* cpu)
cpu->CPSR |= 0x08000000; cpu->CPSR |= 0x08000000;
} }
cpu->R[(cpu->CurInstr >> 16) & 0xF] = res; cpu->R[(cpu->CurInstr >> 12) & 0xF] = res;
} }