diff options
| author | Christian <c@ethdev.com> | 2014-12-11 00:15:17 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-12-11 00:15:17 +0800 |
| commit | 373f0da2675f298984f265672d7414a58c061512 (patch) | |
| tree | 72cf9741f01020410d10d07103d82714a4383bd0 /ExpressionCompiler.cpp | |
| parent | 130ff85e85de3ea8a9666f84843428a3a09b1aab (diff) | |
| download | dexon-solidity-373f0da2675f298984f265672d7414a58c061512.tar.gz dexon-solidity-373f0da2675f298984f265672d7414a58c061512.tar.zst dexon-solidity-373f0da2675f298984f265672d7414a58c061512.zip | |
Helper functions to access memory.
Diffstat (limited to 'ExpressionCompiler.cpp')
| -rw-r--r-- | ExpressionCompiler.cpp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/ExpressionCompiler.cpp b/ExpressionCompiler.cpp index 5e688f6b..d71d98cd 100644 --- a/ExpressionCompiler.cpp +++ b/ExpressionCompiler.cpp @@ -225,15 +225,14 @@ bool ExpressionCompiler::visit(FunctionCall& _functionCall) BOOST_THROW_EXCEPTION(CompilerError() << errinfo_sourceLocation(arguments[i]->getLocation()) << errinfo_comment("Type " + type.toString() + " not yet supported.")); - if (numBytes != 32) - if (type.getCategory() != Type::Category::STRING) - m_context << (u256(1) << ((32 - numBytes) * 8)) << eth::Instruction::MUL; - m_context << u256(dataOffset) << eth::Instruction::MSTORE; + bool const leftAligned = type.getCategory() == Type::Category::STRING; + CompilerUtils(m_context).storeInMemory(dataOffset, numBytes, leftAligned); dataOffset += numBytes; } //@todo only return the first return value for now - unsigned retSize = function.getReturnParameterTypes().empty() ? 0 - : function.getReturnParameterTypes().front()->getCalldataEncodedSize(); + Type const* firstType = function.getReturnParameterTypes().empty() ? nullptr : + function.getReturnParameterTypes().front().get(); + unsigned retSize = firstType ? firstType->getCalldataEncodedSize() : 0; // CALL arguments: outSize, outOff, inSize, inOff, value, addr, gas (stack top) m_context << u256(retSize) << u256(0) << u256(dataOffset) << u256(0) << u256(0); _functionCall.getExpression().accept(*this); // pushes addr and function index @@ -241,17 +240,10 @@ bool ExpressionCompiler::visit(FunctionCall& _functionCall) << u256(25) << eth::Instruction::GAS << eth::Instruction::SUB << eth::Instruction::CALL << eth::Instruction::POP; // @todo do not ignore failure indicator - if (retSize == 32) - m_context << u256(0) << eth::Instruction::MLOAD; - else if (retSize > 0) + if (retSize > 0) { - if (function.getReturnParameterTypes().front()->getCategory() == Type::Category::STRING) - m_context << (u256(1) << ((32 - retSize) * 8)) << eth::Instruction::DUP1 - << u256(0) << eth::Instruction::MLOAD - << eth::Instruction::DIV << eth::Instruction::MUL; - else - m_context << (u256(1) << ((32 - retSize) * 8)) - << u256(0) << eth::Instruction::MLOAD << eth::Instruction::DIV; + bool const leftAligned = firstType->getCategory() == Type::Category::STRING; + CompilerUtils(m_context).loadFromMemory(0, retSize, leftAligned); } break; } @@ -275,7 +267,8 @@ bool ExpressionCompiler::visit(FunctionCall& _functionCall) arguments.front()->accept(*this); appendTypeConversion(*arguments.front()->getType(), *function.getParameterTypes().front(), true); // @todo move this once we actually use memory - m_context << u256(0) << eth::Instruction::MSTORE << u256(32) << u256(0) << eth::Instruction::SHA3; + CompilerUtils(m_context).storeInMemory(0); + m_context << u256(32) << u256(0) << eth::Instruction::SHA3; break; case Location::ECRECOVER: case Location::SHA256: @@ -291,13 +284,13 @@ bool ExpressionCompiler::visit(FunctionCall& _functionCall) arguments[i]->accept(*this); appendTypeConversion(*arguments[i]->getType(), *function.getParameterTypes()[i], true); // @todo move this once we actually use memory - m_context << u256(i * 32) << eth::Instruction::MSTORE; + CompilerUtils(m_context).storeInMemory(i * 32); } m_context << u256(32) << u256(0) << u256(arguments.size() * 32) << u256(0) << u256(0) << contractAddress << u256(500) //@todo determine actual gas requirement << eth::Instruction::CALL - << eth::Instruction::POP - << u256(0) << eth::Instruction::MLOAD; + << eth::Instruction::POP; + CompilerUtils(m_context).loadFromMemory(0); break; } default: @@ -381,7 +374,8 @@ bool ExpressionCompiler::visit(IndexAccess& _indexAccess) *dynamic_cast<MappingType const&>(*_indexAccess.getBaseExpression().getType()).getKeyType(), true); // @todo move this once we actually use memory - m_context << u256(32) << eth::Instruction::MSTORE << u256(0) << eth::Instruction::MSTORE; + CompilerUtils(m_context).storeInMemory(0); + CompilerUtils(m_context).storeInMemory(32); m_context << u256(64) << u256(0) << eth::Instruction::SHA3; m_currentLValue = LValue(m_context, LValue::STORAGE, *_indexAccess.getType()); |