[llvm-branch-commits] [llvm-branch] r121532 - in /llvm/branches/Apple/whitney: lib/Target/X86/AsmParser/X86AsmParser.cpp test/MC/X86/x86-64.s

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:31:58 2010
New Revision: 121532

URL: http://llvm.org/viewvc/llvm-project?rev=121532&view=rev
Log:
Merge r121320:
--
Author: Kevin Enderby <enderby at apple.com>
Date:   Wed Dec 8 23:57:59 2010 +0000

    Allow a slash, '/', as a prefix separator for X86.  rdar://8741045

Modified:
    llvm/branches/Apple/whitney/lib/Target/X86/AsmParser/X86AsmParser.cpp
    llvm/branches/Apple/whitney/test/MC/X86/x86-64.s

Modified: llvm/branches/Apple/whitney/lib/Target/X86/AsmParser/X86AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/Target/X86/AsmParser/X86AsmParser.cpp?rev=121532&r1=121531&r2=121532&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/branches/Apple/whitney/lib/Target/X86/AsmParser/X86AsmParser.cpp Fri Dec 10 15:31:58 2010
@@ -752,6 +752,8 @@
 
   if (getLexer().is(AsmToken::EndOfStatement))
     Parser.Lex(); // Consume the EndOfStatement
+  else if (isPrefix && getLexer().is(AsmToken::Slash))
+    Parser.Lex(); // Consume the prefix separator Slash
 
   // Hack to allow 'movq <largeimm>, <reg>' as an alias for movabsq.
   if ((Name == "movq" || Name == "mov") && Operands.size() == 3 &&

Modified: llvm/branches/Apple/whitney/test/MC/X86/x86-64.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/test/MC/X86/x86-64.s?rev=121532&r1=121531&r2=121532&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/test/MC/X86/x86-64.s (original)
+++ llvm/branches/Apple/whitney/test/MC/X86/x86-64.s Fri Dec 10 15:31:58 2010
@@ -734,6 +734,11 @@
 // CHECK: lock
 // CHECK: incl 1(%rsp)
 
+// rdar://8741045
+lock/incl 1(%rsp)
+// CHECK: lock
+// CHECK: incl 1(%rsp)
+
 // rdar://8033482
 rep movsl
 // CHECK: rep