[PATCH] D38626: Invalid used of 'w' suffix on push and pop using 64-bit register

[Andrew V. Tischenko via Phabricator via llvm-commits]

avt77 updated this revision to Diff 119305.
avt77 added a comment.

I removed unnecessary attribute usage.


https://reviews.llvm.org/D38626

Files:
  lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
  test/MC/Disassembler/X86/x86-64.txt


Index: test/MC/Disassembler/X86/x86-64.txt
===================================================================
--- test/MC/Disassembler/X86/x86-64.txt
+++ test/MC/Disassembler/X86/x86-64.txt
@@ -486,3 +486,9 @@
 
 # CHECK: nopq %rax
 0x48 0x0f 0x1f 0xC0
+
+# CHECK: popq    %r14
+0x67 0x49 0x5e
+
+# CHECK: pushq    %r14
+0x67 0x49 0x56
Index: lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
===================================================================
--- lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
+++ lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
@@ -961,8 +961,11 @@
       attrMask |= ATTR_XD;
   }
 
-  if (insn->rexPrefix & 0x08)
+  if (insn->rexPrefix & 0x08) {
     attrMask |= ATTR_REXW;
+    if (attrMask & ATTR_ADSIZE)
+      attrMask &= ~ATTR_ADSIZE;
+  }
 
   /*
    * JCXZ/JECXZ need special handling for 16-bit mode because the meaning


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D38626.119305.patch
Type: text/x-patch
Size: 887 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171017/20e5abd6/attachment-0001.bin>