piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "improve timings for S variants of multiply instructions on arm9"

Browse Source 
This reverts commit 789ef21c70.
This commit is contained in:
Jaklyy 2024-07-19 17:52:28 -04:00
parent 36f4f2c5d3
commit 13578a3cc9
2 changed files with 24 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ARM.h
View File

@ -272,23 +272,12 @@ public:
void AddCycles_CI(s32 numI) override
{
// code||internal
// code+internal
s32 numC = CodeCycles;
numI += 1;
Cycles += std::max(numC, numI);
}
void AddCycles_CIL(s32 numI, s32 numL)
{
// (code||internal)+forced interlock
// used by S variants of multiply instructions on the ARM9
// seems that instead of adding extra hardware logic to allow for handling the memory stage of the instructions during the execute stage
// it instead seems to force a two cycle interlock allowing for the interlocked cycle to be executed without any special logic + presumably an extra cycle to set flags
s32 numC = CodeCycles;
numI += 1;
Cycles += std::max(numC, numI) + numL;
}
void AddCycles_CDI_LDR() override;
void AddCycles_CDI_LDM() override;
void AddCycles_CDI_SWP() override { AddCycles_CD_STR(); } // uses the same behavior as str

81
src/ARMInterpreter_ALU.cpp
View File

@ -774,23 +774,18 @@ void A_MUL(ARM* cpu)
if (cpu->Num==1) cpu->SetC(0);
}
u32 cycles;
if (cpu->Num == 0)
{
if (cpu->CurInstr & (1<<20))
((ARMv5*)cpu)->AddCycles_CIL(1, 2);
else
cpu->AddCycles_CI(1);
}
cycles = (cpu->CurInstr & (1<<20)) ? 3 : 1;
else
{
u32 cycles;
if ((rs & 0xFFFFFF00) == 0x00000000 || (rs & 0xFFFFFF00) == 0xFFFFFF00) cycles = 1;
else if ((rs & 0xFFFF0000) == 0x00000000 || (rs & 0xFFFF0000) == 0xFFFF0000) cycles = 2;
else if ((rs & 0xFF000000) == 0x00000000 || (rs & 0xFF000000) == 0xFF000000) cycles = 3;
else cycles = 4;
cpu->AddCycles_CI(cycles);
}
cpu->AddCycles_CI(cycles);
}
void A_MLA(ARM* cpu)
@ -809,23 +804,18 @@ void A_MLA(ARM* cpu)
if (cpu->Num==1) cpu->SetC(0);
}
u32 cycles;
if (cpu->Num == 0)
{
if (cpu->CurInstr & (1<<20))
((ARMv5*)cpu)->AddCycles_CIL(1, 2);
else
cpu->AddCycles_CI(1);
}
cycles = (cpu->CurInstr & (1<<20)) ? 3 : 1;
else
{
u32 cycles;
if ((rs & 0xFFFFFF00) == 0x00000000 || (rs & 0xFFFFFF00) == 0xFFFFFF00) cycles = 2;
else if ((rs & 0xFFFF0000) == 0x00000000 || (rs & 0xFFFF0000) == 0xFFFF0000) cycles = 3;
else if ((rs & 0xFF000000) == 0x00000000 || (rs & 0xFF000000) == 0xFF000000) cycles = 4;
else cycles = 5;
cpu->AddCycles_CI(cycles);
}
cpu->AddCycles_CI(cycles);
}
void A_UMULL(ARM* cpu)
@ -844,24 +834,18 @@ void A_UMULL(ARM* cpu)
if (cpu->Num==1) cpu->SetC(0);
}
u32 cycles;
if (cpu->Num == 0)
{
if (cpu->CurInstr & (1<<20))
((ARMv5*)cpu)->AddCycles_CIL(1, 2);
else
cpu->AddCycles_CI(1);
}
cycles = (cpu->CurInstr & (1<<20)) ? 3 : 1;
else
{
u32 cycles;
if ((rs & 0xFFFFFF00) == 0x00000000) cycles = 2;
else if ((rs & 0xFFFF0000) == 0x00000000) cycles = 3;
else if ((rs & 0xFF000000) == 0x00000000) cycles = 4;
else cycles = 5;
cpu->AddCycles_CI(cycles);
}
cpu->AddCycles_CI(cycles);
}
void A_UMLAL(ARM* cpu)
@ -883,24 +867,18 @@ void A_UMLAL(ARM* cpu)
if (cpu->Num==1) cpu->SetC(0);
}
u32 cycles;
if (cpu->Num == 0)
{
if (cpu->CurInstr & (1<<20))
((ARMv5*)cpu)->AddCycles_CIL(1, 2);
else
cpu->AddCycles_CI(1);
}
cycles = (cpu->CurInstr & (1<<20)) ? 3 : 1;
else
{
u32 cycles;
if ((rs & 0xFFFFFF00) == 0x00000000) cycles = 2;
else if ((rs & 0xFFFF0000) == 0x00000000) cycles = 3;
else if ((rs & 0xFF000000) == 0x00000000) cycles = 4;
else cycles = 5;
cpu->AddCycles_CI(cycles);
}
cpu->AddCycles_CI(cycles);
}
void A_SMULL(ARM* cpu)
@ -919,24 +897,18 @@ void A_SMULL(ARM* cpu)
if (cpu->Num==1) cpu->SetC(0);
}
u32 cycles;
if (cpu->Num == 0)
{
if (cpu->CurInstr & (1<<20))
((ARMv5*)cpu)->AddCycles_CIL(1, 2);
else
cpu->AddCycles_CI(1);
}
cycles = (cpu->CurInstr & (1<<20)) ? 3 : 1;
else
{
u32 cycles;
if ((rs & 0xFFFFFF00) == 0x00000000 || (rs & 0xFFFFFF00) == 0xFFFFFF00) cycles = 2;
else if ((rs & 0xFFFF0000) == 0x00000000 || (rs & 0xFFFF0000) == 0xFFFF0000) cycles = 3;
else if ((rs & 0xFF000000) == 0x00000000 || (rs & 0xFF000000) == 0xFF000000) cycles = 4;
else cycles = 5;
cpu->AddCycles_CI(cycles);
}
cpu->AddCycles_CI(cycles);
}
void A_SMLAL(ARM* cpu)
@ -958,24 +930,18 @@ void A_SMLAL(ARM* cpu)
if (cpu->Num==1) cpu->SetC(0);
}
u32 cycles;
if (cpu->Num == 0)
{
if (cpu->CurInstr & (1<<20))
((ARMv5*)cpu)->AddCycles_CIL(1, 2);
else
cpu->AddCycles_CI(1);
}
cycles = (cpu->CurInstr & (1<<20)) ? 3 : 1;
else
{
u32 cycles;
if ((rs & 0xFFFFFF00) == 0x00000000 || (rs & 0xFFFFFF00) == 0xFFFFFF00) cycles = 2;
else if ((rs & 0xFFFF0000) == 0x00000000 || (rs & 0xFFFF0000) == 0xFFFF0000) cycles = 3;
else if ((rs & 0xFF000000) == 0x00000000 || (rs & 0xFF000000) == 0xFF000000) cycles = 4;
else cycles = 5;
cpu->AddCycles_CI(cycles);
}
cpu->AddCycles_CI(cycles);
}
void A_SMLAxy(ARM* cpu)
@ -1495,21 +1461,20 @@ void T_MUL_REG(ARM* cpu)
cpu->SetNZ(res & 0x80000000,
!res);
s32 cycles = 0;
if (cpu->Num == 0)
{
((ARMv5*)cpu)->AddCycles_CIL(1, 2); // checkme?
cycles += 3;
}
else
{
s32 cycles = 0;
cpu->SetC(0); // carry flag destroyed, they say. whatever that means...
if (a & 0xFF000000) cycles += 4;
else if (a & 0x00FF0000) cycles += 3;
else if (a & 0x0000FF00) cycles += 2;
else cycles += 1;
cpu->AddCycles_CI(cycles);
}
cpu->AddCycles_CI(cycles);
}
void T_BIC_REG(ARM* cpu)