Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core/vm: move TSTORE,TLOAD to correct opcode nums #27613

Merged
merged 2 commits into from Jun 27, 2023
Merged

core/vm: move TSTORE,TLOAD to correct opcode nums #27613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692fc2f
core/vm: move TSTORE,TLOAD to correct opcode nums
MariusVanDerWijden Jun 26, 2023
075e6b9
core/vm: cleanup
MariusVanDerWijden Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 6 additions & 12 deletions core/vm/opcodes.go
View file
Open in desktop
Expand Up @@ -117,6 +117,8 @@ const (
MSIZE OpCode = 0x59
GAS OpCode = 0x5a
JUMPDEST OpCode = 0x5b
TLOAD OpCode = 0x5c
TSTORE OpCode = 0x5d
PUSH0 OpCode = 0x5f
)

Expand Down Expand Up @@ -205,12 +207,6 @@ const (
LOG4
)

// 0xb0 range.
const (
TLOAD OpCode = 0xb3
TSTORE OpCode = 0xb4
)

// 0xf0 range - closures.
const (
CREATE OpCode = 0xf0
Expand Down Expand Up @@ -304,6 +300,8 @@ var opCodeToString = map[OpCode]string{
MSIZE: "MSIZE",
GAS: "GAS",
JUMPDEST: "JUMPDEST",
TLOAD: "TLOAD",
TSTORE: "TSTORE",
PUSH0: "PUSH0",

// 0x60 range - pushes.
Expand Down Expand Up @@ -383,10 +381,6 @@ var opCodeToString = map[OpCode]string{
LOG3: "LOG3",
LOG4: "LOG4",

// 0xb0 range.
TLOAD: "TLOAD",
TSTORE: "TSTORE",

// 0xf0 range - closures.
CREATE: "CREATE",
CALL: "CALL",
Expand Down Expand Up @@ -477,6 +471,8 @@ var stringToOp = map[string]OpCode{
"MSIZE": MSIZE,
"GAS": GAS,
"JUMPDEST": JUMPDEST,
"TLOAD": TLOAD,
"TSTORE": TSTORE,
"PUSH0": PUSH0,
"PUSH1": PUSH1,
"PUSH2": PUSH2,
Expand Down Expand Up @@ -547,8 +543,6 @@ var stringToOp = map[string]OpCode{
"LOG2": LOG2,
"LOG3": LOG3,
"LOG4": LOG4,
"TLOAD": TLOAD,
"TSTORE": TSTORE,
"CREATE": CREATE,
"CREATE2": CREATE2,
"CALL": CALL,
Expand Down