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

Rename EWasmBuiltinInterpreter to EwasmBuiltinInterpreter

Browse Source
This commit is contained in:
Alex Beregszaszi 2019-12-12 12:57:07 +00:00
parent 65e59ecd06
commit 9c27e98b83
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/tools/yulInterpreter/CMakeLists.txt
View File

@ -1,8 +1,8 @@
set(sources set(sources
EVMInstructionInterpreter.h EVMInstructionInterpreter.h
EVMInstructionInterpreter.cpp EVMInstructionInterpreter.cpp
EWasmBuiltinInterpreter.h EwasmBuiltinInterpreter.h
EWasmBuiltinInterpreter.cpp EwasmBuiltinInterpreter.cpp
Interpreter.h Interpreter.h
Interpreter.cpp Interpreter.cpp
) )

24
test/tools/yulInterpreter/EWasmBuiltinInterpreter.cpp → test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
View File

@ -15,10 +15,10 @@
along with solidity. If not, see <http://www.gnu.org/licenses/>. along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* Yul interpreter module that evaluates EWasm builtins. * Yul interpreter module that evaluates Ewasm builtins.
*/ */
#include <test/tools/yulInterpreter/EWasmBuiltinInterpreter.h> #include <test/tools/yulInterpreter/EwasmBuiltinInterpreter.h>
#include <test/tools/yulInterpreter/Interpreter.h> #include <test/tools/yulInterpreter/Interpreter.h>
@ -68,7 +68,7 @@ uint64_t clz(uint64_t _v)
using u512 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<512, 256, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>; using u512 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<512, 256, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
u256 EWasmBuiltinInterpreter::evalBuiltin(YulString _fun, vector<u256> const& _arguments) u256 EwasmBuiltinInterpreter::evalBuiltin(YulString _fun, vector<u256> const& _arguments)
{ {
vector<uint64_t> arg; vector<uint64_t> arg;
for (u256 const& a: _arguments) for (u256 const& a: _arguments)
@ -355,7 +355,7 @@ u256 EWasmBuiltinInterpreter::evalBuiltin(YulString _fun, vector<u256> const& _a
return 0; return 0;
} }
bool EWasmBuiltinInterpreter::accessMemory(u256 const& _offset, u256 const& _size) bool EwasmBuiltinInterpreter::accessMemory(u256 const& _offset, u256 const& _size)
{ {
if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size))) if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
{ {
@ -369,7 +369,7 @@ bool EWasmBuiltinInterpreter::accessMemory(u256 const& _offset, u256 const& _siz
return false; return false;
} }
bytes EWasmBuiltinInterpreter::readMemory(uint64_t _offset, uint64_t _size) bytes EwasmBuiltinInterpreter::readMemory(uint64_t _offset, uint64_t _size)
{ {
yulAssert(_size <= 0xffff, "Too large read."); yulAssert(_size <= 0xffff, "Too large read.");
bytes data(size_t(_size), uint8_t(0)); bytes data(size_t(_size), uint8_t(0));
@ -378,7 +378,7 @@ bytes EWasmBuiltinInterpreter::readMemory(uint64_t _offset, uint64_t _size)
return data; return data;
} }
uint64_t EWasmBuiltinInterpreter::readMemoryWord(uint64_t _offset) uint64_t EwasmBuiltinInterpreter::readMemoryWord(uint64_t _offset)
{ {
uint64_t r = 0; uint64_t r = 0;
for (size_t i = 0; i < 8; i++) for (size_t i = 0; i < 8; i++)
@ -386,18 +386,18 @@ uint64_t EWasmBuiltinInterpreter::readMemoryWord(uint64_t _offset)
return r; return r;
} }
void EWasmBuiltinInterpreter::writeMemoryWord(uint64_t _offset, uint64_t _value) void EwasmBuiltinInterpreter::writeMemoryWord(uint64_t _offset, uint64_t _value)
{ {
for (size_t i = 0; i < 8; i++) for (size_t i = 0; i < 8; i++)
m_state.memory[_offset + i] = uint8_t((_value >> (i * 8)) & 0xff); m_state.memory[_offset + i] = uint8_t((_value >> (i * 8)) & 0xff);
} }
void EWasmBuiltinInterpreter::writeMemoryByte(uint64_t _offset, uint8_t _value) void EwasmBuiltinInterpreter::writeMemoryByte(uint64_t _offset, uint8_t _value)
{ {
m_state.memory[_offset] = _value; m_state.memory[_offset] = _value;
} }
void EWasmBuiltinInterpreter::writeU256(uint64_t _offset, u256 _value, size_t _croppedTo) void EwasmBuiltinInterpreter::writeU256(uint64_t _offset, u256 _value, size_t _croppedTo)
{ {
accessMemory(_offset, _croppedTo); accessMemory(_offset, _croppedTo);
for (size_t i = 0; i < _croppedTo; i++) for (size_t i = 0; i < _croppedTo; i++)
@ -407,7 +407,7 @@ void EWasmBuiltinInterpreter::writeU256(uint64_t _offset, u256 _value, size_t _c
} }
} }
u256 EWasmBuiltinInterpreter::readU256(uint64_t _offset, size_t _croppedTo) u256 EwasmBuiltinInterpreter::readU256(uint64_t _offset, size_t _croppedTo)
{ {
accessMemory(_offset, _croppedTo); accessMemory(_offset, _croppedTo);
u256 value; u256 value;
@ -417,12 +417,12 @@ u256 EWasmBuiltinInterpreter::readU256(uint64_t _offset, size_t _croppedTo)
return value; return value;
} }
void EWasmBuiltinInterpreter::logTrace(dev::eth::Instruction _instruction, std::vector<u256> const& _arguments, bytes const& _data) void EwasmBuiltinInterpreter::logTrace(dev::eth::Instruction _instruction, std::vector<u256> const& _arguments, bytes const& _data)
{ {
logTrace(dev::eth::instructionInfo(_instruction).name, _arguments, _data); logTrace(dev::eth::instructionInfo(_instruction).name, _arguments, _data);
} }
void EWasmBuiltinInterpreter::logTrace(std::string const& _pseudoInstruction, std::vector<u256> const& _arguments, bytes const& _data) void EwasmBuiltinInterpreter::logTrace(std::string const& _pseudoInstruction, std::vector<u256> const& _arguments, bytes const& _data)
{ {
string message = _pseudoInstruction + "("; string message = _pseudoInstruction + "(";
for (size_t i = 0; i < _arguments.size(); ++i) for (size_t i = 0; i < _arguments.size(); ++i)

8
test/tools/yulInterpreter/EWasmBuiltinInterpreter.h → test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
View File

@ -15,7 +15,7 @@
along with solidity. If not, see <http://www.gnu.org/licenses/>. along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* Yul interpreter module that evaluates EWasm builtins. * Yul interpreter module that evaluates Ewasm builtins.
*/ */
#pragma once #pragma once
@ -45,7 +45,7 @@ namespace test
struct InterpreterState; struct InterpreterState;
/** /**
* Interprets EWasm builtins based on the current state and logs instructions with * Interprets Ewasm builtins based on the current state and logs instructions with
* side-effects. * side-effects.
* *
* Since this is mainly meant to be used for differential fuzz testing, it is focused * Since this is mainly meant to be used for differential fuzz testing, it is focused
@ -63,10 +63,10 @@ struct InterpreterState;
* The main focus is that the generated execution trace is the same for equivalent executions * The main focus is that the generated execution trace is the same for equivalent executions
* and likely to be different for non-equivalent executions. * and likely to be different for non-equivalent executions.
*/ */
class EWasmBuiltinInterpreter class EwasmBuiltinInterpreter
{ {
public: public:
explicit EWasmBuiltinInterpreter(InterpreterState& _state): explicit EwasmBuiltinInterpreter(InterpreterState& _state):
m_state(_state) m_state(_state)
{} {}
/// Evaluate builtin function /// Evaluate builtin function

4
test/tools/yulInterpreter/Interpreter.cpp
View File

@ -21,7 +21,7 @@
#include <test/tools/yulInterpreter/Interpreter.h> #include <test/tools/yulInterpreter/Interpreter.h>
#include <test/tools/yulInterpreter/EVMInstructionInterpreter.h> #include <test/tools/yulInterpreter/EVMInstructionInterpreter.h>
#include <test/tools/yulInterpreter/EWasmBuiltinInterpreter.h> #include <test/tools/yulInterpreter/EwasmBuiltinInterpreter.h>
#include <libyul/AsmData.h> #include <libyul/AsmData.h>
#include <libyul/Dialect.h> #include <libyul/Dialect.h>
@ -246,7 +246,7 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
else if (WasmDialect const* dialect = dynamic_cast<WasmDialect const*>(&m_dialect)) else if (WasmDialect const* dialect = dynamic_cast<WasmDialect const*>(&m_dialect))
if (dialect->builtin(_funCall.functionName.name)) if (dialect->builtin(_funCall.functionName.name))
{ {
EWasmBuiltinInterpreter interpreter(m_state); EwasmBuiltinInterpreter interpreter(m_state);
setValue(interpreter.evalBuiltin(_funCall.functionName.name, values())); setValue(interpreter.evalBuiltin(_funCall.functionName.name, values()));
return; return;
} }