From be1662074a90a33023127ea0d7e8874633236d27 Mon Sep 17 00:00:00 2001 From: "sudonim1@gmail.com" Date: Wed, 12 Oct 2011 23:49:50 +0000 Subject: [PATCH] Partial revert of r4935. REC_FUNC_DEL is functionally distinct from REC_FUNC. Fixed REC_FUNC_DEL definition. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4936 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/x86/iR5900.h | 4 ++-- pcsx2/x86/ix86-32/iR5900Arit.cpp | 28 ++++++++++++++-------------- pcsx2/x86/ix86-32/iR5900AritImm.cpp | 18 +++++++++--------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pcsx2/x86/iR5900.h b/pcsx2/x86/iR5900.h index 88fbfbb502..2a8285d95b 100644 --- a/pcsx2/x86/iR5900.h +++ b/pcsx2/x86/iR5900.h @@ -43,7 +43,7 @@ extern u32 s_nBlockCycles; // cycles of current block recompiling #define REC_FUNC_DEL( f, delreg ) \ void rec##f( void ) \ { \ - if( (delreg) > 0 ) _deleteEEreg(delreg, 0); \ + if( (delreg) > 0 ) _deleteEEreg(delreg, 1); \ recCall(Interp::f); \ } @@ -56,7 +56,7 @@ extern u32 s_nBlockCycles; // cycles of current block recompiling #define REC_SYS_DEL( f, delreg ) \ void rec##f( void ) \ { \ - if( (delreg) > 0 ) _deleteEEreg(delreg, 0); \ + if( (delreg) > 0 ) _deleteEEreg(delreg, 1); \ recBranchCall(Interp::f); \ } diff --git a/pcsx2/x86/ix86-32/iR5900Arit.cpp b/pcsx2/x86/ix86-32/iR5900Arit.cpp index 52a42517d7..258902389e 100644 --- a/pcsx2/x86/ix86-32/iR5900Arit.cpp +++ b/pcsx2/x86/ix86-32/iR5900Arit.cpp @@ -38,20 +38,20 @@ namespace OpcodeImpl namespace Interp = R5900::Interpreter::OpcodeImpl; -REC_FUNC(ADD); -REC_FUNC(ADDU); -REC_FUNC(DADD); -REC_FUNC(DADDU); -REC_FUNC(SUB); -REC_FUNC(SUBU); -REC_FUNC(DSUB); -REC_FUNC(DSUBU); -REC_FUNC(AND); -REC_FUNC(OR); -REC_FUNC(XOR); -REC_FUNC(NOR); -REC_FUNC(SLT); -REC_FUNC(SLTU); +REC_FUNC_DEL(ADD, _Rd_); +REC_FUNC_DEL(ADDU, _Rd_); +REC_FUNC_DEL(DADD, _Rd_); +REC_FUNC_DEL(DADDU, _Rd_); +REC_FUNC_DEL(SUB, _Rd_); +REC_FUNC_DEL(SUBU, _Rd_); +REC_FUNC_DEL(DSUB, _Rd_); +REC_FUNC_DEL(DSUBU, _Rd_); +REC_FUNC_DEL(AND, _Rd_); +REC_FUNC_DEL(OR, _Rd_); +REC_FUNC_DEL(XOR, _Rd_); +REC_FUNC_DEL(NOR, _Rd_); +REC_FUNC_DEL(SLT, _Rd_); +REC_FUNC_DEL(SLTU, _Rd_); #else diff --git a/pcsx2/x86/ix86-32/iR5900AritImm.cpp b/pcsx2/x86/ix86-32/iR5900AritImm.cpp index 5fc6f54ed6..1fa9332896 100644 --- a/pcsx2/x86/ix86-32/iR5900AritImm.cpp +++ b/pcsx2/x86/ix86-32/iR5900AritImm.cpp @@ -34,16 +34,16 @@ namespace OpcodeImpl namespace Interp = R5900::Interpreter::OpcodeImpl; -REC_FUNC(ADDI); -REC_FUNC(ADDIU); -REC_FUNC(DADDI); -REC_FUNC(DADDIU); -REC_FUNC(ANDI); -REC_FUNC(ORI); -REC_FUNC(XORI); +REC_FUNC_DEL(ADDI, _Rt_); +REC_FUNC_DEL(ADDIU, _Rt_); +REC_FUNC_DEL(DADDI, _Rt_); +REC_FUNC_DEL(DADDIU, _Rt_); +REC_FUNC_DEL(ANDI, _Rt_); +REC_FUNC_DEL(ORI, _Rt_); +REC_FUNC_DEL(XORI, _Rt_); -REC_FUNC(SLTI); -REC_FUNC(SLTIU); +REC_FUNC_DEL(SLTI, _Rt_); +REC_FUNC_DEL(SLTIU, _Rt_); #else