diff --git a/pcsx2/Hw.h b/pcsx2/Hw.h index 6f2465a809..51ab5396ef 100644 --- a/pcsx2/Hw.h +++ b/pcsx2/Hw.h @@ -363,23 +363,6 @@ enum GSRegisterAddresses GS_SIGLBLID = 0x12001080 }; -// bleh, I'm graindead -- air -union tGS_SMODE2 -{ - struct - { - u32 INT:1; - u32 FFMD:1; - u32 DPMS:2; - u32 _PAD2:28; - u32 _PAD3:32; - }; - - u64 _u64; - - bool IsInterlaced() const { return INT; } -}; - extern void hwReset(); extern void hwShutdown(); diff --git a/pcsx2/VUops.h b/pcsx2/VUops.h index 7f220baac5..e3148f1eec 100644 --- a/pcsx2/VUops.h +++ b/pcsx2/VUops.h @@ -25,8 +25,6 @@ #define int12_to_float(x) (float)((float)x * 0.000244140625f) #define int15_to_float(x) (float)((float)x * 0.000030517578125) -#define MAC_Reset( VU ) VU->VI[REG_MAC_FLAG].UL = VU->VI[REG_MAC_FLAG].UL & (~0xFFFF) - struct _VURegsNum { u8 pipe; // if 0xff, COP2 u8 VFwrite; diff --git a/pcsx2/x86/iR5900.h b/pcsx2/x86/iR5900.h index e155ee4781..1d56e2c836 100644 --- a/pcsx2/x86/iR5900.h +++ b/pcsx2/x86/iR5900.h @@ -60,10 +60,6 @@ extern bool s_nBlockInterlocked; // Current block has VU0 interlocking recBranchCall(Interp::f); \ } - -// Used to clear recompiled code blocks during memory/dma write operations. -u32 recClearMem(u32 pc); -u32 REC_CLEARM(u32 mem); extern bool g_recompilingDelaySlot; // used when processing branches @@ -134,8 +130,6 @@ void _flushEEreg(int reg, bool clear = false); // allocates memory on the instruction size and returns the pointer u32* recGetImm64(u32 hi, u32 lo); -void _vuRegsCOP22(VURegs* VU, _VURegsNum* VUregsn); - ////////////////////////////////////// // Templates for code recompilation // ////////////////////////////////////// diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 7618f880e3..1fca9a85d4 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -2221,7 +2221,6 @@ StartRecomp: } VU0.code = cpuRegs.code; - _vuRegsCOP22(&VU0, &g_pCurInstInfo->vuregs); continue; } } diff --git a/pcsx2/x86/microVU_Macro.inl b/pcsx2/x86/microVU_Macro.inl index 9619acbdad..2d077590fb 100644 --- a/pcsx2/x86/microVU_Macro.inl +++ b/pcsx2/x86/microVU_Macro.inl @@ -610,9 +610,6 @@ void rec_C2UNK() Console.Error("Cop2 bad opcode: %x", cpuRegs.code); } -// This is called by EE Recs to setup sVU info, this isn't needed for mVU Macro (cottonvibes) -void _vuRegsCOP22(VURegs* VU, _VURegsNum* VUregsn) {} - // Recompilation void (*recCOP2t[32])() = { rec_C2UNK, recQMFC2, recCFC2, rec_C2UNK, rec_C2UNK, recQMTC2, recCTC2, rec_C2UNK,