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

[ms-inline asm] Refactor the parsing of identifiers. No functional change

Browse Source 
indended.
Part of rdar://13663589

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179871 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier
2013-04-19 18:39:50 +00:00
parent f341dacb23
commit e43624e345
1 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@@ -314,7 +314,7 @@ private:
} }
PrevState = CurrState; PrevState = CurrState;
} }
void onDispExpr(const MCExpr *SymRef, StringRef SymRefName) { void onIdentifierExpr(const MCExpr *SymRef, StringRef SymRefName) {
PrevState = State; PrevState = State;
switch (State) { switch (State) {
default: default:
@@ -494,8 +494,8 @@ private:
X86Operand *ParseIntelExpression(IntelExprStateMachine &SM, SMLoc &End); X86Operand *ParseIntelExpression(IntelExprStateMachine &SM, SMLoc &End);
X86Operand *ParseIntelBracExpression(unsigned SegReg, SMLoc Start, X86Operand *ParseIntelBracExpression(unsigned SegReg, SMLoc Start,
int64_t ImmDisp, unsigned Size); int64_t ImmDisp, unsigned Size);
X86Operand *ParseIntelVarWithQualifier(const MCExpr *&Disp, X86Operand *ParseIntelIdentifier(const MCExpr *&Val, StringRef &Identifier,
StringRef &Identifier); SMLoc &End);
X86Operand *ParseMemOperand(unsigned SegReg, SMLoc StartLoc); X86Operand *ParseMemOperand(unsigned SegReg, SMLoc StartLoc);
X86Operand *CreateMemForInlineAsm(unsigned SegReg, const MCExpr *Disp, X86Operand *CreateMemForInlineAsm(unsigned SegReg, const MCExpr *Disp,
@@ -1250,18 +1250,22 @@ X86AsmParser::ParseIntelExpression(IntelExprStateMachine &SM, SMLoc &End) {
case AsmToken::Identifier: { case AsmToken::Identifier: {
// This could be a register or a symbolic displacement. // This could be a register or a symbolic displacement.
unsigned TmpReg; unsigned TmpReg;
const MCExpr *Disp = 0; const MCExpr *Val;
SMLoc IdentLoc = Tok.getLoc(); SMLoc IdentLoc = Tok.getLoc();
StringRef Identifier = Tok.getString(); StringRef Identifier = Tok.getString();
if(!ParseRegister(TmpReg, IdentLoc, End)) { if(!ParseRegister(TmpReg, IdentLoc, End)) {
SM.onRegister(TmpReg); SM.onRegister(TmpReg);
UpdateLocLex = false; UpdateLocLex = false;
break; break;
} else if (!getParser().parsePrimaryExpr(Disp, End)) { } else {
if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, Identifier)) if (!isParsingInlineAsm()) {
return Err; if (getParser().parsePrimaryExpr(Val, End))
return ErrorOperand(Tok.getLoc(), "Unexpected identifier!");
SM.onDispExpr(Disp, Identifier); } else {
if (X86Operand *Err = ParseIntelIdentifier(Val, Identifier, End))
return Err;
}
SM.onIdentifierExpr(Val, Identifier);
UpdateLocLex = false; UpdateLocLex = false;
break; break;
} }
@@ -1354,25 +1358,23 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg, SMLoc Start,
} }
// Inline assembly may use variable names with namespace alias qualifiers. // Inline assembly may use variable names with namespace alias qualifiers.
X86Operand *X86AsmParser::ParseIntelVarWithQualifier(const MCExpr *&Disp, X86Operand *X86AsmParser::ParseIntelIdentifier(const MCExpr *&Val,
StringRef &Identifier) { StringRef &Identifier,
// We should only see Foo::Bar if we're parsing inline assembly. SMLoc &End) {
if (!isParsingInlineAsm()) assert (isParsingInlineAsm() && "Expected to be parsing inline assembly.");
return 0; Val = 0;
// If we don't see a ':' then there can't be a qualifier.
if (getLexer().isNot(AsmToken::Colon))
return 0;
bool Done = false; bool Done = false;
const AsmToken &Tok = Parser.getTok(); const AsmToken &Tok = Parser.getTok();
AsmToken IdentEnd = Tok; AsmToken IdentEnd = Tok;
while (!Done) { while (!Done) {
End = Tok.getLoc();
switch (getLexer().getKind()) { switch (getLexer().getKind()) {
default: default:
Done = true; Done = true;
break; break;
case AsmToken::Colon: case AsmToken::Colon:
IdentEnd = Tok;
getLexer().Lex(); // Consume ':'. getLexer().Lex(); // Consume ':'.
if (getLexer().isNot(AsmToken::Colon)) if (getLexer().isNot(AsmToken::Colon))
return ErrorOperand(Tok.getLoc(), "Expected ':' token!"); return ErrorOperand(Tok.getLoc(), "Expected ':' token!");
@@ -1391,7 +1393,7 @@ X86Operand *X86AsmParser::ParseIntelVarWithQualifier(const MCExpr *&Disp,
Identifier = StringRef(Identifier.data(), Len + IdentEnd.getString().size()); Identifier = StringRef(Identifier.data(), Len + IdentEnd.getString().size());
MCSymbol *Sym = getContext().GetOrCreateSymbol(Identifier); MCSymbol *Sym = getContext().GetOrCreateSymbol(Identifier);
MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None; MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
Disp = MCSymbolRefExpr::Create(Sym, Variant, getParser().getContext()); Val = MCSymbolRefExpr::Create(Sym, Variant, getParser().getContext());
return 0; return 0;
} }
@@ -1435,18 +1437,18 @@ X86Operand *X86AsmParser::ParseIntelMemOperand(unsigned SegReg,
return ParseIntelBracExpression(SegReg, Start, ImmDisp, Size); return ParseIntelBracExpression(SegReg, Start, ImmDisp, Size);
} }
const MCExpr *Disp = 0; const MCExpr *Val;
if (!isParsingInlineAsm()) {
if (getParser().parsePrimaryExpr(Val, End))
return ErrorOperand(Tok.getLoc(), "Unexpected token!");
return X86Operand::CreateMem(Val, Start, End, Size);
}
StringRef Identifier = Tok.getString(); StringRef Identifier = Tok.getString();
if (getParser().parsePrimaryExpr(Disp, End)) if (X86Operand *Err = ParseIntelIdentifier(Val, Identifier, End))
return 0;
if (!isParsingInlineAsm())
return X86Operand::CreateMem(Disp, Start, End, Size);
if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, Identifier))
return Err; return Err;
return CreateMemForInlineAsm(/*SegReg=*/0, Val, /*BaseReg=*/0,/*IndexReg=*/0,
return CreateMemForInlineAsm(/*SegReg=*/0, Disp, /*BaseReg=*/0,/*IndexReg=*/0,
/*Scale=*/1, Start, End, Size, Identifier); /*Scale=*/1, Start, End, Size, Identifier);
} }
@@ -1502,11 +1504,7 @@ X86Operand *X86AsmParser::ParseIntelOffsetOfOperator() {
const MCExpr *Val; const MCExpr *Val;
SMLoc Start = Tok.getLoc(), End; SMLoc Start = Tok.getLoc(), End;
StringRef Identifier = Tok.getString(); StringRef Identifier = Tok.getString();
if (getParser().parsePrimaryExpr(Val, End)) if (X86Operand *Err = ParseIntelIdentifier(Val, Identifier, End))
return ErrorOperand(Start, "Unable to parse expression!");
const MCExpr *Disp = 0;
if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, Identifier))
return Err; return Err;
// Don't emit the offset operator. // Don't emit the offset operator.
@@ -1537,15 +1535,11 @@ X86Operand *X86AsmParser::ParseIntelOperator(unsigned OpKind) {
SMLoc TypeLoc = Tok.getLoc(); SMLoc TypeLoc = Tok.getLoc();
Parser.Lex(); // Eat operator. Parser.Lex(); // Eat operator.
const MCExpr *Val; const MCExpr *Val = 0;
AsmToken StartTok = Tok; AsmToken StartTok = Tok;
SMLoc Start = Tok.getLoc(), End; SMLoc Start = Tok.getLoc(), End;
StringRef Identifier = Tok.getString(); StringRef Identifier = Tok.getString();
if (getParser().parsePrimaryExpr(Val, End)) if (X86Operand *Err = ParseIntelIdentifier(Val, Identifier, End))
return ErrorOperand(Start, "Unable to parse expression!");
const MCExpr *Disp = 0;
if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, Identifier))
return Err; return Err;
unsigned Length = 0, Size = 0, Type = 0; unsigned Length = 0, Size = 0, Type = 0;