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

Use native shift instructions in ABIFunctions on Constantinople

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-04-05 16:56:02 +02:00
parent 22bfd3da41
commit c3608eaf90
3 changed files with 70 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
libsolidity/codegen/ABIFunctions.cpp
View File

@ -1401,37 +1401,74 @@ string ABIFunctions::copyToMemoryFunction(bool _fromCalldata)
string ABIFunctions::shiftLeftFunction(size_t _numBits) string ABIFunctions::shiftLeftFunction(size_t _numBits)
{ {
solAssert(_numBits < 256, "");
string functionName = "shift_left_" + to_string(_numBits); string functionName = "shift_left_" + to_string(_numBits);
return createFunction(functionName, [&]() { if (m_evmVersion.hasBitwiseShifting())
solAssert(_numBits < 256, ""); {
return return createFunction(functionName, [&]() {
Whiskers(R"( return
function <functionName>(value) -> newValue { Whiskers(R"(
newValue := mul(value, <multiplier>) function <functionName>(value) -> newValue {
} newValue := shl(<numBits>, value)
)") }
("functionName", functionName) )")
("multiplier", toCompactHexWithPrefix(u256(1) << _numBits)) ("functionName", functionName)
.render(); ("numBits", to_string(_numBits))
}); .render();
});
}
else
{
return createFunction(functionName, [&]() {
return
Whiskers(R"(
function <functionName>(value) -> newValue {
newValue := mul(value, <multiplier>)
}
)")
("functionName", functionName)
("multiplier", toCompactHexWithPrefix(u256(1) << _numBits))
.render();
});
}
} }
string ABIFunctions::shiftRightFunction(size_t _numBits, bool _signed) string ABIFunctions::shiftRightFunction(size_t _numBits, bool _signed)
{ {
solAssert(_numBits < 256, "");
string functionName = "shift_right_" + to_string(_numBits) + (_signed ? "_signed" : "_unsigned"); string functionName = "shift_right_" + to_string(_numBits) + (_signed ? "_signed" : "_unsigned");
return createFunction(functionName, [&]() { if (m_evmVersion.hasBitwiseShifting())
solAssert(_numBits < 256, ""); {
return return createFunction(functionName, [&]() {
Whiskers(R"( return
function <functionName>(value) -> newValue { Whiskers(R"(
newValue := <div>(value, <multiplier>) function <functionName>(value) -> newValue {
} newValue := <shiftOp>(<numBits>, value)
)") }
("functionName", functionName) )")
("div", _signed ? "sdiv" : "div") ("functionName", functionName)
("multiplier", toCompactHexWithPrefix(u256(1) << _numBits)) ("shiftOp", _signed ? "sar" : "shr")
.render(); ("numBits", to_string(_numBits))
}); .render();
});
}
else
{
return createFunction(functionName, [&]() {
return
Whiskers(R"(
function <functionName>(value) -> newValue {
newValue := <div>(value, <multiplier>)
}
)")
("functionName", functionName)
("div", _signed ? "sdiv" : "div")
("multiplier", toCompactHexWithPrefix(u256(1) << _numBits))
.render();
});
}
} }
string ABIFunctions::roundUpFunction() string ABIFunctions::roundUpFunction()

6
libsolidity/codegen/ABIFunctions.h
View File

@ -22,6 +22,8 @@
#pragma once #pragma once
#include <libsolidity/interface/EVMVersion.h>
#include <libsolidity/ast/ASTForward.h> #include <libsolidity/ast/ASTForward.h>
#include <vector> #include <vector>
@ -48,6 +50,8 @@ using TypePointers = std::vector<TypePointer>;
class ABIFunctions class ABIFunctions
{ {
public: public:
explicit ABIFunctions(EVMVersion _evmVersion = EVMVersion{}) : m_evmVersion(_evmVersion) {}
/// @returns name of an assembly function to ABI-encode values of @a _givenTypes /// @returns name of an assembly function to ABI-encode values of @a _givenTypes
/// into memory, converting the types to @a _targetTypes on the fly. /// into memory, converting the types to @a _targetTypes on the fly.
/// Parameters are: <headStart> <value_n> ... <value_1>, i.e. /// Parameters are: <headStart> <value_n> ... <value_1>, i.e.
@ -225,6 +229,8 @@ private:
/// Map from function name to code for a multi-use function. /// Map from function name to code for a multi-use function.
std::map<std::string, std::string> m_requestedFunctions; std::map<std::string, std::string> m_requestedFunctions;
EVMVersion m_evmVersion;
}; };
} }

3
libsolidity/codegen/CompilerContext.h
View File

@ -55,7 +55,8 @@ public:
explicit CompilerContext(EVMVersion _evmVersion = EVMVersion{}, CompilerContext* _runtimeContext = nullptr): explicit CompilerContext(EVMVersion _evmVersion = EVMVersion{}, CompilerContext* _runtimeContext = nullptr):
m_asm(std::make_shared<eth::Assembly>()), m_asm(std::make_shared<eth::Assembly>()),
m_evmVersion(_evmVersion), m_evmVersion(_evmVersion),
m_runtimeContext(_runtimeContext) m_runtimeContext(_runtimeContext),
m_abiFunctions(m_evmVersion)
{ {
if (m_runtimeContext) if (m_runtimeContext)
m_runtimeSub = size_t(m_asm->newSub(m_runtimeContext->m_asm).data()); m_runtimeSub = size_t(m_asm->newSub(m_runtimeContext->m_asm).data());