[llvm-commits] [llvm] r113427 - in /llvm/trunk: lib/Target/X86/AsmParser/X86AsmParser.cpp test/MC/AsmParser/X86/x86_64-new-encoder.s

[Chris Lattner]

Author: lattner
Date: Wed Sep  8 17:27:05 2010
New Revision: 113427

URL: http://llvm.org/viewvc/llvm-project?rev=113427&view=rev
Log:
fix rdar://8407548, I missed the commuted form of xchg/test without a suffix.

Modified:
    llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
    llvm/trunk/test/MC/AsmParser/X86/x86_64-new-encoder.s

Modified: llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp?rev=113427&r1=113426&r2=113427&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp Wed Sep  8 17:27:05 2010
@@ -850,7 +850,8 @@
   // 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 @@
   // 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()) {

Modified: llvm/trunk/test/MC/AsmParser/X86/x86_64-new-encoder.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/X86/x86_64-new-encoder.s?rev=113427&r1=113426&r2=113427&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/X86/x86_64-new-encoder.s (original)
+++ llvm/trunk/test/MC/AsmParser/X86/x86_64-new-encoder.s Wed Sep  8 17:27:05 2010
@@ -174,6 +174,12 @@
 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