diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-09-08 22:27:05 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-09-08 22:27:05 +0000 |
| commit | 28a9c2f89ac4b1a60ec3898df2ed6b344e2af7a2 (patch) | |
| tree | 2b087e5c3c6cab12c45d174180a67fe6bad2453f | |
| parent | d7aba234c246e29fffedc4858d6e94042eaf1e63 (diff) | |
| download | bcm5719-llvm-28a9c2f89ac4b1a60ec3898df2ed6b344e2af7a2.tar.gz bcm5719-llvm-28a9c2f89ac4b1a60ec3898df2ed6b344e2af7a2.zip | |
fix rdar://8407548, I missed the commuted form of xchg/test without a suffix.
llvm-svn: 113427
| -rw-r--r-- | llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/MC/AsmParser/X86/x86_64-new-encoder.s | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp index 9a43913b7c0..7e9dacf7760 100644 --- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -850,7 +850,8 @@ ParseInstruction(StringRef Name, SMLoc NameLoc, // The assembler accepts "xchgX <reg>, <mem>" and "xchgX <mem>, <reg>" as // synonyms. Our tables only have the "<reg>, <mem>" form, so if we see the // other operand order, swap them. - if (Name == "xchgb" || Name == "xchgw" || Name == "xchgl" || Name == "xchgq") + if (Name == "xchgb" || Name == "xchgw" || Name == "xchgl" || Name == "xchgq"|| + Name == "xchg") if (Operands.size() == 3 && static_cast<X86Operand*>(Operands[1])->isMem() && static_cast<X86Operand*>(Operands[2])->isReg()) { @@ -860,7 +861,8 @@ ParseInstruction(StringRef Name, SMLoc NameLoc, // The assembler accepts "testX <reg>, <mem>" and "testX <mem>, <reg>" as // synonyms. Our tables only have the "<mem>, <reg>" form, so if we see the // other operand order, swap them. - if (Name == "testb" || Name == "testw" || Name == "testl" || Name == "testq") + if (Name == "testb" || Name == "testw" || Name == "testl" || Name == "testq"|| + Name == "test") if (Operands.size() == 3 && static_cast<X86Operand*>(Operands[1])->isReg() && static_cast<X86Operand*>(Operands[2])->isMem()) { diff --git a/llvm/test/MC/AsmParser/X86/x86_64-new-encoder.s b/llvm/test/MC/AsmParser/X86/x86_64-new-encoder.s index e23c22478ca..86619521fdc 100644 --- a/llvm/test/MC/AsmParser/X86/x86_64-new-encoder.s +++ b/llvm/test/MC/AsmParser/X86/x86_64-new-encoder.s @@ -174,6 +174,12 @@ xchgl 368(%rax),%ecx xchgl %ecx, 368(%rax) // CHECK: xchgl %ecx, 368(%rax) +// rdar://8407548 +xchg 0xdeadbeef(%rbx,%rcx,8),%bl +// CHECK: xchgb %bl, 3735928559(%rbx,%rcx,8) + + + // PR7254 lock incl 1(%rsp) // CHECK: lock |
