ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comment out various code that appears to be unused. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@209 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-10-17 13:49:11 +00:00 committed by Gregory Hainaut
parent 8e72f6f1e6
commit 14ca8e857e
5 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Misc.c
View File

@ -1125,6 +1125,7 @@ long InterlockedExchange(long volatile* Target, long Value)
__asm__ __volatile__(".intel_syntax\n" __asm__ __volatile__(".intel_syntax\n"
"lock xchg [%0], %%eax\n" "lock xchg [%0], %%eax\n"
".att_syntax\n" : : "r"(Target), "a"(Value) : "memory" ); ".att_syntax\n" : : "r"(Target), "a"(Value) : "memory" );
//This is supposed to return a long
} }
long InterlockedExchangeAdd(long volatile* Addend, long Value) long InterlockedExchangeAdd(long volatile* Addend, long Value)
@ -1132,6 +1133,7 @@ long InterlockedExchangeAdd(long volatile* Addend, long Value)
__asm__ __volatile__(".intel_syntax\n" __asm__ __volatile__(".intel_syntax\n"
"lock xadd [%0], %%eax\n" "lock xadd [%0], %%eax\n"
".att_syntax\n" : : "r"(Addend), "a"(Value) : "memory" ); ".att_syntax\n" : : "r"(Addend), "a"(Value) : "memory" );
//As is this
} }
u32 timeGetTime() u32 timeGetTime()

4
pcsx2/build.sh
View File

@ -20,9 +20,9 @@
# Uncomment if building by itself, rather then with all the plugins # Uncomment if building by itself, rather then with all the plugins
#Normal #Normal
#export PCSX2OPTIONS="--enable-sse2 --enable-sse3 --prefix `pwd`" #export PCSX2OPTIONS="--enable-sse3 --prefix `pwd`"
#Debug version #Debug version
#export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse2 --enable-sse3 --prefix `pwd`" #export PCSX2OPTIONS="--enable-debug --enable-devbuild --enable-sse3 --prefix `pwd`"
echo --------------- echo ---------------
echo Building Pcsx2 echo Building Pcsx2

8
pcsx2/x86/iR3000Atables.cpp
View File

@ -1443,7 +1443,8 @@ void rpsxBLTZ()
_psxFlushAllUnused(); _psxFlushAllUnused();
if( PSX_IS_CONST1(_Rs_) ) { if( PSX_IS_CONST1(_Rs_) ) {
if( (int)g_psxConstRegs[_Rs_] >= 0 ) // A variable of type u32 is always >= 0
//if( (int)g_psxConstRegs[_Rs_] >= 0 )
branchTo = psxpc+4; branchTo = psxpc+4;
psxRecompileNextInstruction(1); psxRecompileNextInstruction(1);
@ -1490,8 +1491,9 @@ void rpsxBGEZ()
_psxFlushAllUnused(); _psxFlushAllUnused();
if( PSX_IS_CONST1(_Rs_) ) { if( PSX_IS_CONST1(_Rs_) ) {
if( g_psxConstRegs[_Rs_] < 0 ) // A variable of type u32 is never less then 0!
branchTo = psxpc+4; /*if( g_psxConstRegs[_Rs_] < 0 )
branchTo = psxpc+4;*/
psxRecompileNextInstruction(1); psxRecompileNextInstruction(1);
psxSetBranchImm( branchTo ); psxSetBranchImm( branchTo );

26
pcsx2/x86/ix86-32/iR5900-32.c
View File

@ -113,7 +113,7 @@ int branch; // set for branch
//#ifdef PCSX2_DEVBUILD //#ifdef PCSX2_DEVBUILD
LARGE_INTEGER lbase = {0}, lfinal = {0}; LARGE_INTEGER lbase = {0}, lfinal = {0};
static u32 s_startcount = 0; //static u32 s_startcount = 0;
//#endif //#endif
char *txt0 = "EAX = %x : ECX = %x : EDX = %x\n"; char *txt0 = "EAX = %x : ECX = %x : EDX = %x\n";
@ -1943,19 +1943,19 @@ extern void _StopPerfCounter();
void StartPerfCounter() void StartPerfCounter()
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
if( s_startcount ) { // if( s_startcount ) {
CALLFunc((uptr)_StartPerfCounter); // CALLFunc((uptr)_StartPerfCounter);
} // }
#endif #endif
} }
void StopPerfCounter() void StopPerfCounter()
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
if( s_startcount ) { // if( s_startcount ) {
MOV32ItoM((uptr)&s_pCurBlock_ltime, (u32)&s_pCurBlockEx->ltime); // MOV32ItoM((uptr)&s_pCurBlock_ltime, (u32)&s_pCurBlockEx->ltime);
CALLFunc((uptr)_StopPerfCounter); // CALLFunc((uptr)_StopPerfCounter);
} // }
#endif #endif
} }
#endif #endif
@ -2258,10 +2258,10 @@ void iFlushCall(int flushtype)
static void iBranchTest(u32 newpc, u32 cpuBranch) static void iBranchTest(u32 newpc, u32 cpuBranch)
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
if( s_startcount ) { // if( s_startcount ) {
StopPerfCounter(); // StopPerfCounter();
ADD32ItoM( (u32)&s_pCurBlockEx->visited, 1 ); // ADD32ItoM( (u32)&s_pCurBlockEx->visited, 1 );
} // }
#endif #endif
#ifdef _DEBUG #ifdef _DEBUG
@ -3184,7 +3184,7 @@ StartRecomp:
// perf counters // // perf counters //
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
s_startcount = 0; // s_startcount = 0;
// if( pc+32 < s_nEndBlock ) { // if( pc+32 < s_nEndBlock ) {
// // only blocks with more than 8 insts // // only blocks with more than 8 insts
// //PUSH32I((u32)&lbase); // //PUSH32I((u32)&lbase);

26
pcsx2/x86/ix86-64/iR5900-64.c
View File

@ -113,7 +113,7 @@ int branch; // set for branch
//#ifdef PCSX2_DEVBUILD //#ifdef PCSX2_DEVBUILD
LARGE_INTEGER lbase = {0}, lfinal = {0}; LARGE_INTEGER lbase = {0}, lfinal = {0};
static u32 s_startcount = 0; //static u32 s_startcount = 0;
//#endif //#endif
void _cop2AnalyzeOp(EEINST* pinst, int dostalls); // reccop2.c void _cop2AnalyzeOp(EEINST* pinst, int dostalls); // reccop2.c
@ -1725,19 +1725,19 @@ void iFlushCall(int flushtype)
void StartPerfCounter() void StartPerfCounter()
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
if( s_startcount ) { // if( s_startcount ) {
CALLFunc((uptr)_StartPerfCounter); // CALLFunc((uptr)_StartPerfCounter);
} // }
#endif #endif
} }
void StopPerfCounter() void StopPerfCounter()
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
if( s_startcount ) { // if( s_startcount ) {
MOV32ItoM((uptr)&s_pCurBlock_ltime, (uptr)&s_pCurBlockEx->ltime); // MOV32ItoM((uptr)&s_pCurBlock_ltime, (uptr)&s_pCurBlockEx->ltime);
CALLFunc((uptr)_StopPerfCounter); // CALLFunc((uptr)_StopPerfCounter);
} // }
#endif #endif
} }
@ -1768,10 +1768,10 @@ void StopPerfCounter()
static void iBranchTest(u32 newpc, u32 cpuBranch) static void iBranchTest(u32 newpc, u32 cpuBranch)
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
if( s_startcount ) { // if( s_startcount ) {
StopPerfCounter(); // StopPerfCounter();
ADD32ItoM( (uptr)&s_pCurBlockEx->visited, 1 ); // ADD32ItoM( (uptr)&s_pCurBlockEx->visited, 1 );
} // }
#endif #endif
#ifdef _DEBUG #ifdef _DEBUG
@ -2617,7 +2617,7 @@ StartRecomp:
// perf counters // // perf counters //
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
s_startcount = 0; // s_startcount = 0;
// if( pc+32 < s_nEndBlock ) { // if( pc+32 < s_nEndBlock ) {
// // only blocks with more than 8 insts // // only blocks with more than 8 insts
// //PUSH32I((uptr)&lbase); // //PUSH32I((uptr)&lbase);