6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-06 20:32:19 +00:00
Code Issues Projects Releases Wiki Activity

fix rdar://7946934 - in some limited cases, the assembler should

Browse Source 
allow $ at the start of a symbol name.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103137 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-05-05 23:51:28 +00:00
parent 29402132f3
commit 851f87c6c9
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/MC/MCParser/AsmLexer.cpp
View File

@ -69,16 +69,26 @@ int AsmLexer::getNextChar() {
} }
} }
/// LexIdentifier: [a-zA-Z_.][a-zA-Z0-9_$.@]* /// LexIdentifier: [a-zA-Z_.$][a-zA-Z0-9_$.@]*
/// LexIdentifier: .
/// LexIdentifier: $
AsmToken AsmLexer::LexIdentifier() { AsmToken AsmLexer::LexIdentifier() {
while (isalnum(*CurPtr) || *CurPtr == '_' || *CurPtr == '$' || while (isalnum(*CurPtr) || *CurPtr == '_' || *CurPtr == '$' ||
*CurPtr == '.' || *CurPtr == '@') *CurPtr == '.' || *CurPtr == '@')
++CurPtr; ++CurPtr;
// Handle . as a special case. // Handle . as a special case.
if (CurPtr == TokStart+1 && TokStart[0] == '.') if (CurPtr == TokStart+1)
return AsmToken(AsmToken::Dot, StringRef(TokStart, 1)); if (TokStart[0] == '.')
return AsmToken(AsmToken::Dot, StringRef(TokStart, 1));
// Handle $ as a special case. $foo is an identifier, $42 is not.
if (TokStart[0] == '$' &&
(CurPtr-TokStart == 1 || isdigit(TokStart[1]) || TokStart[1] == '"')) {
CurPtr = TokStart+1;
return AsmToken(AsmToken::Dollar, StringRef(TokStart, 1));
}
return AsmToken(AsmToken::Identifier, StringRef(TokStart, CurPtr - TokStart)); return AsmToken(AsmToken::Identifier, StringRef(TokStart, CurPtr - TokStart));
} }
@ -252,8 +262,8 @@ AsmToken AsmLexer::LexToken() {
switch (CurChar) { switch (CurChar) {
default: default:
// Handle identifier: [a-zA-Z_.][a-zA-Z0-9_$.@]* // Handle identifier: [a-zA-Z_.$][a-zA-Z0-9_$.@]*
if (isalpha(CurChar) || CurChar == '_' || CurChar == '.') if (isalpha(CurChar) || CurChar == '_' || CurChar == '.' || CurChar == '$')
return LexIdentifier(); return LexIdentifier();
// Unknown character, emit an error. // Unknown character, emit an error.
@ -279,7 +289,6 @@ AsmToken AsmLexer::LexToken() {
case '}': return AsmToken(AsmToken::RCurly, StringRef(TokStart, 1)); case '}': return AsmToken(AsmToken::RCurly, StringRef(TokStart, 1));
case '*': return AsmToken(AsmToken::Star, StringRef(TokStart, 1)); case '*': return AsmToken(AsmToken::Star, StringRef(TokStart, 1));
case ',': return AsmToken(AsmToken::Comma, StringRef(TokStart, 1)); case ',': return AsmToken(AsmToken::Comma, StringRef(TokStart, 1));
case '$': return AsmToken(AsmToken::Dollar, StringRef(TokStart, 1));
case '=': case '=':
if (*CurPtr == '=') if (*CurPtr == '=')
return ++CurPtr, AsmToken(AsmToken::EqualEqual, StringRef(TokStart, 2)); return ++CurPtr, AsmToken(AsmToken::EqualEqual, StringRef(TokStart, 2));

4
test/MC/AsmParser/X86/x86_operands.s
View File

@ -1,5 +1,3 @@
// FIXME: Actually test that we get the expected results.
// RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s // RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s
# Immediates # Immediates
@ -7,7 +5,7 @@
addl $1, %eax addl $1, %eax
# CHECK: addl $3, %eax # CHECK: addl $3, %eax
addl $(1+2), %eax addl $(1+2), %eax
# CHECK: addl $a, %eax # CHECK: addl ($a), %eax
addl $a, %eax addl $a, %eax
# CHECK: addl $3, %eax # CHECK: addl $3, %eax
addl $1 + 2, %eax addl $1 + 2, %eax

7
test/MC/AsmParser/labels.s
View File

@ -57,3 +57,10 @@ foo:
// CHECK: .long "a 9" // CHECK: .long "a 9"
.long "a 9" .long "a 9"
// rdar://7946934
// CHECK: .globl $abc
.globl $abc