From 5b023b83ec339d68dcbd84e09abe8521f0f0d1a1 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Wed, 13 May 2015 20:37:16 +0200 Subject: [PATCH] Jit64: rename twx to twX We use the lower-case x to signal an optional Rc bit. --- Source/Core/Core/PowerPC/Jit64/Jit.h | 2 +- Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp | 4 ++-- Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index 340a2dc0f6..3fb54dce73 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -240,7 +240,7 @@ public: void subfic(UGeckoInstruction inst); void subfx(UGeckoInstruction inst); - void twx(UGeckoInstruction inst); + void twX(UGeckoInstruction inst); void lXXx(UGeckoInstruction inst); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp index d5db7fa55c..52eb0af503 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp @@ -38,7 +38,7 @@ static GekkoOPTemplate primarytable[] = {16, &Jit64::bcx}, //"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK}}, {18, &Jit64::bx}, //"bx", OPTYPE_SYSTEM, FL_ENDBLOCK}}, - {3, &Jit64::twx}, //"twi", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {3, &Jit64::twX}, //"twi", OPTYPE_SYSTEM, FL_ENDBLOCK}}, {17, &Jit64::sc}, //"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, {7, &Jit64::mulli}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, @@ -298,7 +298,7 @@ static GekkoOPTemplate table31[] = {595, &Jit64::FallBackToInterpreter}, //"mfsr", OPTYPE_SYSTEM, FL_OUT_D, 2}}, {659, &Jit64::FallBackToInterpreter}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}}, - {4, &Jit64::twx}, //"tw", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, + {4, &Jit64::twX}, //"tw", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, {598, &Jit64::DoNothing}, //"sync", OPTYPE_SYSTEM, 0, 2}}, {982, &Jit64::icbi}, //"icbi", OPTYPE_SYSTEM, FL_ENDBLOCK, 3}}, diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp index 097e0be3b8..b57b6f00cd 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp @@ -1849,7 +1849,7 @@ void Jit64::cntlzwx(UGeckoInstruction inst) gpr.UnlockAll(); } -void Jit64::twx(UGeckoInstruction inst) +void Jit64::twX(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITIntegerOff);