From 84b1e222467e5f954fe09b181eece9868b696c72 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Mon, 14 Dec 2015 09:56:02 +0100 Subject: [PATCH] PowerPC: rename fcmpx to fcmpX lowercase: optional Rc bit uppercase: generic placeholder --- Source/Core/Core/PowerPC/Jit64/Jit.h | 2 +- Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp | 4 ++-- Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp | 2 +- Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp | 4 ++-- Source/Core/Core/PowerPC/JitArm64/Jit.h | 2 +- Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp | 2 +- Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp | 4 ++-- Source/Core/Core/PowerPC/JitILCommon/JitILBase.h | 2 +- .../Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index edb393e52b..17934d48b3 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -214,7 +214,7 @@ public: void fp_arith(UGeckoInstruction inst); - void fcmpx(UGeckoInstruction inst); + void fcmpX(UGeckoInstruction inst); void fctiwx(UGeckoInstruction inst); void fmrx(UGeckoInstruction inst); void frspx(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp index fad907c7dc..d6541173fe 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp @@ -322,8 +322,8 @@ static GekkoOPTemplate table59[] = static GekkoOPTemplate table63[] = { {264, &Jit64::fsign}, // fabsx - {32, &Jit64::fcmpx}, // fcmpo - {0, &Jit64::fcmpx}, // fcmpu + {32, &Jit64::fcmpX}, // fcmpo + {0, &Jit64::fcmpX}, // fcmpu {14, &Jit64::fctiwx}, // fctiwx {15, &Jit64::fctiwx}, // fctiwzx {72, &Jit64::fmrx}, // fmrx diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index aa3ca677ae..dc3cbd3cf9 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -556,7 +556,7 @@ void Jit64::FloatCompare(UGeckoInstruction inst, bool upper) fpr.UnlockAll(); } -void Jit64::fcmpx(UGeckoInstruction inst) +void Jit64::fcmpX(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITFloatingPointOff); diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp index ec721d19d4..793b5bd5bd 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -323,8 +323,8 @@ static GekkoOPTemplate table59[] = static GekkoOPTemplate table63[] = { {264, &JitIL::fsign}, //"fabsx", OPTYPE_FPU, FL_RC_BIT_F}}, - {32, &JitIL::fcmpx}, //"fcmpo", OPTYPE_FPU, FL_RC_BIT_F}}, - {0, &JitIL::fcmpx}, //"fcmpu", OPTYPE_FPU, FL_RC_BIT_F}}, + {32, &JitIL::fcmpX}, //"fcmpo", OPTYPE_FPU, FL_RC_BIT_F}}, + {0, &JitIL::fcmpX}, //"fcmpu", OPTYPE_FPU, FL_RC_BIT_F}}, {14, &JitIL::FallBackToInterpreter}, //"fctiwx", OPTYPE_FPU, FL_RC_BIT_F}}, {15, &JitIL::FallBackToInterpreter}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}}, {72, &JitIL::fmrx}, //"fmrx", OPTYPE_FPU, FL_RC_BIT_F}}, diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h index 91d4de7782..764f639004 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h @@ -155,7 +155,7 @@ public: void fselx(UGeckoInstruction inst); void fsubsx(UGeckoInstruction inst); void fsubx(UGeckoInstruction inst); - void fcmpx(UGeckoInstruction inst); + void fcmpX(UGeckoInstruction inst); void frspx(UGeckoInstruction inst); void fctiwzx(UGeckoInstruction inst); void fdivx(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp index df88501693..feb4341c37 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp @@ -340,7 +340,7 @@ void JitArm64::frspx(UGeckoInstruction inst) m_float_emit.FCVT(64, 32, EncodeRegToDouble(VD), EncodeRegToDouble(VD)); } -void JitArm64::fcmpx(UGeckoInstruction inst) +void JitArm64::fcmpX(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITFloatingPointOff); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp index ada18aca26..af5bc38481 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp @@ -327,8 +327,8 @@ static GekkoOPTemplate table59[] = static GekkoOPTemplate table63[] = { {264, &JitArm64::fabsx}, // fabsx - {32, &JitArm64::fcmpx}, // fcmpo - {0, &JitArm64::fcmpx}, // fcmpu + {32, &JitArm64::fcmpX}, // fcmpo + {0, &JitArm64::fcmpX}, // fcmpu {14, &JitArm64::FallBackToInterpreter}, // fctiwx {15, &JitArm64::fctiwzx}, // fctiwzx {72, &JitArm64::fmrx}, // fmrx diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h index 3d1aec4c8b..f7ed6ce49f 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h @@ -102,7 +102,7 @@ public: void fp_arith_s(UGeckoInstruction inst); - void fcmpx(UGeckoInstruction inst); + void fcmpX(UGeckoInstruction inst); void fmrx(UGeckoInstruction inst); void cmpXX(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp index 16bdf56a8f..bc89b6471f 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp @@ -86,7 +86,7 @@ void JitILBase::fmrx(UGeckoInstruction inst) ibuild.EmitStoreFReg(val, inst.FD); } -void JitILBase::fcmpx(UGeckoInstruction inst) +void JitILBase::fcmpX(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITFloatingPointOff);