Invalid used of 'w' suffix on push and pop using 64-bit register

[avt77]

Summary

This patch fixes PR32806:

The following instruction accesses a 64-bit register, but the mnemonic indicates that it is using a 16-bit register:

  Bytes:            67 49 5e
  Output:         popw %r14
  Expected:      popq %r14

[craig.topper]

lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp

968

Why are you forcing the XS attribute?

[avt77]

lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp

968

I thought we should transform ADSIZE in XS here. It seems I was wrong: everything works w/o such a transformation. I'll update the patch asap.

[avt77]

I removed unnecessary attribute usage.

[RKSimon]

lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp

968

Can't this be done as just:

attrMask |= ATTR_REXW;
attrMask &= ~ATTR_ADSIZE;

[avt77]

The fix was refactored accordingly to Simon's suggest.
Could somebody give me LGTM?

[RKSimon]

test/MC/Disassembler/X86/x86-64.txt

494

Can you commit this test now showing the incorrect popw/pushw and then rebase the patch?

[avt77]

The patch was re-based to show the change in the test.

[RKSimon]

LGTM - thanks

lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp

if (insn->vectorExtensionType != TYPE_NO_VEX_XOP) {
     else if (isPrefixAtLocation(insn, 0x67, insn->necessaryPrefixLocation))
       attrMask |= ATTR_ADSIZE;
     else if (isPrefixAtLocation(insn, 0xf3, insn->necessaryPrefixLocation))
       attrMask |= ATTR_XS;
     else if (isPrefixAtLocation(insn, 0xf2, insn->necessaryPrefixLocation))
       attrMask |= ATTR_XD;
   }
 
-  if (insn->rexPrefix & 0x08)
+  if (insn->rexPrefix & 0x08) {
     attrMask |= ATTR_REXW;
+    if (attrMask & ATTR_ADSIZE) {
+      attrMask &= ~ATTR_ADSIZE;
+      attrMask |= ATTR_XS;
+    }
+  }
 
   /*
    * JCXZ/JECXZ need special handling for 16-bit mode because the meaning
    * of the AdSize prefix is inverted w.r.t. 32-bit mode.
    */
   if (insn->mode == MODE_16BIT && insn->opcodeType == ONEBYTE &&
       insn->opcode == 0xE3)
     attrMask ^= ATTR_ADSIZE;

test/MC/Disassembler/X86/x86-64.txt

 0x80 0x04 0x25 0x78 0x56 0x34 0x12 0x00
 
 # CHECK: $0, 305419896(%rbp)
 0x80 0x84 0x25 0x78 0x56 0x34 0x12 0x00
 
 # CHECK: movabsq 6510615555426900570, %rax
 0x48 0xa1 0x5a 0x5a 0x5a 0x5a 0x5a 0x5a 0x5a 0x5a
 
-# CHECK: movq 1515870810, %rax
+# CHECK: movabsq 1515870810, %rax
 0x67, 0x48 0xa1 0x5a 0x5a 0x5a 0x5a
 
 # CHECK: movabsq %rax, 6510615555426900570
 0x48 0xa3 0x5a 0x5a 0x5a 0x5a 0x5a 0x5a 0x5a 0x5a
 
-# CHECK: movq %rax, 1515870810
+# CHECK: movabsq %rax, 1515870810
 0x67, 0x48 0xa3 0x5a 0x5a 0x5a 0x5a
 
 # CHECK: callq -32769
 0x66 0xe8 0xff 0x7f 0xff 0xff
 
 # CHECK: callq -32769
 0x66 0x66 0x48 0xe8 0xff 0x7f 0xff 0xff
 

 # CHECK: lwpval $2309737967, (%esp), %edx
 0x67 0x8f 0xea 0x68 0x12 0x0c 0x24 0xef 0xcd 0xab 0x89
 
 # CHECK: nopq -559038737(%rbx,%rcx,8)
 0x48 0x0f 0x1f 0x84 0xcb 0xef 0xbe 0xad 0xde
 
 # CHECK: nopq %rax
 0x48 0x0f 0x1f 0xC0
+
+# CHECK: popq    %r14
+0x67 0x49 0x5e
+
+# CHECK: pushq    %r14
+0x67 0x49 0x56