[llvm-commits] [llvm] r80569 - in /llvm/trunk: include/llvm/MC/MCExpr.h lib/MC/MCExpr.cpp tools/llvm-mc/AsmParser.cpp tools/llvm-mc/AsmParser.h
Daniel Dunbar
daniel at zuster.org
Mon Aug 31 01:07:22 PDT 2009
Author: ddunbar
Date: Mon Aug 31 03:07:22 2009
New Revision: 80569
URL: http://llvm.org/viewvc/llvm-project?rev=80569&view=rev
Log:
llvm-mc: Switch MCExpr construction to using static member functions, and taking the MCContext (which now owns all MCExprs).
Modified:
llvm/trunk/include/llvm/MC/MCExpr.h
llvm/trunk/lib/MC/MCExpr.cpp
llvm/trunk/tools/llvm-mc/AsmParser.cpp
llvm/trunk/tools/llvm-mc/AsmParser.h
Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=80569&r1=80568&r2=80569&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Mon Aug 31 03:07:22 2009
@@ -19,7 +19,7 @@
class MCValue;
/// MCExpr - Base class for the full range of assembler expressions which are
-/// needed for parsing.
+/// needed for parsing.
class MCExpr {
public:
enum ExprKind {
@@ -28,18 +28,26 @@
SymbolRef, ///< References to labels and assigned expressions.
Unary ///< Unary expressions.
};
-
+
private:
ExprKind Kind;
-
+
+ MCExpr(const MCExpr&); // DO NOT IMPLEMENT
+ void operator=(const MCExpr&); // DO NOT IMPLEMENT
+
protected:
MCExpr(ExprKind _Kind) : Kind(_Kind) {}
-
+
public:
- virtual ~MCExpr();
+ /// @name Accessors
+ /// @{
ExprKind getKind() const { return Kind; }
+ /// @}
+ /// @name Expression Evaluation
+ /// @{
+
/// EvaluateAsAbsolute - Try to evaluate the expression to an absolute value.
///
/// @param Res - The absolute value, if evaluation succeeds.
@@ -53,6 +61,8 @@
/// @result - True on success.
bool EvaluateAsRelocatable(MCContext &Ctx, MCValue &Res) const;
+ /// @}
+
static bool classof(const MCExpr *) { return true; }
};
@@ -60,14 +70,25 @@
class MCConstantExpr : public MCExpr {
int64_t Value;
-public:
- MCConstantExpr(int64_t _Value)
+ MCConstantExpr(int64_t _Value)
: MCExpr(MCExpr::Constant), Value(_Value) {}
-
+
+public:
+ /// @name Construction
+ /// @{
+
+ static const MCConstantExpr *Create(int64_t Value, MCContext &Ctx);
+
+ /// @}
+ /// @name Accessors
+ /// @{
+
int64_t getValue() const { return Value; }
- static bool classof(const MCExpr *E) {
- return E->getKind() == MCExpr::Constant;
+ /// @}
+
+ static bool classof(const MCExpr *E) {
+ return E->getKind() == MCExpr::Constant;
}
static bool classof(const MCConstantExpr *) { return true; }
};
@@ -79,16 +100,27 @@
/// assembler variable (defined constant), or constitute an implicit definition
/// of the symbol as external.
class MCSymbolRefExpr : public MCExpr {
- MCSymbol *Symbol;
+ const MCSymbol *Symbol;
-public:
- MCSymbolRefExpr(MCSymbol *_Symbol)
+ MCSymbolRefExpr(const MCSymbol *_Symbol)
: MCExpr(MCExpr::SymbolRef), Symbol(_Symbol) {}
-
- MCSymbol *getSymbol() const { return Symbol; }
- static bool classof(const MCExpr *E) {
- return E->getKind() == MCExpr::SymbolRef;
+public:
+ /// @name Construction
+ /// @{
+
+ static const MCSymbolRefExpr *Create(const MCSymbol *Symbol, MCContext &Ctx);
+
+ /// @}
+ /// @name Accessors
+ /// @{
+
+ const MCSymbol &getSymbol() const { return *Symbol; }
+
+ /// @}
+
+ static bool classof(const MCExpr *E) {
+ return E->getKind() == MCExpr::SymbolRef;
}
static bool classof(const MCSymbolRefExpr *) { return true; }
};
@@ -105,21 +137,44 @@
private:
Opcode Op;
- MCExpr *Expr;
+ const MCExpr *Expr;
-public:
- MCUnaryExpr(Opcode _Op, MCExpr *_Expr)
+ MCUnaryExpr(Opcode _Op, const MCExpr *_Expr)
: MCExpr(MCExpr::Unary), Op(_Op), Expr(_Expr) {}
- ~MCUnaryExpr() {
- delete Expr;
+
+public:
+ /// @name Construction
+ /// @{
+
+ static const MCUnaryExpr *Create(Opcode Op, const MCExpr *Expr,
+ MCContext &Ctx);
+ static const MCUnaryExpr *CreateLNot(const MCExpr *Expr, MCContext &Ctx) {
+ return Create(LNot, Expr, Ctx);
+ }
+ static const MCUnaryExpr *CreateMinus(const MCExpr *Expr, MCContext &Ctx) {
+ return Create(Minus, Expr, Ctx);
+ }
+ static const MCUnaryExpr *CreateNot(const MCExpr *Expr, MCContext &Ctx) {
+ return Create(Not, Expr, Ctx);
}
+ static const MCUnaryExpr *CreatePlus(const MCExpr *Expr, MCContext &Ctx) {
+ return Create(Plus, Expr, Ctx);
+ }
+
+ /// @}
+ /// @name Accessors
+ /// @{
+ /// getOpcode - Get the kind of this unary expression.
Opcode getOpcode() const { return Op; }
- MCExpr *getSubExpr() const { return Expr; }
+ /// getSubExpr - Get the child of this unary expression.
+ const MCExpr *getSubExpr() const { return Expr; }
- static bool classof(const MCExpr *E) {
- return E->getKind() == MCExpr::Unary;
+ /// @}
+
+ static bool classof(const MCExpr *E) {
+ return E->getKind() == MCExpr::Unary;
}
static bool classof(const MCUnaryExpr *) { return true; }
};
@@ -150,26 +205,107 @@
private:
Opcode Op;
- MCExpr *LHS, *RHS;
+ const MCExpr *LHS, *RHS;
-public:
- MCBinaryExpr(Opcode _Op, MCExpr *_LHS, MCExpr *_RHS)
+ MCBinaryExpr(Opcode _Op, const MCExpr *_LHS, const MCExpr *_RHS)
: MCExpr(MCExpr::Binary), Op(_Op), LHS(_LHS), RHS(_RHS) {}
- ~MCBinaryExpr() {
- delete LHS;
- delete RHS;
+
+public:
+ /// @name Construction
+ /// @{
+
+ static const MCBinaryExpr *Create(Opcode Op, const MCExpr *LHS,
+ const MCExpr *RHS, MCContext &Ctx);
+ static const MCBinaryExpr *CreateAdd(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Add, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateAnd(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(And, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateDiv(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Div, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateEQ(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(EQ, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateGT(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(GT, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateGTE(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(GTE, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateLAnd(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(LAnd, LHS, RHS, Ctx);
}
+ static const MCBinaryExpr *CreateLOr(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(LOr, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateLT(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(LT, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateLTE(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(LTE, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateMod(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Mod, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateMul(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Mul, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateNE(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(NE, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateOr(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Or, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateShl(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Shl, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateShr(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Shr, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateSub(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Sub, LHS, RHS, Ctx);
+ }
+ static const MCBinaryExpr *CreateXor(const MCExpr *LHS, const MCExpr *RHS,
+ MCContext &Ctx) {
+ return Create(Xor, LHS, RHS, Ctx);
+ }
+
+ /// @}
+ /// @name Accessors
+ /// @{
+ /// getOpcode - Get the kind of this binary expression.
Opcode getOpcode() const { return Op; }
/// getLHS - Get the left-hand side expression of the binary operator.
- MCExpr *getLHS() const { return LHS; }
+ const MCExpr *getLHS() const { return LHS; }
/// getRHS - Get the right-hand side expression of the binary operator.
- MCExpr *getRHS() const { return RHS; }
+ const MCExpr *getRHS() const { return RHS; }
+
+ /// @}
- static bool classof(const MCExpr *E) {
- return E->getKind() == MCExpr::Binary;
+ static bool classof(const MCExpr *E) {
+ return E->getKind() == MCExpr::Binary;
}
static bool classof(const MCBinaryExpr *) { return true; }
};
Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=80569&r1=80568&r2=80569&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Mon Aug 31 03:07:22 2009
@@ -13,9 +13,30 @@
#include "llvm/MC/MCValue.h"
using namespace llvm;
-MCExpr::~MCExpr() {
+const MCBinaryExpr * MCBinaryExpr::Create(Opcode Opc,
+ const MCExpr *LHS,
+ const MCExpr *RHS,
+ MCContext &Ctx) {
+ return new (Ctx) MCBinaryExpr(Opc, LHS, RHS);
}
+const MCUnaryExpr * MCUnaryExpr::Create(Opcode Opc,
+ const MCExpr *Expr,
+ MCContext &Ctx) {
+ return new (Ctx) MCUnaryExpr(Opc, Expr);
+}
+
+const MCConstantExpr *MCConstantExpr::Create(int64_t Value, MCContext &Ctx) {
+ return new (Ctx) MCConstantExpr(Value);
+}
+
+const MCSymbolRefExpr *MCSymbolRefExpr::Create(const MCSymbol *Sym,
+ MCContext &Ctx) {
+ return new (Ctx) MCSymbolRefExpr(Sym);
+}
+
+/* *** */
+
bool MCExpr::EvaluateAsAbsolute(MCContext &Ctx, int64_t &Res) const {
MCValue Value;
@@ -50,19 +71,16 @@
bool MCExpr::EvaluateAsRelocatable(MCContext &Ctx, MCValue &Res) const {
switch (getKind()) {
- default:
- assert(0 && "Invalid assembly expression kind!");
-
case Constant:
Res = MCValue::get(cast<MCConstantExpr>(this)->getValue());
return true;
case SymbolRef: {
- MCSymbol *Sym = cast<MCSymbolRefExpr>(this)->getSymbol();
- if (const MCValue *Value = Ctx.GetSymbolValue(Sym))
+ const MCSymbol &Sym = cast<MCSymbolRefExpr>(this)->getSymbol();
+ if (const MCValue *Value = Ctx.GetSymbolValue(&Sym))
Res = *Value;
else
- Res = MCValue::get(Sym, 0, 0);
+ Res = MCValue::get(&Sym, 0, 0);
return true;
}
@@ -158,5 +176,7 @@
return true;
}
}
-}
+ assert(0 && "Invalid assembly expression kind!");
+ return false;
+}
Modified: llvm/trunk/tools/llvm-mc/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.cpp?rev=80569&r1=80568&r2=80569&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.cpp Mon Aug 31 03:07:22 2009
@@ -173,7 +173,7 @@
///
/// parenexpr ::= expr)
///
-bool AsmParser::ParseParenExpr(MCExpr *&Res) {
+bool AsmParser::ParseParenExpr(const MCExpr *&Res) {
if (ParseExpression(Res)) return true;
if (Lexer.isNot(AsmToken::RParen))
return TokError("expected ')' in parentheses expression");
@@ -197,7 +197,7 @@
/// primaryexpr ::= symbol
/// primaryexpr ::= number
/// primaryexpr ::= ~,+,- primaryexpr
-bool AsmParser::ParsePrimaryExpr(MCExpr *&Res) {
+bool AsmParser::ParsePrimaryExpr(const MCExpr *&Res) {
switch (Lexer.getKind()) {
default:
return TokError("unknown token in expression");
@@ -205,7 +205,7 @@
Lexer.Lex(); // Eat the operator.
if (ParsePrimaryExpr(Res))
return true;
- Res = new MCUnaryExpr(MCUnaryExpr::LNot, Res);
+ Res = MCUnaryExpr::CreateLNot(Res, Ctx);
return false;
case AsmToken::String:
case AsmToken::Identifier: {
@@ -213,12 +213,12 @@
// handle things like LFOO+4.
MCSymbol *Sym = CreateSymbol(Lexer.getTok().getIdentifier());
- Res = new MCSymbolRefExpr(Sym);
+ Res = MCSymbolRefExpr::Create(Sym, Ctx);
Lexer.Lex(); // Eat identifier.
return false;
}
case AsmToken::Integer:
- Res = new MCConstantExpr(Lexer.getTok().getIntVal());
+ Res = MCConstantExpr::Create(Lexer.getTok().getIntVal(), Ctx);
Lexer.Lex(); // Eat token.
return false;
case AsmToken::LParen:
@@ -228,19 +228,19 @@
Lexer.Lex(); // Eat the operator.
if (ParsePrimaryExpr(Res))
return true;
- Res = new MCUnaryExpr(MCUnaryExpr::Minus, Res);
+ Res = MCUnaryExpr::CreateMinus(Res, Ctx);
return false;
case AsmToken::Plus:
Lexer.Lex(); // Eat the operator.
if (ParsePrimaryExpr(Res))
return true;
- Res = new MCUnaryExpr(MCUnaryExpr::Plus, Res);
+ Res = MCUnaryExpr::CreatePlus(Res, Ctx);
return false;
case AsmToken::Tilde:
Lexer.Lex(); // Eat the operator.
if (ParsePrimaryExpr(Res))
return true;
- Res = new MCUnaryExpr(MCUnaryExpr::Not, Res);
+ Res = MCUnaryExpr::CreateNot(Res, Ctx);
return false;
}
}
@@ -252,14 +252,14 @@
/// expr ::= expr *,/,%,<<,>> expr -> highest.
/// expr ::= primaryexpr
///
-bool AsmParser::ParseExpression(MCExpr *&Res) {
+bool AsmParser::ParseExpression(const MCExpr *&Res) {
Res = 0;
return ParsePrimaryExpr(Res) ||
ParseBinOpRHS(1, Res);
}
bool AsmParser::ParseAbsoluteExpression(int64_t &Res) {
- MCExpr *Expr;
+ const MCExpr *Expr;
SMLoc StartLoc = Lexer.getLoc();
if (ParseExpression(Expr))
@@ -272,7 +272,7 @@
}
bool AsmParser::ParseRelocatableExpression(MCValue &Res) {
- MCExpr *Expr;
+ const MCExpr *Expr;
SMLoc StartLoc = Lexer.getLoc();
if (ParseExpression(Expr))
@@ -285,7 +285,7 @@
}
bool AsmParser::ParseParenRelocatableExpression(MCValue &Res) {
- MCExpr *Expr;
+ const MCExpr *Expr;
SMLoc StartLoc = Lexer.getLoc();
if (ParseParenExpr(Expr))
@@ -372,7 +372,7 @@
/// ParseBinOpRHS - Parse all binary operators with precedence >= 'Precedence'.
/// Res contains the LHS of the expression on input.
-bool AsmParser::ParseBinOpRHS(unsigned Precedence, MCExpr *&Res) {
+bool AsmParser::ParseBinOpRHS(unsigned Precedence, const MCExpr *&Res) {
while (1) {
MCBinaryExpr::Opcode Kind = MCBinaryExpr::Add;
unsigned TokPrec = getBinOpPrecedence(Lexer.getKind(), Kind);
@@ -385,7 +385,7 @@
Lexer.Lex();
// Eat the next primary expression.
- MCExpr *RHS;
+ const MCExpr *RHS;
if (ParsePrimaryExpr(RHS)) return true;
// If BinOp binds less tightly with RHS than the operator after RHS, let
@@ -397,7 +397,7 @@
}
// Merge LHS and RHS according to operator.
- Res = new MCBinaryExpr(Kind, Res, RHS);
+ Res = MCBinaryExpr::Create(Kind, Res, RHS, Ctx);
}
}
Modified: llvm/trunk/tools/llvm-mc/AsmParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.h?rev=80569&r1=80568&r2=80569&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.h (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.h Mon Aug 31 03:07:22 2009
@@ -66,7 +66,7 @@
virtual bool Error(SMLoc L, const Twine &Msg);
- virtual bool ParseExpression(MCExpr *&Res);
+ virtual bool ParseExpression(const MCExpr *&Res);
virtual bool ParseAbsoluteExpression(int64_t &Res);
@@ -104,9 +104,9 @@
/// @see ParseRelocatableExpression, ParseParenExpr.
bool ParseParenRelocatableExpression(MCValue &Res);
- bool ParsePrimaryExpr(MCExpr *&Res);
- bool ParseBinOpRHS(unsigned Precedence, MCExpr *&Res);
- bool ParseParenExpr(MCExpr *&Res);
+ bool ParsePrimaryExpr(const MCExpr *&Res);
+ bool ParseBinOpRHS(unsigned Precedence, const MCExpr *&Res);
+ bool ParseParenExpr(const MCExpr *&Res);
/// ParseIdentifier - Parse an identifier or string (as a quoted identifier)
/// and set \arg Res to the identifier contents.
More information about the llvm-commits
mailing list