diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp index 7f1ab00a6b..af357e6a25 100644 --- a/Source/Core/Core/DSP/DSPTables.cpp +++ b/Source/Core/Core/DSP/DSPTables.cpp @@ -284,7 +284,7 @@ const std::array s_opcodes = //c-d {"MULC", 0xc000, 0xe700, 1, 2, {{P_ACCM, 1, 0, 12, 0x1000}, {P_REG1A, 1, 0, 11, 0x0800}}, true, false, false, false, true}, // $prod = $acS.m * $axS.h - {"CMPAR", 0xc100, 0xe700, 1, 2, {{P_ACC, 1, 0, 11, 0x0800}, {P_REG1A, 1, 0, 12, 0x1000}}, true, false, false, false, true}, // FLAGS($acS - axR.h) + {"CMPAXH", 0xc100, 0xe700, 1, 2, {{P_ACC, 1, 0, 11, 0x0800}, {P_REG1A, 1, 0, 12, 0x1000}}, true, false, false, false, true}, // FLAGS($acS - axR.h) {"MULCMVZ", 0xc200, 0xe600, 1, 3, {{P_ACCM, 1, 0, 12, 0x1000}, {P_REG1A, 1, 0, 11, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR.hm, $acR.l, $prod = $prod.hm, 0, $acS.m * $axS.h {"MULCAC", 0xc400, 0xe600, 1, 3, {{P_ACCM, 1, 0, 12, 0x1000}, {P_REG1A, 1, 0, 11, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR, $prod = $acR + $prod, $acS.m * $axS.h {"MULCMV", 0xc600, 0xe600, 1, 3, {{P_ACCM, 1, 0, 12, 0x1000}, {P_REG1A, 1, 0, 11, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR, $prod = $prod, $acS.m * $axS.h diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp index 9a6e1335ef..e88fe6ac4a 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp @@ -124,12 +124,12 @@ void Interpreter::cmp(const UDSPInstruction) ZeroWriteBackLog(); } -// CMPAR $acS axR.h +// CMPAXH $acS, $axR.h // 110r s001 xxxx xxxx -// Compares accumulator $acS with accumulator $axR.h. +// Compares accumulator $acS with high part of secondary accumulator $axR.h. // // flags out: x-xx xxxx -void Interpreter::cmpar(const UDSPInstruction opc) +void Interpreter::cmpaxh(const UDSPInstruction opc) { const u8 rreg = (opc >> 12) & 0x1; const u8 sreg = (opc >> 11) & 0x1; diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntTables.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntTables.cpp index eefe8d2fd7..619f5d4164 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntTables.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntTables.cpp @@ -178,7 +178,7 @@ constexpr std::array s_opcodes // C-D {0xc000, 0xe700, &Interpreter::mulc}, - {0xc100, 0xe700, &Interpreter::cmpar}, + {0xc100, 0xe700, &Interpreter::cmpaxh}, {0xc200, 0xe600, &Interpreter::mulcmvz}, {0xc400, 0xe600, &Interpreter::mulcac}, {0xc600, 0xe600, &Interpreter::mulcmv}, diff --git a/Source/Core/Core/DSP/Interpreter/DSPInterpreter.h b/Source/Core/Core/DSP/Interpreter/DSPInterpreter.h index 422c9a5f45..6d9e3e2709 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPInterpreter.h +++ b/Source/Core/Core/DSP/Interpreter/DSPInterpreter.h @@ -70,7 +70,7 @@ public: void clrl(UDSPInstruction opc); void clrp(UDSPInstruction opc); void cmp(UDSPInstruction opc); - void cmpar(UDSPInstruction opc); + void cmpaxh(UDSPInstruction opc); void cmpi(UDSPInstruction opc); void cmpis(UDSPInstruction opc); void dar(UDSPInstruction opc); diff --git a/Source/Core/Core/DSP/Jit/x64/DSPEmitter.h b/Source/Core/Core/DSP/Jit/x64/DSPEmitter.h index 05d52abe51..f64e211e00 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPEmitter.h +++ b/Source/Core/Core/DSP/Jit/x64/DSPEmitter.h @@ -115,7 +115,7 @@ public: void tst(UDSPInstruction opc); void tstaxh(UDSPInstruction opc); void cmp(UDSPInstruction opc); - void cmpar(UDSPInstruction opc); + void cmpaxh(UDSPInstruction opc); void cmpi(UDSPInstruction opc); void cmpis(UDSPInstruction opc); void xorr(UDSPInstruction opc); diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp index 864c488d81..716781750e 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp @@ -188,12 +188,12 @@ void DSPEmitter::cmp(const UDSPInstruction opc) } } -// CMPAR $acS axR.h +// CMPAXH $acS, $axR.h // 110r s001 xxxx xxxx -// Compares accumulator $acS with accumulator $axR.h. +// Compares accumulator $acS with high part of secondary accumulator $axR.h. // // flags out: x-xx xxxx -void DSPEmitter::cmpar(const UDSPInstruction opc) +void DSPEmitter::cmpaxh(const UDSPInstruction opc) { if (FlagsNeeded()) { diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitTables.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitTables.cpp index 87f446f82d..9c38c2e97f 100644 --- a/Source/Core/Core/DSP/Jit/x64/DSPJitTables.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitTables.cpp @@ -178,7 +178,7 @@ const std::array s_opcodes = // C-D {0xc000, 0xe700, &DSPEmitter::mulc}, - {0xc100, 0xe700, &DSPEmitter::cmpar}, + {0xc100, 0xe700, &DSPEmitter::cmpaxh}, {0xc200, 0xe600, &DSPEmitter::mulcmvz}, {0xc400, 0xe600, &DSPEmitter::mulcac}, {0xc600, 0xe600, &DSPEmitter::mulcmv},