summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@Gmail.com>2013-09-16 11:52:25 +0000
committerRyan Houdek <Sonicadvance1@Gmail.com>2013-09-16 11:53:22 +0000
commitb7f47bc2e1acf100e1d4a6e5ef53a8ee38b061b4 (patch)
tree4b342bb7d50d09e2ea013f646d63e4f1688cc27e /Source/Core
parent43f2313ef942183d7d29abd3d75cec4d495425ca (diff)
[ARM] rlwnmx implementation.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/PowerPC/JitArm32/Jit.h1
-rw-r--r--Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp29
-rw-r--r--Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp2
3 files changed, 31 insertions, 1 deletions
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
index e6160004ab..3510c60321 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -167,6 +167,7 @@ public:
void mulhwux(UGeckoInstruction _inst);
void rlwimix(UGeckoInstruction _inst);
void rlwinmx(UGeckoInstruction _inst);
+ void rlwnmx(UGeckoInstruction _inst);
void srawix(UGeckoInstruction _inst);
void extshx(UGeckoInstruction inst);
void extsbx(UGeckoInstruction inst);
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
index a5a6b1b274..38a6f0c537 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
@@ -775,6 +775,7 @@ void JitArm::rlwimix(UGeckoInstruction inst)
}
gpr.Unlock(rA, rB);
}
+
void JitArm::rlwinmx(UGeckoInstruction inst)
{
INSTRUCTION_START
@@ -798,6 +799,34 @@ void JitArm::rlwinmx(UGeckoInstruction inst)
//m_GPR[inst.RA] = _rotl(m_GPR[inst.RS],inst.SH) & mask;
}
+void JitArm::rlwnmx(UGeckoInstruction inst)
+{
+ INSTRUCTION_START
+ JITDISABLE(bJITIntegerOff)
+
+ u32 mask = Helper_Mask(inst.MB,inst.ME);
+ ARMReg RA = gpr.R(inst.RA);
+ ARMReg RS = gpr.R(inst.RS);
+ ARMReg RB = gpr.R(inst.RB);
+ ARMReg rA = gpr.GetReg();
+ ARMReg rB = gpr.GetReg();
+ MOVI2R(rA, mask);
+
+ // PPC rotates left, ARM rotates right. Swap it
+ MOV(rB, 32);
+ SUB(rB, rB, RB);
+
+ Operand2 Shift(RS, ST_ROR, rB); // Register shifted register
+ if (inst.Rc)
+ {
+ ANDS(RA, rA, Shift);
+ GenerateRC();
+ }
+ else
+ AND (RA, rA, Shift);
+ gpr.Unlock(rA, rB);
+}
+
void JitArm::srawix(UGeckoInstruction inst)
{
INSTRUCTION_START
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
index a8e34ebdf6..8427956340 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -69,7 +69,7 @@ static GekkoOPTemplate primarytable[] =
{20, &JitArm::rlwimix}, //"rlwimix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}},
{21, &JitArm::rlwinmx}, //"rlwinmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
- {23, &JitArm::Default}, //"rlwnmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}},
+ {23, &JitArm::rlwnmx}, //"rlwnmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}},
{24, &JitArm::arith}, //"ori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
{25, &JitArm::arith}, //"oris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},