[llvm-commits] [llvm] r113167 - /llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp

[Chris Lattner]

Author: lattner
Date: Mon Sep  6 15:10:12 2010
New Revision: 113167

URL: http://llvm.org/viewvc/llvm-project?rev=113167&view=rev
Log:
simplify the hacks around jrcxz.

Modified:
    llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp

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=113167&r1=113166&r2=113167&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp Mon Sep  6 15:10:12 2010
@@ -622,9 +622,6 @@
     // FIXME: We can do jcxz/jecxz, we just don't have the encoding right yet.
     if (Name == "jcxz" || Name == "jecxz")
       return Error(NameLoc, Name + " cannot be encoded in 64-bit mode");
-  } else {
-    if (Name == "jrcxz")
-      return Error(NameLoc, "jrcxz cannot be encoded in 32-bit mode");
   }
 
   // FIXME: Hack to recognize "sal..." and "rep..." for now. We need a way to
@@ -652,7 +649,7 @@
     // jecxz requires an AdSize prefix but jecxz does not have a prefix in
     // 32-bit mode.
     .Case("jecxz", "jcxz")
-    .Case("jrcxz", "jcxz")
+    .Case("jrcxz", Is64Bit ? "jcxz" : "jrcxz")
     .Case("jna", "jbe")
     .Case("jnae", "jb")
     .Case("jnb", "jae")