From f4e9178c06009f03bc00e9f0dd44f4c358b027f1 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 8 Apr 2009 17:15:51 +0000
Subject: [PATCH] backing up some changes

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@926 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/R3000A.cpp                |  2 +-
 pcsx2/R3000A.h                  |  2 +-
 pcsx2/R5900.cpp                 | 14 ++++++--------
 pcsx2/R5900.h                   |  8 ++++----
 pcsx2/x86/iR3000A.cpp           |  2 +-
 pcsx2/x86/ix86-32/iR5900-32.cpp |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pcsx2/R3000A.cpp b/pcsx2/R3000A.cpp
index 50931387a3..c821733549 100644
--- a/pcsx2/R3000A.cpp
+++ b/pcsx2/R3000A.cpp
@@ -224,7 +224,7 @@ static __forceinline void _psxTestInterrupts()
 	}
 }
 
-void psxBranchTest()
+__releaseinline void psxBranchTest()
 {
 	if( psxTestCycle( psxNextsCounter, psxNextCounter ) )
 	{
diff --git a/pcsx2/R3000A.h b/pcsx2/R3000A.h
index 7ab13663e8..9a93b851c1 100644
--- a/pcsx2/R3000A.h
+++ b/pcsx2/R3000A.h
@@ -200,7 +200,7 @@ extern R3000Acpu psxRec;
 void psxReset();
 void psxShutdown();
 void psxException(u32 code, u32 step);
-void psxBranchTest();
+extern void psxBranchTest();
 void psxExecuteBios();
 void psxMemReset();
 
diff --git a/pcsx2/R5900.cpp b/pcsx2/R5900.cpp
index b19d06dd0b..35e7dda1fe 100644
--- a/pcsx2/R5900.cpp
+++ b/pcsx2/R5900.cpp
@@ -106,7 +106,7 @@ void cpuShutdown()
 	disR5900FreeSyms();
 }
 
-__releaseinline void __fastcall cpuException(u32 code, u32 bd)
+__releaseinline void cpuException(u32 code, u32 bd)
 {
 	cpuRegs.branch = 0;		// Tells the interpreter that an exception occurred during a branch.
 	bool errLevel2, checkStatus;
@@ -244,7 +244,7 @@ void cpuTestMissingHwInts() {
 }
 
 // sets a branch test to occur some time from an arbitrary starting point.
-__forceinline int __fastcall cpuSetNextBranch( u32 startCycle, s32 delta )
+__forceinline void cpuSetNextBranch( u32 startCycle, s32 delta )
 {
 	// typecast the conditional to signed so that things don't blow up
 	// if startCycle is greater than our next branch cycle.
@@ -252,20 +252,18 @@ __forceinline int __fastcall cpuSetNextBranch( u32 startCycle, s32 delta )
 	if( (int)(g_nextBranchCycle - startCycle) > delta )
 	{
 		g_nextBranchCycle = startCycle + delta;
-		return 1;
 	}
-	return 0;
 }
 
 // sets a branch to occur some time from the current cycle
-__forceinline int __fastcall cpuSetNextBranchDelta( s32 delta )
+__forceinline void cpuSetNextBranchDelta( s32 delta )
 {
-	return cpuSetNextBranch( cpuRegs.cycle, delta );
+	cpuSetNextBranch( cpuRegs.cycle, delta );
 }
 
 // tests the cpu cycle agaisnt the given start and delta values.
 // Returns true if the delta time has passed.
-__forceinline int __fastcall cpuTestCycle( u32 startCycle, s32 delta )
+__forceinline int cpuTestCycle( u32 startCycle, s32 delta )
 {
 	// typecast the conditional to signed so that things don't explode
 	// if the startCycle is ahead of our current cpu cycle.
@@ -279,7 +277,7 @@ __forceinline void cpuSetBranch()
 	g_nextBranchCycle = cpuRegs.cycle;
 }
 
-void cpuClearInt( uint i )
+__forceinline void cpuClearInt( uint i )
 {
 	jASSUME( i < 32 );
 	cpuRegs.interrupt &= ~(1 << i);
diff --git a/pcsx2/R5900.h b/pcsx2/R5900.h
index b2dd4db46f..cb482ee6bf 100644
--- a/pcsx2/R5900.h
+++ b/pcsx2/R5900.h
@@ -257,14 +257,14 @@ extern void cpuInit();
 extern void cpuReset();		// can throw Exception::FileNotFound.
 extern void cpuShutdown();
 extern void cpuExecuteBios();
-extern void __fastcall cpuException(u32 code, u32 bd);
+extern void cpuException(u32 code, u32 bd);
 extern void cpuTlbMissR(u32 addr, u32 bd);
 extern void cpuTlbMissW(u32 addr, u32 bd);
 extern void cpuTestHwInts();
 
-extern int __fastcall cpuSetNextBranch( u32 startCycle, s32 delta );
-extern int __fastcall cpuSetNextBranchDelta( s32 delta );
-extern int __fastcall cpuTestCycle( u32 startCycle, s32 delta );
+extern void cpuSetNextBranch( u32 startCycle, s32 delta );
+extern void cpuSetNextBranchDelta( s32 delta );
+extern int  cpuTestCycle( u32 startCycle, s32 delta );
 extern void cpuSetBranch();
 
 extern bool _cpuBranchTest_Shared();		// for internal use by the Dynarecs and Ints inside R5900:
diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp
index a506bdc4a8..38e2021609 100644
--- a/pcsx2/x86/iR3000A.cpp
+++ b/pcsx2/x86/iR3000A.cpp
@@ -798,7 +798,7 @@ void psxSetBranchImm( u32 imm )
 //		  So for now these are new settings that work.
 //		  (rama)
 
-static u32 psxScaleBlockCycles()
+static __forceinline u32 psxScaleBlockCycles()
 {
 	return s_psxBlockCycles * (CHECK_IOP_CYCLERATE ? 2 : 1);
 }
diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp
index 60fa164cc6..2dd76b7778 100644
--- a/pcsx2/x86/ix86-32/iR5900-32.cpp
+++ b/pcsx2/x86/ix86-32/iR5900-32.cpp
@@ -683,7 +683,7 @@ static void __naked DispatcherReg()
 	}
 }
 
-__forceinline void recExecute()
+void recExecute()
 {
 	// Optimization note : Compared pushad against manually pushing the regs one-by-one.
 	// Manually pushing is faster, especially on Core2's and such. :)