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

Fix for some general slowness in Release builds, accidentally introduced in r3724 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3872 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-10-04 18:18:10 +00:00
parent 115b431af5
commit 1dd9f8d0d4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/DebugTools/Debug.h
View File

@ -350,12 +350,12 @@ extern void __Log( const char* fmt, ... );
// passed into the function) // passed into the function)
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
# define SysTraceActive(trace) SysTrace.trace.IsActive() # define SysTraceActive(trace) SysTrace.trace.IsActive()
# define macTrace(trace) SysTraceActive(trace) && SysTrace.trace.Write
#else #else
# define SysTraceActive(trace) (false) # define SysTraceActive(trace) (false)
# define macTrace(trace)
#endif #endif
#define macTrace(trace) SysTraceActive(trace) && SysTrace.trace.Write
#define SIF_LOG macTrace(SIF) #define SIF_LOG macTrace(SIF)
#define BIOS_LOG macTrace(EE.Bios) #define BIOS_LOG macTrace(EE.Bios)
@ -373,7 +373,7 @@ extern void __Log( const char* fmt, ... );
#define GIF_LOG macTrace(EE.GIF) #define GIF_LOG macTrace(EE.GIF)
#define EECNT_LOG macTrace(EE.Counters) #define EECNT_LOG macTrace(EE.Counters)
#define VifCodeLog macTrace(EE.VIFcode) #define VifCodeLog macTrace(EE.VIFcode)
#define GifTagLog macTrace(EE.GIFpath) #define GifTagLog macTrace(EE.GIFtag)
#define PSXBIOS_LOG macTrace(IOP.Bios) #define PSXBIOS_LOG macTrace(IOP.Bios)

16
pcsx2/ps2/GIFpath.cpp
View File

@ -218,7 +218,7 @@ static void __fastcall RegHandlerSIGNAL(const u32* data)
// //
static void __fastcall RegHandlerFINISH(const u32* data) static void __fastcall RegHandlerFINISH(const u32* data)
{ {
GIF_LOG("GIFpath FINISH data=%x_%x CSRr=%x", data[0], data[1], GSCSRr); GifTagLog("GIFpath FINISH data=%x_%x CSRr=%x", data[0], data[1], GSCSRr);
// The FINISH bit is set here, and then it will be cleared when all three // The FINISH bit is set here, and then it will be cleared when all three
// logical GIFpaths finish their packets (EOPs) At that time (found below // logical GIFpaths finish their packets (EOPs) At that time (found below
@ -229,7 +229,7 @@ static void __fastcall RegHandlerFINISH(const u32* data)
static void __fastcall RegHandlerLABEL(const u32* data) static void __fastcall RegHandlerLABEL(const u32* data)
{ {
GIF_LOG( "GIFpath LABEL" ); GifTagLog( "GIFpath LABEL" );
GSSIGLBLID.LBLID = (GSSIGLBLID.LBLID&~data[1])|(data[0]&data[1]); GSSIGLBLID.LBLID = (GSSIGLBLID.LBLID&~data[1])|(data[0]&data[1]);
} }
@ -431,7 +431,7 @@ __fi int GIFPath::ParseTagQuick(GIF_PATH pathidx, const u8* pMem, u32 size)
switch(tag.FLG) { switch(tag.FLG) {
case GIF_FLG_PACKED: case GIF_FLG_PACKED:
{ {
GIF_LOG("Packed Mode"); GifTagLog("Packed Mode");
numregs = ((tag.NREG-1)&0xf) + 1; numregs = ((tag.NREG-1)&0xf) + 1;
// Note: curreg is *usually* zero here, but can be non-zero if a previous fragment was // Note: curreg is *usually* zero here, but can be non-zero if a previous fragment was
@ -475,7 +475,7 @@ __fi int GIFPath::ParseTagQuick(GIF_PATH pathidx, const u8* pMem, u32 size)
break; break;
case GIF_FLG_REGLIST: case GIF_FLG_REGLIST:
{ {
GIF_LOG("Reglist Mode EOP %x", tag.EOP); GifTagLog("Reglist Mode EOP %x", tag.EOP);
// In reglist mode, the GIF packs 2 registers into each QWC. The nloop however // In reglist mode, the GIF packs 2 registers into each QWC. The nloop however
// can be an odd number, in which case the upper half of the final QWC is ignored (skipped). // can be an odd number, in which case the upper half of the final QWC is ignored (skipped).
@ -520,7 +520,7 @@ __fi int GIFPath::ParseTagQuick(GIF_PATH pathidx, const u8* pMem, u32 size)
case GIF_FLG_IMAGE: case GIF_FLG_IMAGE:
case GIF_FLG_IMAGE2: case GIF_FLG_IMAGE2:
{ {
GIF_LOG("IMAGE Mode"); GifTagLog("IMAGE Mode");
int len = aMin(size, nloop); int len = aMin(size, nloop);
incTag(len); incTag(len);
nloop -= len; nloop -= len;
@ -684,7 +684,7 @@ __fi int GIFPath::CopyTag(const u128* pMem128, u32 size)
switch(tag.FLG) { switch(tag.FLG) {
case GIF_FLG_PACKED: case GIF_FLG_PACKED:
GIF_LOG("Packed Mode EOP %x : %ls", tag.EOP, tag.DumpRegsToString().c_str()); GifTagLog("Packed Mode EOP %x : %ls", tag.EOP, tag.DumpRegsToString().c_str());
PrepPackedRegs(); PrepPackedRegs();
if(DetectE > 0) if(DetectE > 0)
@ -744,7 +744,7 @@ __fi int GIFPath::CopyTag(const u128* pMem128, u32 size)
break; break;
case GIF_FLG_REGLIST: case GIF_FLG_REGLIST:
{ {
GIF_LOG("Reglist Mode EOP %x", tag.EOP); GifTagLog("Reglist Mode EOP %x", tag.EOP);
// In reglist mode, the GIF packs 2 registers into each QWC. The nloop however // In reglist mode, the GIF packs 2 registers into each QWC. The nloop however
// can be an odd number, in which case the upper half of the final QWC is ignored (skipped). // can be an odd number, in which case the upper half of the final QWC is ignored (skipped).
@ -790,7 +790,7 @@ __fi int GIFPath::CopyTag(const u128* pMem128, u32 size)
case GIF_FLG_IMAGE: case GIF_FLG_IMAGE:
case GIF_FLG_IMAGE2: case GIF_FLG_IMAGE2:
{ {
GIF_LOG("IMAGE Mode EOP %x", tag.EOP); GifTagLog("IMAGE Mode EOP %x", tag.EOP);
int len = aMin(size, nloop); int len = aMin(size, nloop);
MemCopy_WrappedDest( pMem128, RingBuffer.m_Ring, ringpos, RingBufferSize, len ); MemCopy_WrappedDest( pMem128, RingBuffer.m_Ring, ringpos, RingBufferSize, len );