Revert "Merge pull request #473 from Tilka/frsp"

This reverts commit d369627, reversing changes made to 67ff926.
dolphin-emu · Jul 22, 2014 · c3eb45f · c3eb45f
1 parent e30f457
commit c3eb45f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h
@@ -191,7 +191,6 @@ class Jit64 : public Jitx86Base
 
 	void fmaddXX(UGeckoInstruction inst);
 	void fsign(UGeckoInstruction inst);
-	void frsp(UGeckoInstruction inst);
 	void stX(UGeckoInstruction inst); //stw sth stb
 	void rlwinmx(UGeckoInstruction inst);
 	void rlwimix(UGeckoInstruction inst);

diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
@@ -342,7 +342,7 @@ static GekkoOPTemplate table63[] =
 	{72,  &Jit64::fmrx},                  //"fmrx",    OPTYPE_FPU, FL_RC_BIT_F}},
 	{136, &Jit64::fsign},                 //"fnabsx",  OPTYPE_FPU, FL_RC_BIT_F}},
 	{40,  &Jit64::fsign},                 //"fnegx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{12,  &Jit64::frsp},                  //"frspx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{12,  &Jit64::FallBackToInterpreter}, //"frspx",   OPTYPE_FPU, FL_RC_BIT_F}},
 
 	{64,  &Jit64::FallBackToInterpreter}, //"mcrfs",   OPTYPE_SYSTEMFP, 0}},
 	{583, &Jit64::FallBackToInterpreter}, //"mffsx",   OPTYPE_SYSTEMFP, 0}},

diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -175,21 +175,6 @@ void Jit64::fsign(UGeckoInstruction inst)
 	fpr.UnlockAll();
 }
 
-void Jit64::frsp(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff);
-	FALLBACK_IF(inst.Rc);
-
-	int d = inst.FD, b = inst.FB;
-	fpr.Lock(d, b);
-	fpr.BindToRegister(d, d == b);
-	CVTSD2SS(fpr.RX(d), fpr.R(b));
-	CVTSS2SD(fpr.RX(d), fpr.R(d));
-	UNPCKLPD(fpr.RX(d), fpr.R(d));
-	fpr.UnlockAll();
-}
-
 void Jit64::fmrx(UGeckoInstruction inst)
 {
 	INSTRUCTION_START