CPU: Linux compile fix

This commit is contained in:
Connor McLaughlin
2020-08-20 01:05:03 +10:00
parent b17335d812
commit 6a17a558bb
3 changed files with 14 additions and 13 deletions

View File

@ -1101,7 +1101,7 @@ void CPU_SUBU(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
CPU_SUB(instr, rdVal, rsVal, rtVal);
}
void CPU_AND(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
void CPU_AND_(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
{
// Rd = Rs & Rt
psx_value vald, vals, valt;
@ -1193,22 +1193,22 @@ void CPU_AND(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
CPU_reg[rd(instr)] = ret;
}
void CPU_OR(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
void CPU_OR_(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
{
// Rd = Rs | Rt
CPU_AND(instr, rdVal, rsVal, rtVal);
CPU_AND_(instr, rdVal, rsVal, rtVal);
}
void CPU_XOR(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
void CPU_XOR_(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
{
// Rd = Rs ^ Rt
CPU_AND(instr, rdVal, rsVal, rtVal);
CPU_AND_(instr, rdVal, rsVal, rtVal);
}
void CPU_NOR(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)
{
// Rd = Rs NOR Rt
CPU_AND(instr, rdVal, rsVal, rtVal);
CPU_AND_(instr, rdVal, rsVal, rtVal);
}
void CPU_SLT(u32 instr, u32 rdVal, u32 rsVal, u32 rtVal)