Add cas cost for posh0, shr and missed log1 instruction

NilFoundation · Aug 13, 2024 · 1506df3 · 1506df3
1 parent d2b4bb1
commit 1506df3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/lib/assigner/evmone/instructions.hpp b/lib/assigner/evmone/instructions.hpp
@@ -1194,6 +1194,10 @@ struct instructions {
         state.rw_trace.push_back(stack_operation<BlueprintFieldType>(state.call_id,  (uint16_t)(stack.size(state.stack_space.bottom()) - addr), state.rw_trace.size(), true, stack[addr - 1]));
     }
 
+    static void log(StackTop<BlueprintFieldType> /*stack*/, ExecutionState<BlueprintFieldType>& /*state*/) noexcept {
+        // do nothing
+    }
+
     static code_iterator dupn(StackTop<BlueprintFieldType> stack, ExecutionState<BlueprintFieldType>& state, code_iterator pos) noexcept
     {
         const uint16_t n = pos[1] + 1;

diff --git a/lib/assigner/evmone/instructions_traits.hpp b/lib/assigner/evmone/instructions_traits.hpp
@@ -99,6 +99,8 @@ constexpr inline GasCostTable gas_costs = []() noexcept {
     table[EVMC_FRONTIER][OP_MSIZE] = 2;
     table[EVMC_FRONTIER][OP_GAS] = 2;
     table[EVMC_FRONTIER][OP_JUMPDEST] = 1;
+    table[EVMC_FRONTIER][OP_SHR] = 3;
+    table[EVMC_FRONTIER][OP_PUSH0] = 2;
     for (auto op = size_t{OP_PUSH1}; op <= OP_PUSH32; ++op)
         table[EVMC_FRONTIER][op] = 3;
     for (auto op = size_t{OP_DUP1}; op <= OP_DUP16; ++op)
@@ -116,6 +118,7 @@ constexpr inline GasCostTable gas_costs = []() noexcept {
     table[EVMC_FRONTIER][OP_RETURN] = 0;
     table[EVMC_FRONTIER][OP_INVALID] = 0;
     table[EVMC_FRONTIER][OP_SELFDESTRUCT] = 0;
+    table[EVMC_FRONTIER][OP_LOG1] = 0;
 
     table[EVMC_HOMESTEAD] = table[EVMC_FRONTIER];
     table[EVMC_HOMESTEAD][OP_DELEGATECALL] = 40;

diff --git a/lib/assigner/evmone/instructions_xmacro.hpp b/lib/assigner/evmone/instructions_xmacro.hpp
@@ -211,6 +211,7 @@
                                                             \
     ON_OPCODE_IDENTIFIER(OP_SWAP, instructions<BlueprintFieldType>::template swap<0>)                  \
     ON_OPCODE_IDENTIFIER(OP_DUP, instructions<BlueprintFieldType>::template dup<0>)                    \
+    ON_OPCODE_IDENTIFIER(OP_LOG1, instructions<BlueprintFieldType>::log)                    \
     ON_OPCODE_UNDEFINED(0xa8)                               \
     ON_OPCODE_UNDEFINED(0xa9)                               \
     ON_OPCODE_UNDEFINED(0xaa)                               \