diff options
| author | chriseth <chris@ethereum.org> | 2017-05-27 01:30:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 01:30:42 +0800 |
| commit | 788b64ea6181af6e7e364e86d64508c4809ca9b7 (patch) | |
| tree | 2a136a342d6f8980f96043b0f6ce74828f89fdd6 /solc/CommandLineInterface.h | |
| parent | e022f11cdb752a07b6c0f824f3e4f91233a19359 (diff) | |
| parent | fe32531a16322c9528c34cfbd32924b4c24a1f13 (diff) | |
| download | dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.gz dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.bz2 dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.lz dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.xz dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.tar.zst dexon-solidity-788b64ea6181af6e7e364e86d64508c4809ca9b7.zip | |
Merge pull request #2291 from ethereum/evm15
Allow different assembly types and target machines.
Diffstat (limited to 'solc/CommandLineInterface.h')
| -rw-r--r-- | solc/CommandLineInterface.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h index ebf52625..b482c20b 100644 --- a/solc/CommandLineInterface.h +++ b/solc/CommandLineInterface.h @@ -22,7 +22,7 @@ #pragma once #include <libsolidity/interface/CompilerStack.h> -#include <libsolidity/inlineasm/AsmStack.h> +#include <libsolidity/interface/AssemblyStack.h> #include <boost/program_options.hpp> #include <boost/filesystem/path.hpp> @@ -54,9 +54,7 @@ private: bool link(); void writeLinkedFiles(); - /// Parse assembly input. - bool assemble(); - void outputAssembly(); + bool assemble(AssemblyStack::Language _language, AssemblyStack::Machine _targetMachine); void outputCompilationResults(); @@ -86,6 +84,7 @@ private: bool m_error = false; ///< If true, some error occurred. bool m_onlyAssemble = false; + bool m_onlyLink = false; /// Compiler arguments variable map @@ -98,8 +97,6 @@ private: std::map<std::string, h160> m_libraries; /// Solidity compiler stack std::unique_ptr<dev::solidity::CompilerStack> m_compiler; - /// Assembly stacks for assembly-only mode - std::map<std::string, assembly::InlineAssemblyStack> m_assemblyStacks; }; } |