diff options
| author | chriseth <chris@ethereum.org> | 2017-06-14 20:28:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 20:28:06 +0800 |
| commit | e232a105f036e40c9da5c3ce051c5ebd4236b558 (patch) | |
| tree | 4a9ffe35f31a77c94c0181d2aa9db895ce69d204 /libsolidity/interface/AssemblyStack.h | |
| parent | 6441baae6b742a41b174f4a177c611689b4613ed (diff) | |
| parent | 762bec9116d74a1022e4d06bd7112e4758a64b10 (diff) | |
| download | dexon-solidity-e232a105f036e40c9da5c3ce051c5ebd4236b558.tar dexon-solidity-e232a105f036e40c9da5c3ce051c5ebd4236b558.tar.gz dexon-solidity-e232a105f036e40c9da5c3ce051c5ebd4236b558.tar.bz2 dexon-solidity-e232a105f036e40c9da5c3ce051c5ebd4236b558.tar.lz dexon-solidity-e232a105f036e40c9da5c3ce051c5ebd4236b558.tar.xz dexon-solidity-e232a105f036e40c9da5c3ce051c5ebd4236b558.tar.zst dexon-solidity-e232a105f036e40c9da5c3ce051c5ebd4236b558.zip | |
Merge pull request #2327 from ethereum/assembler-object
Return assembler object in AssemblyStack
Diffstat (limited to 'libsolidity/interface/AssemblyStack.h')
| -rw-r--r-- | libsolidity/interface/AssemblyStack.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libsolidity/interface/AssemblyStack.h b/libsolidity/interface/AssemblyStack.h index ee2a334c..2ae596ed 100644 --- a/libsolidity/interface/AssemblyStack.h +++ b/libsolidity/interface/AssemblyStack.h @@ -38,6 +38,12 @@ struct AsmAnalysisInfo; struct Block; } +struct MachineAssemblyObject +{ + std::shared_ptr<eth::LinkerObject> bytecode; + std::string assembly; +}; + /* * Full assembly stack that can support EVM-assembly and JULIA as input and EVM, EVM1.5 and * eWasm as output. @@ -64,7 +70,7 @@ public: bool analyze(assembly::Block const& _block, Scanner const* _scanner = nullptr); /// Run the assembly step (should only be called after parseAndAnalyze). - eth::LinkerObject assemble(Machine _machine) const; + MachineAssemblyObject assemble(Machine _machine) const; /// @returns the errors generated during parsing, analysis (and potentially assembly). ErrorList const& errors() const { return m_errors; } |