Linux: Compilation fixes / project file updates.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2143 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-11-06 21:51:39 +00:00
parent 2b5964199c
commit c2143a9b7a
3 changed files with 14 additions and 10 deletions

View File

@ -84,6 +84,8 @@
<Unit filename="../../include/x86emitter/implement/simd_arithmetic.h" /> <Unit filename="../../include/x86emitter/implement/simd_arithmetic.h" />
<Unit filename="../../include/x86emitter/implement/simd_comparisons.h" /> <Unit filename="../../include/x86emitter/implement/simd_comparisons.h" />
<Unit filename="../../include/x86emitter/implement/simd_helpers.h" /> <Unit filename="../../include/x86emitter/implement/simd_helpers.h" />
<Unit filename="../../include/x86emitter/implement/simd_moremovs.h" />
<Unit filename="../../include/x86emitter/implement/simd_shufflepack.h" />
<Unit filename="../../include/x86emitter/implement/simd_templated_helpers.h" /> <Unit filename="../../include/x86emitter/implement/simd_templated_helpers.h" />
<Unit filename="../../include/x86emitter/implement/test.h" /> <Unit filename="../../include/x86emitter/implement/test.h" />
<Unit filename="../../include/x86emitter/implement/xchg.h" /> <Unit filename="../../include/x86emitter/implement/xchg.h" />
@ -104,9 +106,11 @@
<Unit filename="../../src/x86emitter/PrecompiledHeader.h" /> <Unit filename="../../src/x86emitter/PrecompiledHeader.h" />
<Unit filename="../../src/x86emitter/cpudetect.cpp" /> <Unit filename="../../src/x86emitter/cpudetect.cpp" />
<Unit filename="../../src/x86emitter/fpu.cpp" /> <Unit filename="../../src/x86emitter/fpu.cpp" />
<Unit filename="../../src/x86emitter/groups.cpp" />
<Unit filename="../../src/x86emitter/jmp.cpp" /> <Unit filename="../../src/x86emitter/jmp.cpp" />
<Unit filename="../../src/x86emitter/legacy.cpp" /> <Unit filename="../../src/x86emitter/legacy.cpp" />
<Unit filename="../../src/x86emitter/legacy_sse.cpp" /> <Unit filename="../../src/x86emitter/legacy_sse.cpp" />
<Unit filename="../../src/x86emitter/movs.cpp" />
<Unit filename="../../src/x86emitter/simd.cpp" /> <Unit filename="../../src/x86emitter/simd.cpp" />
<Unit filename="../../src/x86emitter/tools.cpp" /> <Unit filename="../../src/x86emitter/tools.cpp" />
<Unit filename="../../src/x86emitter/x86emitter.cpp" /> <Unit filename="../../src/x86emitter/x86emitter.cpp" />

View File

@ -1,6 +1,6 @@
/* PCSX2 - PS2 Emulator for PCs /* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 PCSX2 Dev Team * Copyright (C) 2002-2009 PCSX2 Dev Team
* *
* PCSX2 is free software: you can redistribute it and/or modify it under the terms * 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- * 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. * 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 ) static void _g1_EmitOp( G1Type InstType, const ModSibBase& sibdest, const xRegisterInt& from )
{ {
from.prefix16(); from.prefix16();
xWrite8( (from.Is8BitOp() ? 0 : 1) | (InstType<<3) ); xWrite8( (from.Is8BitOp() ? 0 : 1) | (InstType<<3) );
EmitSibMagic( from, sibdest ); EmitSibMagic( from, sibdest );
} }
@ -223,11 +223,11 @@ template< typename SrcType >
static void _imul_ImmStyle( const xRegisterInt& param1, const SrcType& param2, int imm ) static void _imul_ImmStyle( const xRegisterInt& param1, const SrcType& param2, int imm )
{ {
// for iMul OpSize is allowed to be 16 or 32 bit only. // 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 == param2.GetOperandSize() );
pxAssert( OpSize > 1 ); pxAssert( OpSize > 1 );
xOpWrite0F( (OpSize == 2) ? 0x66 : 0, is_s8( imm ) ? 0x6b : 0x69, param1, param2 ); xOpWrite0F( (OpSize == 2) ? 0x66 : 0, is_s8( imm ) ? 0x6b : 0x69, param1, param2 );
if( is_s8( imm ) ) if( is_s8( imm ) )

View File

@ -179,7 +179,7 @@ const char* xRegisterBase::GetName()
{ {
if( Id == xRegId_Invalid ) return "invalid"; if( Id == xRegId_Invalid ) return "invalid";
if( Id == xRegId_Empty ) return "empty"; if( Id == xRegId_Empty ) return "empty";
// bad error? Return a "big" error string. Might break formatting of register tables // 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. // but that's the least of your worries if you see this baby.
if( Id >= 8 || Id <= -3 ) return "!Register index out of range!"; 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 ); 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 xBSF = { 0xbc };
const xImpl_BitScan xBSR = { 0xbd }; const xImpl_BitScan xBSR = { 0xbd };
const xImpl_IncDec xINC = { false }; const xImpl_IncDec xINC = { false };
const xImpl_IncDec xDEC = { true }; const xImpl_IncDec xDEC = { true };
const xImpl_DwordShift xSHLD = { 0xa4 }; const xImpl_DwordShift xSHLD = { 0xa4 };
const xImpl_DwordShift xSHRD = { 0xac }; const xImpl_DwordShift xSHRD = { 0xac };