[llvm-commits] [llvm] r117553 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/directive_set.s
Roman Divacky
rdivacky at freebsd.org
Thu Oct 28 09:22:58 PDT 2010
Author: rdivacky
Date: Thu Oct 28 11:22:58 2010
New Revision: 117553
URL: http://llvm.org/viewvc/llvm-project?rev=117553&view=rev
Log:
Implement .equ directive as a synonym to .set.
Modified:
llvm/trunk/lib/MC/MCParser/AsmParser.cpp
llvm/trunk/test/MC/AsmParser/directive_set.s
Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=117553&r1=117552&r2=117553&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Thu Oct 28 11:22:58 2010
@@ -183,7 +183,7 @@
bool ParseDirectiveFill(); // ".fill"
bool ParseDirectiveSpace(); // ".space"
bool ParseDirectiveZero(); // ".zero"
- bool ParseDirectiveSet(); // ".set"
+ bool ParseDirectiveSet(StringRef IDVal); // ".set" or ".equ"
bool ParseDirectiveOrg(); // ".org"
// ".align{,32}", ".p2align{,w,l}"
bool ParseDirectiveAlign(bool IsPow2, unsigned ValueSize);
@@ -913,8 +913,8 @@
// Otherwise, we have a normal instruction or directive.
if (IDVal[0] == '.') {
// Assembler features
- if (IDVal == ".set")
- return ParseDirectiveSet();
+ if (IDVal == ".set" || IDVal == ".equ")
+ return ParseDirectiveSet(IDVal);
// Data directives
@@ -1275,14 +1275,14 @@
/// ParseDirectiveSet:
/// ::= .set identifier ',' expression
-bool AsmParser::ParseDirectiveSet() {
+bool AsmParser::ParseDirectiveSet(StringRef IDVal) {
StringRef Name;
if (ParseIdentifier(Name))
- return TokError("expected identifier after '.set' directive");
+ return TokError("expected identifier after '" + Twine(IDVal.str()) + "'");
if (getLexer().isNot(AsmToken::Comma))
- return TokError("unexpected token in '.set'");
+ return TokError("unexpected token in '" + Twine(IDVal.str()) + "'");
Lex();
return ParseAssignment(Name);
Modified: llvm/trunk/test/MC/AsmParser/directive_set.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/directive_set.s?rev=117553&r1=117552&r2=117553&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/directive_set.s (original)
+++ llvm/trunk/test/MC/AsmParser/directive_set.s Thu Oct 28 11:22:58 2010
@@ -5,3 +5,8 @@
TEST0:
.set a, 0
+# CHECK: TEST1:
+# CHECK: a = 0
+TEST1:
+ .equ a, 0
+
More information about the llvm-commits
mailing list