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

Remove some assertion and log spams in devel builds. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2357 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-12-18 17:57:18 +00:00
parent 79e07edc9f
commit 4c2a7ae39f
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/x86emitter/cpudetect.cpp
View File

@ -321,13 +321,6 @@ void cpudetectInit()
} }
} }
else
{
Console.Warning(
"Notice: Could not allocate memory for SSE3/4 detection.\n"
"\tRelying on CPUID results. [this is not an error]"
);
}
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
// Establish MXCSR Mask... // Establish MXCSR Mask...

21
pcsx2/VIFunpack.cpp
View File

@ -319,19 +319,26 @@ static void __fastcall fUNPACK_V4_5(u32 *dest, u32 *data)
UNPACK_V4_5<doMask>(dest, data, 0); // size is ignored. UNPACK_V4_5<doMask>(dest, data, 0); // size is ignored.
} }
#define _upk (UNPACKFUNCTYPE)
#define _odd (UNPACKFUNCTYPE_ODD)
#define _unpk_s(bits) (UNPACKFUNCTYPE_S##bits)
#define _odd_s(bits) (UNPACKFUNCTYPE_ODD_S##bits)
#define _unpk_u(bits) (UNPACKFUNCTYPE_U##bits)
#define _odd_u(bits) (UNPACKFUNCTYPE_ODD_U##bits)
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// Main table for function unpacking. // Main table for function unpacking.
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// The extra data bsize/dsize/etc are all duplicated between the doMask enabled and // The extra data bsize/dsize/etc are all duplicated between the doMask enabled and
// disabled versions. This is probably simpler and more efficient than bothering // disabled versions. This is probably simpler and more efficient than bothering
// to generate separate tables. // to generate separate tables.
//
// The double-cast function pointer nonsense is to appease GCC, which gives some rather
// cryptic error about being unable to deduce the type parameters (I think it's a bug
// relating to __fastcall, which I recall having some other places as well). It's fixed
// by explicitly casting the function to itself prior to casting it to what we need it
// to be cast as. --air
//
#define _upk (UNPACKFUNCTYPE)
#define _odd (UNPACKFUNCTYPE_ODD)
#define _unpk_s(bits) (UNPACKFUNCTYPE_S##bits)
#define _odd_s(bits) (UNPACKFUNCTYPE_ODD_S##bits)
#define _unpk_u(bits) (UNPACKFUNCTYPE_U##bits)
#define _odd_u(bits) (UNPACKFUNCTYPE_ODD_U##bits)
// 32-bits versions are unsigned-only!! // 32-bits versions are unsigned-only!!
#define UnpackFuncPair32( sizefac, vt, doMask ) \ #define UnpackFuncPair32( sizefac, vt, doMask ) \

6
pcsx2/x86/newVif_Unpack.inl
View File

@ -159,7 +159,7 @@ __releaseinline void __fastcall _nVifUnpackLoop(u8 *data, u32 size) {
fnbase[aMin(vif->cl, 4)](dest, data); fnbase[aMin(vif->cl, 4)](dest, data);
} }
data += ft.gsize; data += ft.gsize;
if( IsDevBuild ) size -= ft.gsize; // only used below for assertion checking //if( IsDebugBuild ) size -= ft.gsize; // only used below for assertion checking
vifRegs->num--; vifRegs->num--;
incVUptrBy16(idx, dest, vuMemBase); incVUptrBy16(idx, dest, vuMemBase);
@ -176,7 +176,9 @@ __releaseinline void __fastcall _nVifUnpackLoop(u8 *data, u32 size) {
vif->cl = 0; vif->cl = 0;
} }
} }
pxAssertDev( size == 0, "Mismatched VIFunpack size specified." );
// Spams in many games? (Suikoden3 / TriAce games, prolly more) Bad news or just wacky VIF hack mess?
//pxAssert( size == 0, "Mismatched VIFunpack size specified." );
} }
typedef void (__fastcall* Fnptr_VifUnpackLoop)(u8 *data, u32 size); typedef void (__fastcall* Fnptr_VifUnpackLoop)(u8 *data, u32 size);