[llvm-branch-commits] [llvm-branch] r72543 - in /llvm/branches/Apple/Bender/lib/Target/X86: X86InstrMMX.td X86InstrSSE.td

[Bill Wendling]

Author: void
Date: Thu May 28 17:13:30 2009
New Revision: 72543

URL: http://llvm.org/viewvc/llvm-project?rev=72543&view=rev
Log:
--- Merging r72508 into '.':
U    lib/Target/X86/X86InstrSSE.td
U    lib/Target/X86/X86InstrMMX.td

"The instructions MMX_PSADBWrm and MMX_PSADBWrr have opcode 0b11100000 (e0), but
the Intel manual (screenshot) says it should be 0b11110110 (f6).  The existing
encoding causes a disassembly conflict with MMX_PAVGBrm, which really should be
0f e0."

Patch by Sean Callanan!

Modified:
    llvm/branches/Apple/Bender/lib/Target/X86/X86InstrMMX.td
    llvm/branches/Apple/Bender/lib/Target/X86/X86InstrSSE.td

Modified: llvm/branches/Apple/Bender/lib/Target/X86/X86InstrMMX.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender/lib/Target/X86/X86InstrMMX.td?rev=72543&r1=72542&r2=72543&view=diff

==============================================================================
--- llvm/branches/Apple/Bender/lib/Target/X86/X86InstrMMX.td (original)
+++ llvm/branches/Apple/Bender/lib/Target/X86/X86InstrMMX.td Thu May 28 17:13:30 2009
@@ -258,7 +258,7 @@
 defm MMX_PMAXUB  : MMXI_binop_rm_int<0xDE, "pmaxub", int_x86_mmx_pmaxu_b, 1>;
 defm MMX_PMAXSW  : MMXI_binop_rm_int<0xEE, "pmaxsw", int_x86_mmx_pmaxs_w, 1>;
 
-defm MMX_PSADBW  : MMXI_binop_rm_int<0xE0, "psadbw", int_x86_mmx_psad_bw, 1>;
+defm MMX_PSADBW  : MMXI_binop_rm_int<0xF6, "psadbw", int_x86_mmx_psad_bw, 1>;
 
 // Logical Instructions
 defm MMX_PAND : MMXI_binop_rm_v1i64<0xDB, "pand", and, 1>;

Modified: llvm/branches/Apple/Bender/lib/Target/X86/X86InstrSSE.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender/lib/Target/X86/X86InstrSSE.td?rev=72543&r1=72542&r2=72543&view=diff

==============================================================================
--- llvm/branches/Apple/Bender/lib/Target/X86/X86InstrSSE.td (original)
+++ llvm/branches/Apple/Bender/lib/Target/X86/X86InstrSSE.td Thu May 28 17:13:30 2009
@@ -1906,7 +1906,7 @@
 defm PMINSW : PDI_binop_rm_int<0xEA, "pminsw", int_x86_sse2_pmins_w, 1>;
 defm PMAXUB : PDI_binop_rm_int<0xDE, "pmaxub", int_x86_sse2_pmaxu_b, 1>;
 defm PMAXSW : PDI_binop_rm_int<0xEE, "pmaxsw", int_x86_sse2_pmaxs_w, 1>;
-defm PSADBW : PDI_binop_rm_int<0xE0, "psadbw", int_x86_sse2_psad_bw, 1>;
+defm PSADBW : PDI_binop_rm_int<0xF6, "psadbw", int_x86_sse2_psad_bw, 1>;
 
 
 defm PSLLW : PDI_binop_rmi_int<0xF1, 0x71, MRM6r, "psllw",