[llvm-commits] [llvm] r138029 - in /llvm/trunk: lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp test/MC/X86/x86_64-avx-encoding.s

[Bruno Cardoso Lopes]

Author: bruno
Date: Thu Aug 18 21:23:56 2011
New Revision: 138029

URL: http://llvm.org/viewvc/llvm-project?rev=138029&view=rev
Log:
Fix PR10677. Initial patch and idea by Peter Cooper but I've changed the
implementation!

Modified:
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
    llvm/trunk/test/MC/X86/x86_64-avx-encoding.s

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp?rev=138029&r1=138028&r2=138029&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp Thu Aug 18 21:23:56 2011
@@ -533,9 +533,14 @@
       const MCOperand &MO = MI.getOperand(CurOp);
       if (MO.isReg() && X86II::isX86_64ExtendedReg(MO.getReg()))
         VEX_B = 0x0;
-      if (!VEX_B && MO.isReg() &&
-          ((TSFlags & X86II::FormMask) == X86II::MRMSrcMem) &&
-          X86II::isX86_64ExtendedReg(MO.getReg()))
+      // Only set VEX_X if the Index Register is extended
+      if (VEX_B || !MO.isReg())
+        continue;
+      if (!X86II::isX86_64ExtendedReg(MO.getReg()))
+        continue;
+      unsigned Frm = TSFlags & X86II::FormMask;
+      if ((Frm == X86II::MRMSrcMem && CurOp-1 == X86::AddrIndexReg) ||
+          (Frm == X86II::MRMDestMem && CurOp == X86::AddrIndexReg))
         VEX_X = 0x0;
     }
     break;

Modified: llvm/trunk/test/MC/X86/x86_64-avx-encoding.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86_64-avx-encoding.s?rev=138029&r1=138028&r2=138029&view=diff
==============================================================================
--- llvm/trunk/test/MC/X86/x86_64-avx-encoding.s (original)
+++ llvm/trunk/test/MC/X86/x86_64-avx-encoding.s Thu Aug 18 21:23:56 2011
@@ -3316,3 +3316,19 @@
 // CHECK: encoding: [0xc4,0x63,0x1d,0x4b,0xac,0x20,0xad,0xde,0x00,0x00,0xb0]
           vblendvpd  %ymm11, 0xdead(%rax,%riz), %ymm12, %ymm13
 
+// CHECK: vmovaps	%xmm3, (%r14,%r11)
+// CHECK: encoding: [0xc4,0x81,0x78,0x29,0x1c,0x1e]
+          vmovaps	%xmm3, (%r14,%r11)
+
+// CHECK: vmovaps	(%r14,%r11), %xmm3
+// CHECK: encoding: [0xc4,0x81,0x78,0x28,0x1c,0x1e]
+          vmovaps	(%r14,%r11), %xmm3
+
+// CHECK: vmovaps	%xmm3, (%r14,%rbx)
+// CHECK: encoding: [0xc4,0xc1,0x78,0x29,0x1c,0x1e]
+          vmovaps	%xmm3, (%r14,%rbx)
+
+// CHECK: vmovaps	(%r14,%rbx), %xmm3
+// CHECK: encoding: [0xc4,0xc1,0x78,0x28,0x1c,0x1e]
+          vmovaps	(%r14,%rbx), %xmm3
+