From c3eb45f7bc3637408393cfb1b063d42ded4ca6b5 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 21 Jul 2014 20:40:21 -0700 Subject: [PATCH] Revert "Merge pull request #473 from Tilka/frsp" This reverts commit d369627d703a9380ccbbbba4be52a043e26b0e8d, reversing changes made to 67ff926f1ee0037c98065dac518099cf82ebb7a7. --- Source/Core/Core/PowerPC/Jit64/Jit.h | 1 - Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp | 2 +- .../Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp | 15 --------------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index 58b38de73f..8c5056c372 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -191,7 +191,6 @@ public: 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 index b82484ea47..c64cbdca66 100644 --- 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 index 4d2ec1d1f3..648da27d26 100644 --- 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