From 2f20e6da655408431407df7e0a27ba8ee9facde2 Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Sun, 7 Jun 2015 20:21:53 +0100 Subject: [PATCH] microVU: Fixed up Cond Branch tBit + eBit. True Crime and DT Racer both work properly now. - I had the wrong comparison in there, doh! - tBit was jumping to the wrong place, not sure what games use it though --- pcsx2/x86/microVU_Branch.inl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pcsx2/x86/microVU_Branch.inl b/pcsx2/x86/microVU_Branch.inl index 86f7ece921..361382f548 100644 --- a/pcsx2/x86/microVU_Branch.inl +++ b/pcsx2/x86/microVU_Branch.inl @@ -308,16 +308,16 @@ void condBranch(mV, microFlagCycles& mFC, int JMPcc) { xOR(ptr32[&mVU.regs().flags], VUFLAG_INTCINTERRUPT); mVUDTendProgram(mVU, &mFC, 2); xCMP(ptr16[&mVU.branch], 0); - xForwardJump8 tJMP((JccComparisonType)JMPcc); + xForwardJump32 tJMP(xInvertCond((JccComparisonType)JMPcc)); incPC(4); // Set PC to First instruction of Non-Taken Side xMOV(ptr32[&mVU.regs().VI[REG_TPC].UL], xPC); xJMP(mVU.exitFunct); - eJMP.SetTarget(); + tJMP.SetTarget(); incPC(-4); // Go Back to Branch Opcode to get branchAddr iPC = branchAddr/4; xMOV(ptr32[&mVU.regs().VI[REG_TPC].UL], xPC); xJMP(mVU.exitFunct); - tJMP.SetTarget(); + eJMP.SetTarget(); iPC = tempPC; } if (mVUup.dBit && doDBitHandling) @@ -329,7 +329,7 @@ void condBranch(mV, microFlagCycles& mFC, int JMPcc) { xOR(ptr32[&mVU.regs().flags], VUFLAG_INTCINTERRUPT); mVUDTendProgram(mVU, &mFC, 2); xCMP(ptr16[&mVU.branch], 0); - xForwardJump8 dJMP((JccComparisonType)JMPcc); + xForwardJump32 dJMP(xInvertCond((JccComparisonType)JMPcc)); incPC(4); // Set PC to First instruction of Non-Taken Side xMOV(ptr32[&mVU.regs().VI[REG_TPC].UL], xPC); xJMP(mVU.exitFunct); @@ -349,11 +349,11 @@ void condBranch(mV, microFlagCycles& mFC, int JMPcc) { incPC(3); mVUendProgram(mVU, &mFC, 2); - xForwardJump32 eJMP((JccComparisonType)JMPcc); + xForwardJump32 eJMP(xInvertCond((JccComparisonType)JMPcc)); incPC(1); // Set PC to First instruction of Non-Taken Side xMOV(ptr32[&mVU.regs().VI[REG_TPC].UL], xPC); xJMP(mVU.exitFunct); - eJMP.SetTarget(); + eJMP.SetTarget(); incPC(-4); // Go Back to Branch Opcode to get branchAddr iPC = branchAddr/4; xMOV(ptr32[&mVU.regs().VI[REG_TPC].UL], xPC);