[ARM] Implement mfmsr

dolphin-emu · Jul 17, 2013 · fc6e06c · fc6e06c
1 parent bab3032
commit fc6e06c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -162,6 +162,7 @@ class JitArm : public JitBase, public ArmGen::ARMXCodeBlock
 
 	// System Registers
 	void mtmsr(UGeckoInstruction _inst);
+	void mfmsr(UGeckoInstruction _inst);
 	void mtspr(UGeckoInstruction _inst);
 	void mfspr(UGeckoInstruction _inst);
 

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
@@ -102,3 +102,10 @@ void JitArm::mtmsr(UGeckoInstruction inst)
 	STR(gpr.R(inst.RS), R9, PPCSTATE_OFF(msr));
 	WriteExit(js.compilerPC + 4, 0);
 }
+void JitArm::mfmsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(SystemRegisters)
+
+	LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(msr));
+}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -280,7 +280,7 @@ static GekkoOPTemplate table31[] =
 	{983, &JitArm::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
 
 	{19,  &JitArm::Default}, //"mfcr",   OPTYPE_SYSTEM, FL_OUT_D}},
-	{83,  &JitArm::Default}, //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
+	{83,  &JitArm::mfmsr}, //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
 	{144, &JitArm::Default}, //"mtcrf",  OPTYPE_SYSTEM, 0}},
 	{146, &JitArm::mtmsr}, //"mtmsr",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
 	{210, &JitArm::Default}, //"mtsr",   OPTYPE_SYSTEM, 0}},