From bfe128cd418e0135f59ee047149580d95e0036d2 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Tue, 21 Apr 2009 21:42:33 +0000 Subject: [PATCH] Linux: Fix the last of the GCC compilation errors. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1039 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/x86/ix86/Makefile.am | 3 ++- pcsx2/x86/ix86/ix86.cpp | 4 ++-- pcsx2/x86/ix86/ix86_instructions.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pcsx2/x86/ix86/Makefile.am b/pcsx2/x86/ix86/Makefile.am index c146c7c4dc..bb1c76665b 100644 --- a/pcsx2/x86/ix86/Makefile.am +++ b/pcsx2/x86/ix86/Makefile.am @@ -6,4 +6,5 @@ ix86.cpp ix86_cpudetect.cpp ix86_fpu.cpp ix86_jmp.cpp ix86_legacy_mmx.cpp ix86_t ix86_legacy.cpp ix86_legacy_sse.cpp \ ix86_internal.h ix86_legacy_instructions.h ix86_macros.h ix86_sse_helpers.h ix86.h ix86_legacy_internal.h \ ix86_instructions.h ix86_legacy_types.h ix86_types.h \ -bittest.h dwshift.h group1.h group2.h group3.h incdec.h jmpcall.h movs.h test.h movqss.h \ No newline at end of file +bittest.h dwshift.h group1.h group2.h group3.h incdec.h jmpcall.h movs.h test.h \ +movqss.h arithmetic.h shufflepack.h basehelpers.h comparisons.h moremovs.h \ No newline at end of file diff --git a/pcsx2/x86/ix86/ix86.cpp b/pcsx2/x86/ix86/ix86.cpp index 6b8a288289..0f871735dc 100644 --- a/pcsx2/x86/ix86/ix86.cpp +++ b/pcsx2/x86/ix86/ix86.cpp @@ -889,8 +889,8 @@ __noinline void xMOVNTPS( const ModSibBase& to, const xRegisterSSE& from ) { wri __forceinline void xMOVNTQ( void* to, const xRegisterMMX& from ) { writeXMMop( 0xe7, from, to ); } __noinline void xMOVNTQ( const ModSibBase& to, const xRegisterMMX& from ) { writeXMMop( 0xe7, from, to ); } -__forceinline void xMOVMSKPS( const xRegister32& to, xRegisterSSE& from) { writeXMMop( 0x50, to, from ); } -__forceinline void xMOVMSKPD( const xRegister32& to, xRegisterSSE& from) { writeXMMop( 0x66, 0x50, to, from, true ); } +__forceinline void xMOVMSKPS( const xRegister32& to, const xRegisterSSE& from) { writeXMMop( 0x50, to, from ); } +__forceinline void xMOVMSKPD( const xRegister32& to, const xRegisterSSE& from) { writeXMMop( 0x66, 0x50, to, from, true ); } ////////////////////////////////////////////////////////////////////////////////////////// // INSERTPS / EXTRACTPS [SSE4.1 only!] diff --git a/pcsx2/x86/ix86/ix86_instructions.h b/pcsx2/x86/ix86/ix86_instructions.h index 8455f927b7..65ce383144 100644 --- a/pcsx2/x86/ix86/ix86_instructions.h +++ b/pcsx2/x86/ix86/ix86_instructions.h @@ -427,8 +427,8 @@ namespace x86Emitter extern void xMOVNTQ( void* to, const xRegisterMMX& from ); extern void xMOVNTQ( const ModSibBase& to, const xRegisterMMX& from ); - extern void xMOVMSKPS( const xRegister32& to, xRegisterSSE& from ); - extern void xMOVMSKPD( const xRegister32& to, xRegisterSSE& from ); + extern void xMOVMSKPS( const xRegister32& to, const xRegisterSSE& from ); + extern void xMOVMSKPD( const xRegister32& to, const xRegisterSSE& from ); extern void xINSERTPS( const xRegisterSSE& to, const xRegisterSSE& from, u8 imm8 ); extern void xINSERTPS( const xRegisterSSE& to, const u32* from, u8 imm8 );