From bb14f0ab70ddac3aa08eb02951865379f4130d21 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Wed, 20 Jan 2010 17:17:21 +0000 Subject: [PATCH] Fix calling of Interpreter routines in iR5900Branch.cpp when EE_CONST_PROP is off. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2458 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/x86/ix86-32/iR5900Branch.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pcsx2/x86/ix86-32/iR5900Branch.cpp b/pcsx2/x86/ix86-32/iR5900Branch.cpp index 2f5efe5534..c906271f20 100644 --- a/pcsx2/x86/ix86-32/iR5900Branch.cpp +++ b/pcsx2/x86/ix86-32/iR5900Branch.cpp @@ -733,7 +733,7 @@ void recBLTZAL( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BLTZAL ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BLTZAL ); branch = 2; } @@ -743,7 +743,7 @@ void recBGEZAL( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BGEZAL ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BGEZAL ); branch = 2; } @@ -753,7 +753,7 @@ void recBLTZALL( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BLTZALL ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BLTZALL ); branch = 2; } @@ -763,7 +763,7 @@ void recBGEZALL( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BGEZALL ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BGEZALL ); branch = 2; } @@ -993,7 +993,7 @@ void recBLTZ( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BLTZ ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BLTZ ); branch = 2; } @@ -1002,7 +1002,7 @@ void recBGEZ( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BGEZ ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BGEZ ); branch = 2; } @@ -1011,7 +1011,7 @@ void recBLTZL( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BLTZL ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BLTZL ); branch = 2; } @@ -1020,7 +1020,7 @@ void recBGEZL( void ) MOV32ItoM( (int)&cpuRegs.code, cpuRegs.code ); MOV32ItoM( (int)&cpuRegs.pc, pc ); iFlushCall(FLUSH_EVERYTHING); - CALLFunc( (int)BGEZL ); + CALLFunc( (uptr)R5900::Interpreter::OpcodeImpl::BGEZL ); branch = 2; }