diff options
| -rw-r--r-- | lib/Target/X86/AsmParser/X86AsmParser.cpp | 9 | ||||
| -rw-r--r-- | test/MC/AsmParser/X86/x86_instructions.s | 16 |
2 files changed, 20 insertions, 5 deletions
diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp index 18fb173e1c..698e282f26 100644 --- a/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -910,11 +910,10 @@ ParseInstruction(StringRef Name, SMLoc NameLoc, delete Operands[2]; Operands.erase(Operands.begin() + 2); } - - // FIXME: Hack to handle "f{mul*,add*} st(0), $op" the same as - // "f{mul*,add*} $op", since they commute. - if ((Name.startswith("fmul") || Name.startswith("fadd")) && - Operands.size() == 3 && + + // FIXME: Hack to handle "f{mulp,addp} st(0), $op" the same as + // "f{mulp,addp} $op", since they commute. + if ((Name == "fmulp" || Name == "faddp") && Operands.size() == 3 && static_cast<X86Operand*>(Operands[1])->isReg() && static_cast<X86Operand*>(Operands[1])->getReg() == X86::ST0) { delete Operands[1]; diff --git a/test/MC/AsmParser/X86/x86_instructions.s b/test/MC/AsmParser/X86/x86_instructions.s index 9725e9dcbf..dda047e6fd 100644 --- a/test/MC/AsmParser/X86/x86_instructions.s +++ b/test/MC/AsmParser/X86/x86_instructions.s @@ -360,6 +360,22 @@ mov %rdx, %cr15 faddp %st, %st(1) fmulp %st, %st(2) +// rdar://8468087 - Encode these accurately, they are not synonyms. +// CHECK: fmul %st(0), %st(1) +// CHECK: encoding: [0xdc,0xc9] +// CHECK: fmul %st(1) +// CHECK: encoding: [0xd8,0xc9] +fmul %st, %st(1) +fmul %st(1), %st + +// CHECK: fadd %st(0), %st(1) +// CHECK: encoding: [0xdc,0xc1] +// CHECK: fadd %st(1) +// CHECK: encoding: [0xd8,0xc1] +fadd %st, %st(1) +fadd %st(1), %st + + // rdar://8416805 // CHECK: xorb %al, %al // CHECK: encoding: [0x30,0xc0] |