diff --git a/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul b/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul index b3cd4b48c..6ade23be3 100644 --- a/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul +++ b/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul @@ -19,4 +19,4 @@ // Memory dump: // 0: 0001000000000000000000000000000000000000000000000000000000000000 // Storage dump: -// 0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000002 +// 0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001 diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp index a86614b0c..8093a5cf7 100644 --- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp +++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp @@ -284,7 +284,7 @@ u256 EVMInstructionInterpreter::eval( case Instruction::PC: return 0x77; case Instruction::MSIZE: - return m_state.msize; + return 569; case Instruction::GAS: return 0x99; case Instruction::LOG0: @@ -468,7 +468,6 @@ bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _s if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size))) { u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f); - m_state.msize = max(m_state.msize, newSize); if (newSize < m_state.maxMemSize) { if (m_state.memory.size() < newSize) @@ -476,8 +475,6 @@ bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _s return true; } } - else - m_state.msize = u256(-1); return false; } diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h index 6fc20280a..3f8f41b93 100644 --- a/test/tools/yulInterpreter/Interpreter.h +++ b/test/tools/yulInterpreter/Interpreter.h @@ -66,8 +66,6 @@ struct InterpreterState dev::bytes returndata; /// TODO turn this into "vector with holes" for the randomized testing dev::bytes memory; - /// This is different than memory.size() because we ignore gas. - dev::u256 msize; std::map storage; dev::u160 address = 0x11111111; dev::u256 balance = 0x22222222;