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

RSP: move isNop into RSPInstruction

This commit is contained in:
zilmar 2025-03-28 19:15:51 +10:30
parent 1a83c9b120
commit 7d24088e8a
5 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Project64-rsp-core/Recompiler/RspRecompilerAnalysis.cpp
View File

@ -13,24 +13,6 @@
//#define COMPARE_INSTRUCTIONS_VERBOSE
/*
IsOpcodeNop
Output: bool whether opcode at PC is a NOP
Input: PC
*/
bool IsOpcodeNop(uint32_t PC)
{
RSPOpcode RspOp;
RspOp.Value = *(uint32_t *)(RSPInfo.IMEM + (PC & 0xFFC));
if (RspOp.op == RSP_SPECIAL && RspOp.funct == RSP_SPECIAL_SLL)
{
return (RspOp.rd == 0) ? true : false;
}
return false;
}
/*
IsRegisterConstant
Output:
@ -651,7 +633,7 @@ Input: PC
bool DelaySlotAffectBranch(uint32_t PC)
{
uint32_t DelayPC = (PC + 4) & 0xFFC;
if (IsOpcodeNop(DelayPC) == true)
if (RSPInstruction(DelayPC, *(uint32_t *)(RSPInfo.IMEM + PC)).IsNop())
{
return false;
}

18
Source/Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.cpp
View File

@ -436,6 +436,8 @@ void CRSPRecompiler::ReOrderInstructions(uint32_t StartPC, uint32_t EndPC)
uint32_t InstructionCount = EndPC - StartPC;
uint32_t Count, ReorderedOps, CurrentPC;
RSPInstruction PreviousOp(StartPC, *(uint32_t *)(m_IMEM + (StartPC & 0xFFC)));
RSPInstruction NextOp(StartPC + 4, *(uint32_t *)(m_IMEM + ((StartPC + 4) & 0xFFC)));
RSPInstruction NextNextOp(StartPC + 8, *(uint32_t *)(m_IMEM + ((StartPC + 8) & 0xFFC)));
RSPOpcode CurrentOp, RspOp;
if (PreviousOp.IsBranch())
@ -443,8 +445,7 @@ void CRSPRecompiler::ReOrderInstructions(uint32_t StartPC, uint32_t EndPC)
// The sub block ends here anyway
return;
}
if (IsOpcodeNop(StartPC) && IsOpcodeNop(StartPC + 4) && IsOpcodeNop(StartPC + 8))
if (PreviousOp.IsNop() && NextOp.IsNop() && NextNextOp.IsNop())
{
// Don't even bother
return;
@ -496,8 +497,9 @@ void CRSPRecompiler::ReOrderInstructions(uint32_t StartPC, uint32_t EndPC)
#endif
}
PreviousOp = RSPInstruction(CurrentPC, *(uint32_t *)(m_IMEM + (CurrentPC & 0xFFC)));
if (IsOpcodeNop(CurrentPC) && IsOpcodeNop(CurrentPC + 4) && IsOpcodeNop(CurrentPC + 8))
NextOp = RSPInstruction(CurrentPC + 4, *(uint32_t *)(m_IMEM + ((CurrentPC + 4) & 0xFFC)));
NextNextOp = RSPInstruction(CurrentPC + 8, *(uint32_t *)(m_IMEM + ((CurrentPC + 8) & 0xFFC)));
if (PreviousOp.IsNop() && NextOp.IsNop() && NextNextOp.IsNop())
{
CurrentPC = EndPC;
}
@ -882,14 +884,14 @@ void CRSPRecompiler::CompilerRSPBlock(void)
continue;
}
}
RSP_LW_IMEM(m_CompilePC, &m_OpCode.Value);
#ifdef X86_RECOMP_VERBOSE
if (!IsOpcodeNop(m_CompilePC))
if (!RSPInstruction(m_CompilePC, m_OpCode.Value).IsNop())
{
CPU_Message("X86 Address: %08X", RecompPos);
}
#endif
RSP_LW_IMEM(m_CompilePC, &m_OpCode.Value);
if (m_OpCode.Value == 0xFFFFFFFF)
{
@ -1106,13 +1108,13 @@ void CRSPRecompiler::CompileHLETask(uint32_t Address)
// We could link the blocks here, but performance-wise it might be better to just let it run
}
}
RSP_LW_IMEM(m_CompilePC, &m_OpCode.Value);
#ifdef X86_RECOMP_VERBOSE
if (!IsOpcodeNop(m_CompilePC))
if (!RSPInstruction(m_CompilePC, m_OpCode.Value).IsNop())
{
CPU_Message("X86 Address: %08X", RecompPos);
}
#endif
RSP_LW_IMEM(m_CompilePC, &m_OpCode.Value);
(m_RecompilerOps.*RSP_Recomp_Opcode[m_OpCode.op])();
switch (m_NextInstruction)

2
Source/Project64-rsp-core/Recompiler/RspRecompilerCPU-x86.h
View File

@ -76,8 +76,6 @@ extern bool ChangedPC;
bool DelaySlotAffectBranch(uint32_t PC);
bool CompareInstructions(uint32_t PC, const RSPInstruction & Top, RSPOpcode * Bottom);
bool IsOpcodeNop(uint32_t PC);
bool IsRegisterConstant(uint32_t Reg, uint32_t * Constant);
#define MainBuffer 0

1
Source/Project64-rsp-core/cpu/RSPInstruction.h
View File

@ -11,6 +11,7 @@ public:
uint32_t Address() const;
bool IsBranch() const;
bool IsNop() const;
const char * Name() const;
const char * Param() const;
std::string NameAndParam() const;

5
Source/Project64-rsp-core/cpu/RSPiInstruction.cpp
View File

@ -106,6 +106,11 @@ bool RSPInstruction::IsBranch() const
return false;
}
bool RSPInstruction::IsNop() const
{
return m_Instruction.op == RSP_SPECIAL && m_Instruction.funct == RSP_SPECIAL_SLL && m_Instruction.rd == 0;
}
const char * RSPInstruction::Name() const
{
if (m_Name[0] == '\0')