diff options
| author | chriseth <c@ethdev.com> | 2015-09-10 18:01:05 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-09-11 21:21:37 +0800 |
| commit | a9edc7b1a601747f96e47fe60a5fc10df489696f (patch) | |
| tree | 8165a9a44cc6cf23f6a8d8b152facfe3fd65a909 /libsolidity/CompilerContext.h | |
| parent | 337fde9d11adac85800b405a3fdb4bcd09039ebf (diff) | |
| download | dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.gz dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.zst dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.zip | |
Transition from bytecode to more general linker objects.
Diffstat (limited to 'libsolidity/CompilerContext.h')
| -rw-r--r-- | libsolidity/CompilerContext.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libsolidity/CompilerContext.h b/libsolidity/CompilerContext.h index 590c8797..34b63a9c 100644 --- a/libsolidity/CompilerContext.h +++ b/libsolidity/CompilerContext.h @@ -47,8 +47,8 @@ public: void addVariable(VariableDeclaration const& _declaration, unsigned _offsetToCurrent = 0); void removeVariable(VariableDeclaration const& _declaration); - void setCompiledContracts(std::map<ContractDefinition const*, bytes const*> const& _contracts) { m_compiledContracts = _contracts; } - bytes const& compiledContract(ContractDefinition const& _contract) const; + void setCompiledContracts(std::map<ContractDefinition const*, eth::Assembly const*> const& _contracts) { m_compiledContracts = _contracts; } + eth::Assembly const& compiledContract(ContractDefinition const& _contract) const; void setStackOffset(int _offset) { m_asm.setDeposit(_offset); } void adjustStackOffset(int _adjustment) { m_asm.adjustDeposit(_adjustment); } @@ -135,8 +135,8 @@ public: return m_asm.stream(_stream, "", _sourceCodes, _inJsonFormat); } - bytes assembledBytecode() { return m_asm.assemble(); } - bytes assembledRuntimeBytecode(size_t _subIndex) { m_asm.assemble(); return m_asm.data(u256(_subIndex)); } + eth::LinkerObject const& assembledObject() { return m_asm.assemble(); } + eth::LinkerObject const& assembledRuntimeObject(size_t _subIndex) { return m_asm.sub(_subIndex).assemble(); } /** * Helper class to pop the visited nodes stack when a scope closes @@ -164,7 +164,7 @@ private: /// Magic global variables like msg, tx or this, distinguished by type. std::set<Declaration const*> m_magicGlobals; /// Other already compiled contracts to be used in contract creation calls. - std::map<ContractDefinition const*, bytes const*> m_compiledContracts; + std::map<ContractDefinition const*, eth::Assembly const*> m_compiledContracts; /// Storage offsets of state variables std::map<Declaration const*, std::pair<u256, unsigned>> m_stateVariables; /// Offsets of local variables on the stack (relative to stack base). |