From 611444b9d5846703050e7c2f51d6e046d5b54f8c Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Mon, 7 Dec 2009 15:15:59 +0000 Subject: [PATCH] Oops, forgot a __fastcall. >_< git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2323 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/VUmicro.h | 2 +- pcsx2/x86/iCOP2.cpp | 2 +- pcsx2/x86/microVU_Macro.inl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcsx2/VUmicro.h b/pcsx2/VUmicro.h index f8e71939e9..52ff77114f 100644 --- a/pcsx2/VUmicro.h +++ b/pcsx2/VUmicro.h @@ -67,7 +67,7 @@ public: // C++ Calling Conventions are unstable, and some compilers don't even allow us to take the // address of C++ methods. We need to use a wrapper function to invoke the ExecuteBlock from // recompiled code. - static void ExecuteBlockFromRecs( BaseCpuProvider* cpu ) + static void __fastcall ExecuteBlockFromRecs( BaseCpuProvider* cpu ) { cpu->ExecuteBlock(); } diff --git a/pcsx2/x86/iCOP2.cpp b/pcsx2/x86/iCOP2.cpp index a33d8c608a..ed43376ea4 100644 --- a/pcsx2/x86/iCOP2.cpp +++ b/pcsx2/x86/iCOP2.cpp @@ -157,7 +157,7 @@ static void recCTC2(s32 info) MOV32ItoM((uptr)&VU0.VI[_Fs_].UL,g_cpuConstRegs[_Rt_].UL[0]); iFlushCall(FLUSH_NOCONST); - xMOV(ecx, (uptr)&CpuVU0 ); + xMOV(ecx, (uptr)CpuVU0 ); xCALL(BaseCpuProvider::ExecuteBlockFromRecs); break; } diff --git a/pcsx2/x86/microVU_Macro.inl b/pcsx2/x86/microVU_Macro.inl index e1527dee88..1c83b51ff0 100644 --- a/pcsx2/x86/microVU_Macro.inl +++ b/pcsx2/x86/microVU_Macro.inl @@ -337,7 +337,7 @@ static void recCTC2() { // Executing vu0 block here fixes the intro of Rachet and Clank // sVU's COP2 has a comment that "Donald Duck" needs this too... if (_Rd_) _eeMoveGPRtoM((uptr)µVU0.regs->VI[_Rd_].UL, _Rt_); - xMOV(ecx, (uptr)&CpuVU0); + xMOV(ecx, (uptr)CpuVU0); xCALL(BaseCpuProvider::ExecuteBlockFromRecs); break; }