6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

MC/AsmParser: Change ParseExpression to use ParseIdentifier(), to support

Browse Source 
dollars in identifiers.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111946 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar
2010-08-24 19:13:42 +00:00
parent ee9102587e
commit e17edff28f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/MC/MCParser/AsmParser.cpp
View File

@@ -449,10 +449,17 @@ bool AsmParser::ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) {
return true; return true;
Res = MCUnaryExpr::CreateLNot(Res, getContext()); Res = MCUnaryExpr::CreateLNot(Res, getContext());
return false; return false;
case AsmToken::Dollar:
case AsmToken::String: case AsmToken::String:
case AsmToken::Identifier: { case AsmToken::Identifier: {
EndLoc = Lexer.getLoc();
StringRef Identifier;
if (ParseIdentifier(Identifier))
return false;
// This is a symbol reference. // This is a symbol reference.
std::pair<StringRef, StringRef> Split = getTok().getIdentifier().split('@'); std::pair<StringRef, StringRef> Split = Identifier.split('@');
MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first); MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first);
// Mark the symbol as used in an expression. // Mark the symbol as used in an expression.
@@ -460,12 +467,9 @@ bool AsmParser::ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) {
// Lookup the symbol variant if used. // Lookup the symbol variant if used.
MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None; MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
if (Split.first.size() != getTok().getIdentifier().size()) if (Split.first.size() != Identifier.size())
Variant = MCSymbolRefExpr::getVariantKindForName(Split.second); Variant = MCSymbolRefExpr::getVariantKindForName(Split.second);
EndLoc = Lexer.getLoc();
Lex(); // Eat identifier.
// If this is an absolute variable reference, substitute it now to preserve // If this is an absolute variable reference, substitute it now to preserve
// semantics in the face of reassignment. // semantics in the face of reassignment.
if (Sym->isVariable() && isa<MCConstantExpr>(Sym->getVariableValue())) { if (Sym->isVariable() && isa<MCConstantExpr>(Sym->getVariableValue())) {

2
test/MC/AsmParser/dollars-in-identifiers.s
View File

@@ -3,3 +3,5 @@
// CHECK: .globl $foo // CHECK: .globl $foo
.globl $foo .globl $foo
// CHECK: .long ($foo)
.long ($foo)