diff options
author | chriseth <chris@ethereum.org> | 2017-05-24 01:21:14 +0800 |
---|---|---|
committer | chriseth <chris@ethereum.org> | 2017-05-26 21:08:27 +0800 |
commit | 261731f7eea48902983c55163d377e26bbca07da (patch) | |
tree | 42b1c3c91e36fad0b5a35232ffca0fa0687c9090 /libsolidity/inlineasm/AsmCodeGen.cpp | |
parent | 71b923cc36d33bf3e173f2210b33895df49fcbba (diff) | |
download | dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.gz dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.bz2 dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.lz dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.xz dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.tar.zst dexon-solidity-261731f7eea48902983c55163d377e26bbca07da.zip |
Adapt EVM codegen to new namespace.
Diffstat (limited to 'libsolidity/inlineasm/AsmCodeGen.cpp')
-rw-r--r-- | libsolidity/inlineasm/AsmCodeGen.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/libsolidity/inlineasm/AsmCodeGen.cpp b/libsolidity/inlineasm/AsmCodeGen.cpp index ce2d8a1d..6a44faac 100644 --- a/libsolidity/inlineasm/AsmCodeGen.cpp +++ b/libsolidity/inlineasm/AsmCodeGen.cpp @@ -32,7 +32,8 @@ #include <libevmasm/SourceLocation.h> #include <libevmasm/Instruction.h> -#include <libjulia/backends/AbstractAssembly.h> +#include <libjulia/backends/evm/AbstractAssembly.h> +#include <libjulia/backends/evm/EVMCodeTransform.h> #include <libdevcore/CommonIO.h> @@ -48,15 +49,6 @@ using namespace dev; using namespace dev::solidity; using namespace dev::solidity::assembly; -struct GeneratorState -{ - GeneratorState(ErrorList& _errors, AsmAnalysisInfo& _analysisInfo): - errors(_errors), info(_analysisInfo) {} - - ErrorList& errors; - AsmAnalysisInfo info; -}; - class EthAssemblyAdapter: public julia::AbstractAssembly { public: @@ -110,13 +102,12 @@ private: eth::Assembly assembly::CodeGenerator::assemble( Block const& _parsedData, AsmAnalysisInfo& _analysisInfo, - ExternalIdentifierAccess const& _identifierAccess + julia::ExternalIdentifierAccess const& _identifierAccess ) { eth::Assembly assembly; - GeneratorState state(m_errors, _analysisInfo); EthAssemblyAdapter assemblyAdapter(assembly); - CodeTransform(state, assemblyAdapter, _parsedData, _identifierAccess); + julia::CodeTransform(m_errors, assemblyAdapter, _parsedData, _analysisInfo, _identifierAccess); return assembly; } @@ -124,10 +115,9 @@ void assembly::CodeGenerator::assemble( Block const& _parsedData, AsmAnalysisInfo& _analysisInfo, eth::Assembly& _assembly, - ExternalIdentifierAccess const& _identifierAccess + julia::ExternalIdentifierAccess const& _identifierAccess ) { - GeneratorState state(m_errors, _analysisInfo); EthAssemblyAdapter assemblyAdapter(_assembly); - CodeTransform(state, assemblyAdapter, _parsedData, _identifierAccess); + julia::CodeTransform(m_errors, assemblyAdapter, _parsedData, _analysisInfo, _identifierAccess); } |