[llvm] r316898 - Invalid used of 'w' suffix on push and pop using 64-bit register.

[Andrew V. Tischenko via llvm-commits]

Author: avt77
Date: Mon Oct 30 05:02:06 2017
New Revision: 316898

URL: http://llvm.org/viewvc/llvm-project?rev=316898&view=rev
Log:
Invalid used of 'w' suffix on push and pop using 64-bit register.
Differential Revision: https://reviews.llvm.org/D38626

Modified:
    llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
    llvm/trunk/test/MC/Disassembler/X86/x86-64.txt

Modified: llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp?rev=316898&r1=316897&r2=316898&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp (original)
+++ llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp Mon Oct 30 05:02:06 2017
@@ -949,8 +949,10 @@ static int getID(struct InternalInstruct
     }
   }
 
-  if (insn->rexPrefix & 0x08)
+  if (insn->rexPrefix & 0x08) {
     attrMask |= ATTR_REXW;
+    attrMask &= ~ATTR_ADSIZE;
+  }
 
   /*
    * JCXZ/JECXZ need special handling for 16-bit mode because the meaning

Modified: llvm/trunk/test/MC/Disassembler/X86/x86-64.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/X86/x86-64.txt?rev=316898&r1=316897&r2=316898&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/X86/x86-64.txt (original)
+++ llvm/trunk/test/MC/Disassembler/X86/x86-64.txt Mon Oct 30 05:02:06 2017
@@ -479,12 +479,10 @@
 # CHECK: nopq %rax
 0x48 0x0f 0x1f 0xC0
 
-# TODO: wrong dissassembler with 0x67 prefix: expected popq
-# CHECK: popw    %r14
+# CHECK: popq    %r14
 0x67 0x49 0x5e
 
-# TODO: wrong dissassembler with 0x67 prefix: expected pushq
-# CHECK: pushw    %r14
+# CHECK: pushq    %r14
 0x67 0x49 0x56
 
 # CHECK:  xchgw   %di, %ax