cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5988 from ethereum/moveAsmCodeGen

Browse Source 
[REF] Move asm code gen
This commit is contained in:
chriseth 2019-02-13 12:22:33 +01:00 committed by GitHub
commit bbeab9ffdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/CMakeLists.txt
View File

@ -51,8 +51,6 @@ set(sources
codegen/ABIFunctions.h codegen/ABIFunctions.h
codegen/ArrayUtils.cpp codegen/ArrayUtils.cpp
codegen/ArrayUtils.h codegen/ArrayUtils.h
codegen/AsmCodeGen.cpp
codegen/AsmCodeGen.h
codegen/Compiler.cpp codegen/Compiler.cpp
codegen/Compiler.h codegen/Compiler.h
codegen/CompilerContext.cpp codegen/CompilerContext.cpp

4
libsolidity/codegen/CompilerContext.cpp
View File

@ -23,7 +23,6 @@
#include <libsolidity/codegen/CompilerContext.h> #include <libsolidity/codegen/CompilerContext.h>
#include <libsolidity/ast/AST.h> #include <libsolidity/ast/AST.h>
#include <libsolidity/codegen/AsmCodeGen.h>
#include <libsolidity/codegen/Compiler.h> #include <libsolidity/codegen/Compiler.h>
#include <libsolidity/codegen/CompilerUtils.h> #include <libsolidity/codegen/CompilerUtils.h>
#include <libsolidity/interface/Version.h> #include <libsolidity/interface/Version.h>
@ -31,6 +30,7 @@
#include <libyul/AsmParser.h> #include <libyul/AsmParser.h>
#include <libyul/AsmAnalysis.h> #include <libyul/AsmAnalysis.h>
#include <libyul/AsmAnalysisInfo.h> #include <libyul/AsmAnalysisInfo.h>
#include <libyul/backends/evm/AsmCodeGen.h>
#include <libyul/backends/evm/EVMDialect.h> #include <libyul/backends/evm/EVMDialect.h>
#include <libyul/YulString.h> #include <libyul/YulString.h>
@ -407,7 +407,7 @@ void CompilerContext::appendInlineAssembly(
} }
solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block."); solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
CodeGenerator::assemble(*parserResult, analysisInfo, *m_asm, identifierAccess, _system); yul::CodeGenerator::assemble(*parserResult, analysisInfo, *m_asm, identifierAccess, _system);
// Reset the source location to the one of the node (instead of the CODEGEN source location) // Reset the source location to the one of the node (instead of the CODEGEN source location)
updateSourceLocation(); updateSourceLocation();

6
libsolidity/codegen/ContractCompiler.cpp
View File

@ -21,14 +21,16 @@
*/ */
#include <libsolidity/ast/AST.h> #include <libsolidity/ast/AST.h>
#include <libsolidity/codegen/AsmCodeGen.h>
#include <libsolidity/codegen/CompilerUtils.h> #include <libsolidity/codegen/CompilerUtils.h>
#include <libsolidity/codegen/ContractCompiler.h> #include <libsolidity/codegen/ContractCompiler.h>
#include <libsolidity/codegen/ExpressionCompiler.h> #include <libsolidity/codegen/ExpressionCompiler.h>
#include <libyul/backends/evm/AsmCodeGen.h>
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
#include <libevmasm/Assembly.h> #include <libevmasm/Assembly.h>
#include <libevmasm/GasMeter.h> #include <libevmasm/GasMeter.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <boost/range/adaptor/reversed.hpp> #include <boost/range/adaptor/reversed.hpp>
@ -713,7 +715,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
} }
}; };
solAssert(_inlineAssembly.annotation().analysisInfo, ""); solAssert(_inlineAssembly.annotation().analysisInfo, "");
CodeGenerator::assemble( yul::CodeGenerator::assemble(
_inlineAssembly.operations(), _inlineAssembly.operations(),
*_inlineAssembly.annotation().analysisInfo, *_inlineAssembly.annotation().analysisInfo,
*m_context.assemblyPtr(), *m_context.assemblyPtr(),

4
libsolidity/interface/AssemblyStack.cpp
View File

@ -22,7 +22,6 @@
#include <libsolidity/interface/AssemblyStack.h> #include <libsolidity/interface/AssemblyStack.h>
#include <libsolidity/codegen/AsmCodeGen.h>
#include <libevmasm/Assembly.h> #include <libevmasm/Assembly.h>
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>
@ -30,6 +29,7 @@
#include <libyul/AsmAnalysisInfo.h> #include <libyul/AsmAnalysisInfo.h>
#include <libyul/AsmParser.h> #include <libyul/AsmParser.h>
#include <libyul/AsmPrinter.h> #include <libyul/AsmPrinter.h>
#include <libyul/backends/evm/AsmCodeGen.h>
#include <libyul/backends/evm/EVMAssembly.h> #include <libyul/backends/evm/EVMAssembly.h>
#include <libyul/backends/evm/EVMCodeTransform.h> #include <libyul/backends/evm/EVMCodeTransform.h>
#include <libyul/backends/evm/EVMDialect.h> #include <libyul/backends/evm/EVMDialect.h>
@ -151,7 +151,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine, bool _optimize)
{ {
MachineAssemblyObject object; MachineAssemblyObject object;
eth::Assembly assembly; eth::Assembly assembly;
EthAssemblyAdapter adapter(assembly); yul::EthAssemblyAdapter adapter(assembly);
compileEVM(adapter, false, _optimize); compileEVM(adapter, false, _optimize);
object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble()); object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble());
object.assembly = assembly.assemblyString(); object.assembly = assembly.assemblyString();

2
libyul/CMakeLists.txt
View File

@ -26,6 +26,8 @@ add_library(yul
Utilities.h Utilities.h
YulString.h YulString.h
backends/evm/AbstractAssembly.h backends/evm/AbstractAssembly.h
backends/evm/AsmCodeGen.h
backends/evm/AsmCodeGen.cpp
backends/evm/EVMAssembly.cpp backends/evm/EVMAssembly.cpp
backends/evm/EVMAssembly.h backends/evm/EVMAssembly.h
backends/evm/EVMCodeTransform.cpp backends/evm/EVMCodeTransform.cpp

3
libsolidity/codegen/AsmCodeGen.cpp → libyul/backends/evm/AsmCodeGen.cpp
View File

@ -18,7 +18,7 @@
* Adaptor between the abstract assembly and eth assembly. * Adaptor between the abstract assembly and eth assembly.
*/ */
#include <libsolidity/codegen/AsmCodeGen.h> #include <libyul/backends/evm/AsmCodeGen.h>
#include <libyul/AsmData.h> #include <libyul/AsmData.h>
#include <libyul/AsmAnalysisInfo.h> #include <libyul/AsmAnalysisInfo.h>
@ -41,7 +41,6 @@ using namespace std;
using namespace dev; using namespace dev;
using namespace langutil; using namespace langutil;
using namespace yul; using namespace yul;
using namespace dev::solidity;
EthAssemblyAdapter::EthAssemblyAdapter(eth::Assembly& _assembly): EthAssemblyAdapter::EthAssemblyAdapter(eth::Assembly& _assembly):
m_assembly(_assembly) m_assembly(_assembly)

30
libsolidity/codegen/AsmCodeGen.h → libyul/backends/evm/AsmCodeGen.h
View File

@ -20,16 +20,11 @@
#pragma once #pragma once
#include <libyul/AsmAnalysis.h>
#include <libyul/backends/evm/AbstractAssembly.h> #include <libyul/backends/evm/AbstractAssembly.h>
#include <libyul/AsmAnalysis.h>
#include <liblangutil/SourceLocation.h> #include <liblangutil/SourceLocation.h>
#include <functional> #include <functional>
namespace yul
{
struct Block;
}
namespace dev namespace dev
{ {
namespace eth namespace eth
@ -37,18 +32,20 @@ namespace eth
class Assembly; class Assembly;
class AssemblyItem; class AssemblyItem;
} }
}
namespace solidity namespace yul
{ {
struct Block;
class EthAssemblyAdapter: public yul::AbstractAssembly class EthAssemblyAdapter: public AbstractAssembly
{ {
public: public:
explicit EthAssemblyAdapter(eth::Assembly& _assembly); explicit EthAssemblyAdapter(dev::eth::Assembly& _assembly);
void setSourceLocation(langutil::SourceLocation const& _location) override; void setSourceLocation(langutil::SourceLocation const& _location) override;
int stackHeight() const override; int stackHeight() const override;
void appendInstruction(solidity::Instruction _instruction) override; void appendInstruction(dev::solidity::Instruction _instruction) override;
void appendConstant(u256 const& _constant) override; void appendConstant(dev::u256 const& _constant) override;
void appendLabel(LabelID _labelId) override; void appendLabel(LabelID _labelId) override;
void appendLabelReference(LabelID _labelId) override; void appendLabelReference(LabelID _labelId) override;
size_t newLabelId() override; size_t newLabelId() override;
@ -67,9 +64,9 @@ public:
SubID appendData(dev::bytes const& _data) override; SubID appendData(dev::bytes const& _data) override;
private: private:
static LabelID assemblyTagToIdentifier(eth::AssemblyItem const& _tag); static LabelID assemblyTagToIdentifier(dev::eth::AssemblyItem const& _tag);
eth::Assembly& m_assembly; dev::eth::Assembly& m_assembly;
std::map<SubID, dev::u256> m_dataHashBySubId; std::map<SubID, dev::u256> m_dataHashBySubId;
size_t m_nextDataCounter = std::numeric_limits<size_t>::max() / 2; size_t m_nextDataCounter = std::numeric_limits<size_t>::max() / 2;
}; };
@ -79,14 +76,13 @@ class CodeGenerator
public: public:
/// Performs code generation and appends generated to _assembly. /// Performs code generation and appends generated to _assembly.
static void assemble( static void assemble(
yul::Block const& _parsedData, Block const& _parsedData,
yul::AsmAnalysisInfo& _analysisInfo, AsmAnalysisInfo& _analysisInfo,
dev::eth::Assembly& _assembly, dev::eth::Assembly& _assembly,
yul::ExternalIdentifierAccess const& _identifierAccess = yul::ExternalIdentifierAccess(), ExternalIdentifierAccess const& _identifierAccess = ExternalIdentifierAccess(),
bool _useNamedLabelsForFunctions = false, bool _useNamedLabelsForFunctions = false,
bool _optimize = false bool _optimize = false
); );
}; };
} }
}