[llvm] Implement support for -defsym assembler option
Summary: Changes to llvm-mc to move common logic to separate function. Related clang patch: https://reviews.llvm.org/D26213 Reviewers: rafael, t.p.northover, colinl, echristo, rengolin Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D26214 llvm-svn: 288396
This commit is contained in:
parent
17d5b6b493
commit
32360071a0
|
@ -302,6 +302,9 @@ namespace llvm {
|
|||
/// Get the symbol for \p Name, or null.
|
||||
MCSymbol *lookupSymbol(const Twine &Name) const;
|
||||
|
||||
/// Set value for a symbol.
|
||||
int setSymbolValue(MCStreamer &Streamer, std::string &I);
|
||||
|
||||
/// getSymbols - Get a reference for the symbol table for clients that
|
||||
/// want to, for example, iterate over all symbols. 'const' because we
|
||||
/// still want any modifications to the table itself to use the MCContext
|
||||
|
|
|
@ -260,6 +260,22 @@ MCSymbol *MCContext::lookupSymbol(const Twine &Name) const {
|
|||
return Symbols.lookup(NameRef);
|
||||
}
|
||||
|
||||
int MCContext::setSymbolValue(MCStreamer &Streamer, std::string &I) {
|
||||
auto Pair = StringRef(I).split('=');
|
||||
if (Pair.second.empty()) {
|
||||
errs() << "error: defsym must be of the form: sym=value: " << I << "\n";
|
||||
return 1;
|
||||
}
|
||||
int64_t Value;
|
||||
if (Pair.second.getAsInteger(0, Value)) {
|
||||
errs() << "error: Value is not an integer: " << Pair.second << "\n";
|
||||
return 1;
|
||||
}
|
||||
auto Symbol = getOrCreateSymbol(Pair.first);
|
||||
Streamer.EmitAssignment(Symbol, MCConstantExpr::create(Value, *this));
|
||||
return 0;
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Section Management
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
|
|
@ -393,23 +393,10 @@ static int AsLexInput(SourceMgr &SrcMgr, MCAsmInfo &MAI,
|
|||
return Error;
|
||||
}
|
||||
|
||||
static int fillCommandLineSymbols(MCAsmParser &Parser){
|
||||
for(auto &I: DefineSymbol){
|
||||
auto Pair = StringRef(I).split('=');
|
||||
if(Pair.second.empty()){
|
||||
errs() << "error: defsym must be of the form: sym=value: " << I;
|
||||
static int fillCommandLineSymbols(MCAsmParser &Parser) {
|
||||
for (auto &I: DefineSymbol)
|
||||
if (Parser.getContext().setSymbolValue(Parser.getStreamer(), I))
|
||||
return 1;
|
||||
}
|
||||
int64_t Value;
|
||||
if(Pair.second.getAsInteger(0, Value)){
|
||||
errs() << "error: Value is not an integer: " << Pair.second;
|
||||
return 1;
|
||||
}
|
||||
auto &Context = Parser.getContext();
|
||||
auto Symbol = Context.getOrCreateSymbol(Pair.first);
|
||||
Parser.getStreamer().EmitAssignment(Symbol,
|
||||
MCConstantExpr::create(Value, Context));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue