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

Linux/GCC fixes. :) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3705 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-08-31 05:47:54 +00:00
parent 003da7d287
commit bcac59ee4f
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/include/Pcsx2Types.h
View File

@ -134,20 +134,25 @@ union u128
// Explicit conversion from u64. Zero-extends the source through 128 bits. // Explicit conversion from u64. Zero-extends the source through 128 bits.
static u128 From64( u64 src ) static u128 From64( u64 src )
{ {
u128 retval = { src, 0 }; u128 retval;
retval.lo = src;
retval.hi = 0;
return retval; return retval;
} }
// Explicit conversion from u32. Zero-extends the source through 128 bits. // Explicit conversion from u32. Zero-extends the source through 128 bits.
static u128 From32( u32 src ) static u128 From32( u32 src )
{ {
u128 retval = { src, 0 }; u128 retval;
retval._u32[0] = src;
retval._u32[1] = 0;
retval.hi = 0;
return retval; return retval;
} }
operator u32() const { return (u32)lo; } operator u32() const { return _u32[0]; }
operator u16() const { return (u16)lo; } operator u16() const { return _u16[0]; }
operator u8() const { return (u8)lo; } operator u8() const { return _u8[0]; }
bool operator==( const u128& right ) const bool operator==( const u128& right ) const
{ {

2
pcsx2/CMakeLists.txt
View File

@ -402,7 +402,7 @@ set(pcsx2ps2Sources
set(pcsx2ps2Headers set(pcsx2ps2Headers
ps2/BiosTools.h ps2/BiosTools.h
ps2/eeHwTraceLog.inl ps2/eeHwTraceLog.inl
ps2/HwInternal.inl ps2/HwInternal.h
ps2/Iop/IopHw_Internal.h) ps2/Iop/IopHw_Internal.h)
# RDebug sources # RDebug sources

4
pcsx2/HwRead.cpp
View File

@ -34,6 +34,8 @@ static __fi void IntCHackCheck()
static const uint HwF_VerboseConLog = 1<<0; static const uint HwF_VerboseConLog = 1<<0;
static const uint HwF_IntcStatHack = 1<<1; // used for Reads only. static const uint HwF_IntcStatHack = 1<<1; // used for Reads only.
template< uint page > void __fastcall _hwRead128(u32 mem, mem128_t* result );
template< uint page, bool intcstathack > template< uint page, bool intcstathack >
mem32_t __fastcall _hwRead32(u32 mem) mem32_t __fastcall _hwRead32(u32 mem)
{ {
@ -68,7 +70,7 @@ mem32_t __fastcall _hwRead32(u32 mem)
DevCon.WriteLn( Color_Cyan, "Reading 32-bit FIFO data" ); DevCon.WriteLn( Color_Cyan, "Reading 32-bit FIFO data" );
u128 out128; u128 out128;
hwRead128<page>(mem, &out128); _hwRead128<page>(mem, &out128);
return out128._u32[(mem >> 2) & 0x3]; return out128._u32[(mem >> 2) & 0x3];
} }
break; break;

5
pcsx2/HwWrite.cpp
View File

@ -29,8 +29,9 @@ using namespace R5900;
#define HELPSWITCH(m) (((m)>>4) & 0xff) #define HELPSWITCH(m) (((m)>>4) & 0xff)
#define mcase(src) case HELPSWITCH(src) #define mcase(src) case HELPSWITCH(src)
template< uint page > void __fastcall hwWrite8(u32 mem, u8 value); template< uint page > void __fastcall _hwWrite8(u32 mem, u8 value);
template< uint page > void __fastcall hwWrite16(u32 mem, u8 value); template< uint page > void __fastcall _hwWrite16(u32 mem, u8 value);
template< uint page > void __fastcall _hwWrite128(u32 mem, u8 value);
template<uint page> template<uint page>

2
pcsx2/ps2/Iop/IopHw_Internal.h
View File

@ -209,7 +209,7 @@ static __ri void IopHwTraceLog( u32 addr, T val, bool mode )
FastFormatAscii labelStr; FastFormatAscii labelStr;
labelStr.Write("Hw%s%u", mode ? "Read" : "Write", sizeof (T) * 8); labelStr.Write("Hw%s%u", mode ? "Read" : "Write", sizeof (T) * 8);
switch( sizeof T ) switch( sizeof (T) )
{ {
case 1: valStr.Write("0x%02x", val); break; case 1: valStr.Write("0x%02x", val); break;
case 2: valStr.Write("0x%04x", val); break; case 2: valStr.Write("0x%04x", val); break;

2
pcsx2/ps2/eeHwTraceLog.inl
View File

@ -249,7 +249,7 @@ static __ri void eeHwTraceLog( u32 addr, T val, bool mode )
FastFormatAscii labelStr; FastFormatAscii labelStr;
labelStr.Write("Hw%s%u", mode ? "Read" : "Write", sizeof (T) * 8); labelStr.Write("Hw%s%u", mode ? "Read" : "Write", sizeof (T) * 8);
switch( sizeof T ) switch( sizeof(T) )
{ {
case 1: valStr.Write("0x%02x", val); break; case 1: valStr.Write("0x%02x", val); break;
case 2: valStr.Write("0x%04x", val); break; case 2: valStr.Write("0x%04x", val); break;