diff options
| -rw-r--r-- | llvm/include/llvm/MC/MCContext.h | 3 | ||||
| -rw-r--r-- | llvm/lib/MC/MCContext.cpp | 16 | ||||
| -rw-r--r-- | llvm/tools/llvm-mc/llvm-mc.cpp | 19 |
3 files changed, 22 insertions, 16 deletions
diff --git a/llvm/include/llvm/MC/MCContext.h b/llvm/include/llvm/MC/MCContext.h index e637afb9871..4c1367343db 100644 --- a/llvm/include/llvm/MC/MCContext.h +++ b/llvm/include/llvm/MC/MCContext.h @@ -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 diff --git a/llvm/lib/MC/MCContext.cpp b/llvm/lib/MC/MCContext.cpp index 7932fe441e3..77fe015eefe 100644 --- a/llvm/lib/MC/MCContext.cpp +++ b/llvm/lib/MC/MCContext.cpp @@ -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 //===----------------------------------------------------------------------===// diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp index 452777b05c5..8a904a8ad7c 100644 --- a/llvm/tools/llvm-mc/llvm-mc.cpp +++ b/llvm/tools/llvm-mc/llvm-mc.cpp @@ -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; } |
