summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2009-04-30 01:58:03 +0000
committerShawn Hoffman <godisgovernment@gmail.com>2009-04-30 01:58:03 +0000
commit28e3abbe6fe421c3aa4fac18332bafeef4e0e949 (patch)
treed2ade6119cac77f983b185a7c7473adce8611dd3
parent8bd9395dc90561220a0e7ff38470114a3f4c0d32 (diff)
fix jit'd negx, thanks to q.w.e.r.t.y.1.2.3.4.5.6.7.8.9! (issue 911)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3105 8ced0084-cf51-0410-be5f-012b33b47a6e
-rw-r--r--Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp3
-rw-r--r--Source/Core/Core/Src/PowerPC/PPCTables.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
index 0900107e54..472c8603c9 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
@@ -768,7 +768,6 @@
}
}
- // FIXME: As it currently is, this breaks controls in SA:DX, maybe more
void Jit64::negx(UGeckoInstruction inst)
{
if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITIntegerOff)
@@ -785,7 +784,7 @@
gpr.UnlockAll();
if (inst.Rc)
{
- MOV(32, R(EAX), gpr.R(a));
+ MOV(32, R(EAX), gpr.R(d));
CALL((u8*)asm_routines.computeRc);
}
}
diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp
index 56b4aa9bb5..e8d510fc67 100644
--- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCTables.cpp
@@ -434,7 +434,7 @@ static GekkoOPTemplate table31_2[] =
{75, Interpreter::mulhwx, &Jit64::Default, {"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
{11, Interpreter::mulhwux, &Jit64::mulhwux, {"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
{235, Interpreter::mullwx, &Jit64::mullwx, {"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
- {104, Interpreter::negx, &Jit64::Default, {"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
+ {104, Interpreter::negx, &Jit64::negx, {"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
{40, Interpreter::subfx, &Jit64::subfx, {"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
{8, Interpreter::subfcx, &Jit64::subfcx, {"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
{136, Interpreter::subfex, &Jit64::subfex, {"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},