diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index 0bc89cbadc..d96fea6494 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -986,10 +986,18 @@ void psxSetBranchImm( u32 imm ) // Important! The following macro makes sure the rounding error of both the psxRegs.cycle // modifier and EEsCycle modifier are consistent (in case you wonder why it's got a u32 typecast) +//fixme : this is all a huge hack, we base the counter advancements on the average an opcode should take (wtf?) +// If that wasn't bad enough we have default values like 9/8 which will get cast to int later +// (yeah, that means all sync code couldn't have worked to beginn with) +// So for now these are new settings that work. +// (rama) + static u32 psxScaleBlockCycles() { + /*return s_psxBlockCycles * + (CHECK_IOPSYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3.1875 : 2.125) : (17/16));*/ return s_psxBlockCycles * - (CHECK_IOPSYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3.1875 : 2.125) : (17/16)); + (CHECK_IOPSYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3 : 2) : 1 ); } static void iPsxBranchTest(u32 newpc, u32 cpuBranch) diff --git a/pcsx2/x86/ix86-32/iR5900-32.c b/pcsx2/x86/ix86-32/iR5900-32.c index 5f87e5adc8..ebbb24a00c 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.c +++ b/pcsx2/x86/ix86-32/iR5900-32.c @@ -2252,7 +2252,14 @@ void iFlushCall(int flushtype) // assert( !g_globalXMMSaved ); //} -#define EECYCLE_MULT (CHECK_EESYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3.375 : 2.25) : (9/8)) +//fixme : this is all a huge hack, we base the counter advancements on the average an opcode should take (wtf?) +// If that wasn't bad enough we have default values like 9/8 which will get cast to int later +// (yeah, that means all sync code couldn't have worked to beginn with) +// So for now these are new settings that work. I would've set 1 for default but that seemed too low +// (rama) + +//#define EECYCLE_MULT (CHECK_EESYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3.375 : 2.25) : (9/8)) +#define EECYCLE_MULT (CHECK_EESYNC_HACK ? (CHECK_EE_IOP_EXTRA ? 3 : 2) : (1.2)) static void iBranchTest(u32 newpc, u32 cpuBranch) {