RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 01:43:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r103137, fix for $ in labels. It looks like we can't actually handle this

Browse Source 
at the token level. Consider the following horrible test case:

  a = 1
  .globl $a
  movl ($a), %eax
  movl $a, %eax
  movl $$a, %eax

llvm-svn: 103178
This commit is contained in:
Daniel Dunbar 2010-05-06 14:46:38 +00:00
parent 4c3022f869
commit a3731b17c0
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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