Removed the non-target independent AsmToken::Register enum constant
from MCAsmLexer.h in preparation of supporting other targets. Changed the
X86AsmParser code to reflect this by removing AsmLexer::LexPercent and looking
for AsmToken::Percent when parsing in places that used AsmToken::Register.
Then changed X86ATTAsmParser::ParseRegister to parse out registers as an
AsmToken::Percent followed by an AsmToken::Identifier.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80929 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-mc/AsmLexer.cpp b/tools/llvm-mc/AsmLexer.cpp
index 27454ee..4dafa0e 100644
--- a/tools/llvm-mc/AsmLexer.cpp
+++ b/tools/llvm-mc/AsmLexer.cpp
@@ -101,17 +101,6 @@
return AsmToken(AsmToken::Identifier, StringRef(TokStart, CurPtr - TokStart));
}
-/// LexPercent: Register: %[a-zA-Z0-9]+
-AsmToken AsmLexer::LexPercent() {
- if (!isalnum(*CurPtr))
- return AsmToken(AsmToken::Percent, StringRef(CurPtr, 1)); // Single %.
-
- while (isalnum(*CurPtr))
- ++CurPtr;
-
- return AsmToken(AsmToken::Register, StringRef(TokStart, CurPtr - TokStart));
-}
-
/// LexSlash: Slash: /
/// C-Style Comment: /* ... */
AsmToken AsmLexer::LexSlash() {
@@ -298,7 +287,7 @@
if (*CurPtr == '=')
return ++CurPtr, AsmToken(AsmToken::ExclaimEqual, StringRef(TokStart, 2));
return AsmToken(AsmToken::Exclaim, StringRef(TokStart, 1));
- case '%': return LexPercent();
+ case '%': return AsmToken(AsmToken::Percent, StringRef(TokStart, 1));
case '/': return LexSlash();
case '#': return LexLineComment();
case '"': return LexQuote();
diff --git a/tools/llvm-mc/AsmLexer.h b/tools/llvm-mc/AsmLexer.h
index 905ff75..000df59 100644
--- a/tools/llvm-mc/AsmLexer.h
+++ b/tools/llvm-mc/AsmLexer.h
@@ -64,7 +64,6 @@
AsmToken ReturnError(const char *Loc, const std::string &Msg);
AsmToken LexIdentifier();
- AsmToken LexPercent();
AsmToken LexSlash();
AsmToken LexLineComment();
AsmToken LexDigit();
diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp
index fd03164..84131c7 100644
--- a/tools/llvm-mc/llvm-mc.cpp
+++ b/tools/llvm-mc/llvm-mc.cpp
@@ -120,9 +120,6 @@
case AsmToken::Identifier:
outs() << "identifier: " << Lexer.getTok().getString() << '\n';
break;
- case AsmToken::Register:
- outs() << "register: " << Lexer.getTok().getString() << '\n';
- break;
case AsmToken::String:
outs() << "string: " << Lexer.getTok().getString() << '\n';
break;