diff --git a/pcsx2/x86/iCore.h b/pcsx2/x86/iCore.h index 07161d1110..01718a4b45 100644 --- a/pcsx2/x86/iCore.h +++ b/pcsx2/x86/iCore.h @@ -239,16 +239,17 @@ template static __forceinline bool IS_REG(u32 reg) #define EEINST_LIVE1 2 // if cur var's next 32 bits are needed #define EEINST_LIVE2 4 // if cur var's next 64 bits are needed #define EEINST_LASTUSE 8 // if var isn't written/read anymore -#define EEINST_MMX 0x10 // var will be used in mmx ops +//#define EEINST_MMX 0x10 // var will be used in mmx ops (disabled, see below) #define EEINST_XMM 0x20 // var will be used in xmm ops (takes precedence #define EEINST_USED 0x40 +// MMX is disabled by setting this to 0, which seems a general speedup and fixes several +// random tlb miss problems. +#define EEINST_MMX 0 + + #define EEINSTINFO_COP1 1 #define EEINSTINFO_COP2 2 -#ifdef PCSX2_VM_COISSUE -#define EEINSTINFO_NOREC 4 // if set, inst is recompiled alone -#define EEINSTINFO_COREC 8 // if set, inst is recompiled with another similar inst -#endif #define EEINSTINFO_MMX EEINST_MMX #define EEINSTINFO_XMM EEINST_XMM diff --git a/pcsx2/x86/iR5900LoadStore.h b/pcsx2/x86/iR5900LoadStore.h index 4abed9a5d0..50691aa8dd 100644 --- a/pcsx2/x86/iR5900LoadStore.h +++ b/pcsx2/x86/iR5900LoadStore.h @@ -50,43 +50,6 @@ namespace OpcodeImpl { void recLQC2( void ); void recSQC2( void ); -// coissues -#ifdef PCSX2_VM_COISSUE - void recLB_co( void ); - void recLBU_co( void ); - void recLH_co( void ); - void recLHU_co( void ); - void recLW_co( void ); - void recLWU_co( void ); - void recLWL_co( void ); - void recLWR_co( void ); - void recLD_co( void ); - void recLDR_co( void ); - void recLDL_co( void ); - void recLQ_co( void ); - void recSB_co( void ); - void recSH_co( void ); - void recSW_co( void ); - void recSWL_co( void ); - void recSWR_co( void ); - void recSD_co( void ); - void recSDL_co( void ); - void recSDR_co( void ); - void recSQ_co( void ); - void recLWC1_co( void ); - void recSWC1_co( void ); - void recLQC2_co( void ); - void recSQC2_co( void ); - - // coissue-X - void recLD_coX(int num); - void recLQ_coX(int num); - void recLWC1_coX(int num); - void recSD_coX(int num, int align); - void recSQ_coX(int num); - void recSWC1_coX(int num); -#endif - } } } #endif diff --git a/pcsx2/x86/ir5900tables.cpp b/pcsx2/x86/ir5900tables.cpp index 79a53df464..838b4f5400 100644 --- a/pcsx2/x86/ir5900tables.cpp +++ b/pcsx2/x86/ir5900tables.cpp @@ -65,20 +65,6 @@ void recCall( void (*func)(), int delreg ) using namespace R5900::Dynarec::OpcodeImpl; -#ifdef PCSX2_VM_COISSUE -// coissued insts -void (*recBSC_co[64] )() = { - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, - recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, recNULL, - recNULL, recNULL, recLDL_co, recLDR_co, recNULL, recNULL, recLQ_co, recSQ_co, - recLB_co, recLH_co, recLWL_co, recLW_co, recLBU_co, recLHU_co, recLWR_co, recLWU_co, - recSB_co, recSH_co, recSWL_co, recSW_co, recSDL_co, recSDR_co, recSWR_co, recNULL, - recNULL, recLWC1_co, recNULL, recNULL, recNULL, recNULL, recLQC2_co, recLD_co, - recNULL, recSWC1_co, recNULL, recNULL, recNULL, recNULL, recSQC2_co, recSD_co -}; -#endif - //////////////////////////////////////////////// // Back-Prob Function Tables - Gathering Info //