[llvm-commits] [llvm] r102227 - /llvm/trunk/tools/edis/EDDisassembler.cpp

[Sean Callanan]

Author: spyffe
Date: Fri Apr 23 20:00:16 2010
New Revision: 102227

URL: http://llvm.org/viewvc/llvm-project?rev=102227&view=rev
Log:
Fixed edis to tokenize instructions with no
operands correctly.

Modified:
    llvm/trunk/tools/edis/EDDisassembler.cpp

Modified: llvm/trunk/tools/edis/EDDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/EDDisassembler.cpp?rev=102227&r1=102226&r2=102227&view=diff
==============================================================================
--- llvm/trunk/tools/edis/EDDisassembler.cpp (original)
+++ llvm/trunk/tools/edis/EDDisassembler.cpp Fri Apr 23 20:00:16 2010
@@ -368,12 +368,14 @@
   OwningPtr<TargetAsmParser> TargetParser(Tgt->createAsmParser(genericParser));
   
   AsmToken OpcodeToken = genericParser.Lex();
-  genericParser.Lex();  // consume next token, because specificParser expects us to
-  
+  AsmToken NextToken = genericParser.Lex();  // consume next token, because specificParser expects us to
+    
   if (OpcodeToken.is(AsmToken::Identifier)) {
     instName = OpcodeToken.getString();
     instLoc = OpcodeToken.getLoc();
-    if (TargetParser->ParseInstruction(instName, instLoc, operands))
+    
+    if (NextToken.isNot(AsmToken::Eof) &&
+        TargetParser->ParseInstruction(instName, instLoc, operands))
       ret = -1;
   } else {
     ret = -1;