mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
llvm-mc: Remove MCAsmParser::Parse[Paren]RelocatableExpression.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80576 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
8c2eebe407
commit
883f920acb
@ -68,24 +68,6 @@ public:
|
||||
/// on error.
|
||||
/// @result - False on success.
|
||||
virtual bool ParseAbsoluteExpression(int64_t &Res) = 0;
|
||||
|
||||
/// ParseRelocatableExpression - Parse an expression which must be
|
||||
/// relocatable.
|
||||
///
|
||||
/// @param Res - The relocatable expression value. The result is undefined on
|
||||
/// error.
|
||||
/// @result - False on success.
|
||||
virtual bool ParseRelocatableExpression(MCValue &Res) = 0;
|
||||
|
||||
/// ParseParenRelocatableExpression - Parse an expression which must be
|
||||
/// relocatable, assuming that an initial '(' has already been consumed.
|
||||
///
|
||||
/// @param Res - The relocatable expression value. The result is undefined on
|
||||
/// error.
|
||||
/// @result - False on success.
|
||||
///
|
||||
/// @see ParseRelocatableExpression, ParseParenExpr.
|
||||
virtual bool ParseParenRelocatableExpression(MCValue &Res) = 0;
|
||||
};
|
||||
|
||||
} // End llvm namespace
|
||||
|
@ -279,32 +279,6 @@ bool AsmParser::ParseAbsoluteExpression(int64_t &Res) {
|
||||
return false;
|
||||
}
|
||||
|
||||
bool AsmParser::ParseRelocatableExpression(MCValue &Res) {
|
||||
const MCExpr *Expr;
|
||||
|
||||
SMLoc StartLoc = Lexer.getLoc();
|
||||
if (ParseExpression(Expr))
|
||||
return true;
|
||||
|
||||
if (!Expr->EvaluateAsRelocatable(Ctx, Res))
|
||||
return Error(StartLoc, "expected relocatable expression");
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool AsmParser::ParseParenRelocatableExpression(MCValue &Res) {
|
||||
const MCExpr *Expr;
|
||||
|
||||
SMLoc StartLoc = Lexer.getLoc();
|
||||
if (ParseParenExpr(Expr))
|
||||
return true;
|
||||
|
||||
if (!Expr->EvaluateAsRelocatable(Ctx, Res))
|
||||
return Error(StartLoc, "expected relocatable expression");
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static unsigned getBinOpPrecedence(AsmToken::TokenKind K,
|
||||
MCBinaryExpr::Opcode &Kind) {
|
||||
switch (K) {
|
||||
@ -739,9 +713,14 @@ bool AsmParser::ParseAssignment(const StringRef &Name, bool IsDotSet) {
|
||||
SMLoc EqualLoc = Lexer.getLoc();
|
||||
|
||||
MCValue Value;
|
||||
if (ParseRelocatableExpression(Value))
|
||||
const MCExpr *Expr;
|
||||
SMLoc StartLoc = Lexer.getLoc();
|
||||
if (ParseExpression(Expr))
|
||||
return true;
|
||||
|
||||
if (!Expr->EvaluateAsRelocatable(Ctx, Value))
|
||||
return Error(StartLoc, "expected relocatable expression");
|
||||
|
||||
if (Lexer.isNot(AsmToken::EndOfStatement))
|
||||
return TokError("unexpected token in assignment");
|
||||
|
||||
@ -958,11 +937,16 @@ bool AsmParser::ParseDirectiveAscii(bool ZeroTerminated) {
|
||||
bool AsmParser::ParseDirectiveValue(unsigned Size) {
|
||||
if (Lexer.isNot(AsmToken::EndOfStatement)) {
|
||||
for (;;) {
|
||||
MCValue Expr;
|
||||
if (ParseRelocatableExpression(Expr))
|
||||
MCValue Value;
|
||||
const MCExpr *Expr;
|
||||
SMLoc StartLoc = Lexer.getLoc();
|
||||
if (ParseExpression(Expr))
|
||||
return true;
|
||||
|
||||
Out.EmitValue(Expr, Size);
|
||||
if (!Expr->EvaluateAsRelocatable(Ctx, Value))
|
||||
return Error(StartLoc, "expected relocatable expression");
|
||||
|
||||
Out.EmitValue(Value, Size);
|
||||
|
||||
if (Lexer.is(AsmToken::EndOfStatement))
|
||||
break;
|
||||
@ -1054,9 +1038,14 @@ bool AsmParser::ParseDirectiveFill() {
|
||||
/// ::= .org expression [ , expression ]
|
||||
bool AsmParser::ParseDirectiveOrg() {
|
||||
MCValue Offset;
|
||||
if (ParseRelocatableExpression(Offset))
|
||||
const MCExpr *Expr;
|
||||
SMLoc StartLoc = Lexer.getLoc();
|
||||
if (ParseExpression(Expr))
|
||||
return true;
|
||||
|
||||
if (!Expr->EvaluateAsRelocatable(Ctx, Offset))
|
||||
return Error(StartLoc, "expected relocatable expression");
|
||||
|
||||
// Parse optional fill expression.
|
||||
int64_t FillExpr = 0;
|
||||
if (Lexer.isNot(AsmToken::EndOfStatement)) {
|
||||
@ -1428,10 +1417,15 @@ bool AsmParser::ParseDirectiveDarwinLsym() {
|
||||
return TokError("unexpected token in '.lsym' directive");
|
||||
Lexer.Lex();
|
||||
|
||||
MCValue Expr;
|
||||
if (ParseRelocatableExpression(Expr))
|
||||
MCValue Value;
|
||||
const MCExpr *Expr;
|
||||
SMLoc StartLoc = Lexer.getLoc();
|
||||
if (ParseExpression(Expr))
|
||||
return true;
|
||||
|
||||
if (!Expr->EvaluateAsRelocatable(Ctx, Value))
|
||||
return Error(StartLoc, "expected relocatable expression");
|
||||
|
||||
if (Lexer.isNot(AsmToken::EndOfStatement))
|
||||
return TokError("unexpected token in '.lsym' directive");
|
||||
|
||||
|
@ -74,10 +74,6 @@ public:
|
||||
|
||||
virtual bool ParseAbsoluteExpression(int64_t &Res);
|
||||
|
||||
virtual bool ParseRelocatableExpression(MCValue &Res);
|
||||
|
||||
virtual bool ParseParenRelocatableExpression(MCValue &Res);
|
||||
|
||||
/// }
|
||||
|
||||
private:
|
||||
|
Loading…
Reference in New Issue
Block a user