llvm-mc/AsmMatcher: Improve match code.

[oota-llvm.git] / lib / Target / X86 / AsmParser / X86AsmParser.cpp

diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp
index 62cce4707234bbf2aaef2eaa836453c33d827e95..841b42743f3cacfe27e304e4f1d00559857ef23b 100644 (file)
--- a/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -131,9 +131,7 @@ struct X86Operand {
     return Mem.Scale;
   }
 
-  bool isToken(const StringRef &Str) const { 
-    return Kind == Token && Str == getToken(); 
-  }
+  bool isToken() const {return Kind == Token; }
 
   bool isImm() const { return Kind == Immediate; }
   
@@ -417,24 +415,4 @@ extern "C" void LLVMInitializeX86AsmParser() {
   RegisterAsmParser<X86ATTAsmParser> Y(TheX86_64Target);
 }
 
-// FIXME: Disabled for now, this is causing gcc-4.0 to run out of memory during
-// building.
-#if 0
-
 #include "X86GenAsmMatcher.inc"
-
-#else
-
-bool X86ATTAsmParser::MatchInstruction(SmallVectorImpl<X86Operand> &Operands,
-                                       MCInst &Inst) {
-  return false;
-}
-  
-bool X86ATTAsmParser::MatchRegisterName(const StringRef &Name,
-                                        unsigned &RegNo) {
-  RegNo = 1;
-  return false;
-}
-
-#endif
-