From c2143a9b7ad0b55a56264e590e3b8f28ff9428e8 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Fri, 6 Nov 2009 21:51:39 +0000 Subject: [PATCH] Linux: Compilation fixes / project file updates. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2143 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/build/x86emitter/x86emitter.cbp | 4 ++++ common/src/x86emitter/groups.cpp | 8 ++++---- common/src/x86emitter/x86emitter.cpp | 12 ++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/common/build/x86emitter/x86emitter.cbp b/common/build/x86emitter/x86emitter.cbp index a31224b1ea..151fe221a6 100644 --- a/common/build/x86emitter/x86emitter.cbp +++ b/common/build/x86emitter/x86emitter.cbp @@ -84,6 +84,8 @@ + + @@ -104,9 +106,11 @@ + + diff --git a/common/src/x86emitter/groups.cpp b/common/src/x86emitter/groups.cpp index eab6cd9639..cdbcd1da19 100644 --- a/common/src/x86emitter/groups.cpp +++ b/common/src/x86emitter/groups.cpp @@ -1,6 +1,6 @@ /* PCSX2 - PS2 Emulator for PCs * Copyright (C) 2002-2009 PCSX2 Dev Team - * + * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -72,7 +72,7 @@ void _g1_EmitOp( G1Type InstType, const xRegisterInt& to, const xRegisterInt& fr static void _g1_EmitOp( G1Type InstType, const ModSibBase& sibdest, const xRegisterInt& from ) { from.prefix16(); - xWrite8( (from.Is8BitOp() ? 0 : 1) | (InstType<<3) ); + xWrite8( (from.Is8BitOp() ? 0 : 1) | (InstType<<3) ); EmitSibMagic( from, sibdest ); } @@ -223,11 +223,11 @@ template< typename SrcType > static void _imul_ImmStyle( const xRegisterInt& param1, const SrcType& param2, int imm ) { // for iMul OpSize is allowed to be 16 or 32 bit only. - const int OpSize = param1.GetOperandSize(); + const uint OpSize = param1.GetOperandSize(); pxAssert( OpSize == param2.GetOperandSize() ); pxAssert( OpSize > 1 ); - + xOpWrite0F( (OpSize == 2) ? 0x66 : 0, is_s8( imm ) ? 0x6b : 0x69, param1, param2 ); if( is_s8( imm ) ) diff --git a/common/src/x86emitter/x86emitter.cpp b/common/src/x86emitter/x86emitter.cpp index 193230a1e3..ed27f89b3d 100644 --- a/common/src/x86emitter/x86emitter.cpp +++ b/common/src/x86emitter/x86emitter.cpp @@ -179,7 +179,7 @@ const char* xRegisterBase::GetName() { if( Id == xRegId_Invalid ) return "invalid"; if( Id == xRegId_Empty ) return "empty"; - + // bad error? Return a "big" error string. Might break formatting of register tables // but that's the least of your worries if you see this baby. if( Id >= 8 || Id <= -3 ) return "!Register index out of range!"; @@ -780,13 +780,13 @@ void xImpl_DwordShift::operator()( const ModSibBase& dest, const xRegister16or32 xOpWrite0F( (from->GetOperandSize() == 2) ? 0x66 : 0x00, OpcodeBase, from, dest, shiftcnt ); } -const xImpl_Test xTEST; +const xImpl_Test xTEST = { }; -const xImpl_BitScan xBSF = { 0xbc }; -const xImpl_BitScan xBSR = { 0xbd }; +const xImpl_BitScan xBSF = { 0xbc }; +const xImpl_BitScan xBSR = { 0xbd }; -const xImpl_IncDec xINC = { false }; -const xImpl_IncDec xDEC = { true }; +const xImpl_IncDec xINC = { false }; +const xImpl_IncDec xDEC = { true }; const xImpl_DwordShift xSHLD = { 0xa4 }; const xImpl_DwordShift xSHRD = { 0xac };