Skip to content
This repository was archived by the owner on Nov 17, 2025. It is now read-only.

EIP-4200: Add RJUMP and RJUMPI instructions #610

Draft
gumb0 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

EIP-4200: Add RJUMP and RJUMPI instructions #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/evmc/instructions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ enum evmc_opcode
OP_MSIZE = 0x59,
OP_GAS = 0x5a,
OP_JUMPDEST = 0x5b,
OP_RJUMP = 0x5c,
OP_RJUMPI = 0x5d,

OP_PUSH0 = 0x5f,
OP_PUSH1 = 0x60,
Expand Down
8 changes: 4 additions & 4 deletions lib/instructions/instruction_metrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ static struct evmc_instruction_metrics cancun_metrics[256] = {
/* MSIZE = 0x59 */ {BASE, 0, 1},
/* GAS = 0x5a */ {BASE, 0, 1},
/* JUMPDEST = 0x5b */ {1, 0, 0},
/* = 0x5c */ {UNDEFINED, 0, 0},
/* = 0x5d */ {UNDEFINED, 0, 0},
/* RJUMP = 0x5c */ {BASE, 0, 0},
/* RJUMPI = 0x5d */ {4, 1, -1},
/* = 0x5e */ {UNDEFINED, 0, 0},
/* PUSH0 = 0x5f */ {BASE, 0, 1},
/* PUSH1 = 0x60 */ {VERYLOW, 0, 1},
Expand Down Expand Up @@ -386,8 +386,8 @@ static struct evmc_instruction_metrics shanghai_metrics[256] = {
/* MSIZE = 0x59 */ {BASE, 0, 1},
/* GAS = 0x5a */ {BASE, 0, 1},
/* JUMPDEST = 0x5b */ {1, 0, 0},
/* = 0x5c */ {UNDEFINED, 0, 0},
/* = 0x5d */ {UNDEFINED, 0, 0},
/* RJUMP = 0x5c */ {BASE, 0, 0},
/* RJUMPI = 0x5d */ {4, 1, -1},
/* = 0x5e */ {UNDEFINED, 0, 0},
/* PUSH0 = 0x5f */ {BASE, 0, 1},
/* PUSH1 = 0x60 */ {VERYLOW, 0, 1},
Expand Down
8 changes: 4 additions & 4 deletions lib/instructions/instruction_names.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ static const char* cancun_names[256] = {
/* 0x59 */ "MSIZE",
/* 0x5a */ "GAS",
/* 0x5b */ "JUMPDEST",
/* 0x5c */ NULL,
/* 0x5d */ NULL,
/* 0x5c */ "RJUMP",
/* 0x5d */ "RJUMPI",
/* 0x5e */ NULL,
/* 0x5f */ "PUSH0",
/* 0x60 */ "PUSH1",
Expand Down Expand Up @@ -356,8 +356,8 @@ static const char* shanghai_names[256] = {
/* 0x59 */ "MSIZE",
/* 0x5a */ "GAS",
/* 0x5b */ "JUMPDEST",
/* 0x5c */ NULL,
/* 0x5d */ NULL,
/* 0x5c */ "RJUMP",
/* 0x5d */ "RJUMPI",
/* 0x5e */ NULL,
/* 0x5f */ "PUSH0",
/* 0x60 */ "PUSH1",
Expand Down
30 changes: 30 additions & 0 deletions test/unittests/instructions_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,3 +394,33 @@ TEST(instructions, shanghai_hard_fork)
EXPECT_EQ(sn[OP_PUSH0], std::string{"PUSH0"});
EXPECT_TRUE(pn[OP_PUSH0] == nullptr);
}

TEST(instructions, cancun_hard_fork)
{
const auto c = evmc_get_instruction_metrics_table(EVMC_CANCUN);
const auto s = evmc_get_instruction_metrics_table(EVMC_SHANGHAI);
const auto cn = evmc_get_instruction_names_table(EVMC_CANCUN);
const auto sn = evmc_get_instruction_names_table(EVMC_SHANGHAI);

for (int op = 0x00; op <= 0xff; ++op)
{
if (op == OP_RJUMP || op == OP_RJUMPI)
continue;
EXPECT_EQ(c[op], s[op]) << op;
EXPECT_STREQ(cn[op], sn[op]) << op;
}

// EIP-4200: Static relative jumps
EXPECT_EQ(c[OP_RJUMP].gas_cost, 5);
EXPECT_EQ(c[OP_RJUMP].stack_height_required, 0);
EXPECT_EQ(c[OP_RJUMP].stack_height_change, 0);
EXPECT_EQ(s[OP_RJUMP].gas_cost, 0);
EXPECT_EQ(cn[OP_RJUMP], std::string{"RJUMP"});
EXPECT_TRUE(sn[OP_RJUMP] == nullptr);
EXPECT_EQ(c[OP_RJUMPI].gas_cost, 7);
EXPECT_EQ(c[OP_RJUMPI].stack_height_required, 1);
EXPECT_EQ(c[OP_RJUMPI].stack_height_change, -1);
EXPECT_EQ(s[OP_RJUMPI].gas_cost, 0);
EXPECT_EQ(cn[OP_RJUMPI], std::string{"RJUMPI"});
EXPECT_TRUE(sn[OP_RJUMPI] == nullptr);
}