From 26341344810926d4f9b9e7e050a8ee836ce57f99 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 1 May 2022 20:02:55 +1000 Subject: [PATCH] microVU: Remove unused VSync() callback --- pcsx2/Counters.cpp | 4 ---- pcsx2/VUmicro.h | 15 --------------- pcsx2/x86/microVU.cpp | 8 -------- 3 files changed, 27 deletions(-) diff --git a/pcsx2/Counters.cpp b/pcsx2/Counters.cpp index ac9c4bee30..6644118afc 100644 --- a/pcsx2/Counters.cpp +++ b/pcsx2/Counters.cpp @@ -570,10 +570,6 @@ static __fi void VSyncStart(u32 sCycle) if(EmuConfig.Trace.Enabled && EmuConfig.Trace.EE.m_EnableAll) SysTrace.EE.Counters.Write( " ================ EE COUNTER VSYNC START (frame: %d) ================", g_FrameCount ); - // EE Profiling and Debug code. - CpuVU0->Vsync(); - CpuVU1->Vsync(); - hwIntcIrq(INTC_VBLANK_S); psxVBlankStart(); diff --git a/pcsx2/VUmicro.h b/pcsx2/VUmicro.h index b7e75c7bb1..3f178cbf2c 100644 --- a/pcsx2/VUmicro.h +++ b/pcsx2/VUmicro.h @@ -125,19 +125,6 @@ public: } virtual ~BaseVUmicroCPU() = default; - // Called by the PS2 VM's event manager for every internal vertical sync (occurs at either - // 50hz (pal) or 59.94hz (NTSC). - // - // Exceptions: - // This method is not allowed to throw exceptions, since exceptions may not propagate - // safely from the context of recompiled code stackframes. - // - // Thread Affinity: - // Called from the EEcore thread. No locking is performed, so any necessary locks must - // be implemented by the CPU provider manually. - // - virtual void Vsync() noexcept { } - virtual void Step() { // Ideally this would fall back on interpretation for executing single instructions // for all CPU types, but due to VU complexities and large discrepancies between @@ -223,7 +210,6 @@ public: void SetStartPC(u32 startPC); void Execute(u32 cycles); void Clear(u32 addr, u32 size); - void Vsync() noexcept; uint GetCacheReserve() const; void SetCacheReserve( uint reserveInMegs ) const; @@ -244,7 +230,6 @@ public: void SetStartPC(u32 startPC); void Execute(u32 cycles); void Clear(u32 addr, u32 size); - void Vsync() noexcept; void ResumeXGkick(); uint GetCacheReserve() const; diff --git a/pcsx2/x86/microVU.cpp b/pcsx2/x86/microVU.cpp index 60d96fcfae..5c67041c1f 100644 --- a/pcsx2/x86/microVU.cpp +++ b/pcsx2/x86/microVU.cpp @@ -184,12 +184,6 @@ __fi void mVUclear(mV, u32 addr, u32 size) // Micro VU - Private Functions //------------------------------------------------------------------ -// Finds and Ages/Kills Programs if they haven't been used in a while. -__ri void mVUvsyncUpdate(mV) -{ - //mVU.prog.curFrame++; -} - // Deletes a program __ri void mVUdeleteProg(microVU& mVU, microProgram*& prog) { @@ -366,8 +360,6 @@ _mVUt __fi void* mVUsearchProg(u32 startPC, uptr pState) //------------------------------------------------------------------ recMicroVU0::recMicroVU0() { m_Idx = 0; IsInterpreter = false; } recMicroVU1::recMicroVU1() { m_Idx = 1; IsInterpreter = false; } -void recMicroVU0::Vsync() noexcept { mVUvsyncUpdate(microVU0); } -void recMicroVU1::Vsync() noexcept { mVUvsyncUpdate(microVU1); } void recMicroVU0::Reserve() {