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

chore(EOF): rename extcall opcode/names #1416

Merged
merged 3 commits into from
May 13, 2024
Merged

chore(EOF): rename extcall opcode/names #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c17ce7
fix(primitives): specify the optimism cfg on spec_to_generic (#1412)
DaniPopes May 13, 2024
79dc955
chore(EOF): rename extcall opcode/names
rakita May 13, 2024
5eab710
Merge remote-tracking branch 'origin/main' into call_target_truncate
rakita May 13, 2024
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
4 changes: 2 additions & 2 deletions crates/interpreter/src/instructions/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ pub fn extcall<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host
interpreter.instruction_result = InstructionResult::CallOrCreate;
}

pub fn extdcall<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
pub fn extdelegatecall<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
require_eof!(interpreter);
pop_address!(interpreter, target_address);

Expand Down Expand Up @@ -267,7 +267,7 @@ pub fn extdcall<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, hos
interpreter.instruction_result = InstructionResult::CallOrCreate;
}

pub fn extscall<H: Host + ?Sized>(interpreter: &mut Interpreter, host: &mut H) {
pub fn extstaticcall<H: Host + ?Sized>(interpreter: &mut Interpreter, host: &mut H) {
require_eof!(interpreter);
pop_address!(interpreter, target_address);

Expand Down
10 changes: 5 additions & 5 deletions crates/interpreter/src/opcode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,11 +769,11 @@ opcodes! {
0xF4 => DELEGATECALL => contract::delegate_call::<H, SPEC> => stack_io(6, 1), not_eof;
0xF5 => CREATE2 => contract::create::<true, H, SPEC> => stack_io(4, 1), not_eof;
// 0xF6
0xF7 => RETURNDATALOAD => system::returndataload => stack_io(1, 1);
0xF8 => EXTCALL => contract::extcall::<H, SPEC> => stack_io(4, 1);
0xF9 => EXFCALL => contract::extdcall::<H, SPEC> => stack_io(3, 1);
0xFA => STATICCALL => contract::static_call::<H, SPEC> => stack_io(6, 1), not_eof;
0xFB => EXTSCALL => contract::extscall => stack_io(3, 1);
0xF7 => RETURNDATALOAD => system::returndataload => stack_io(1, 1);
0xF8 => EXTCALL => contract::extcall::<H, SPEC> => stack_io(4, 1);
0xF9 => EXTDELEGATECALL => contract::extdelegatecall::<H, SPEC> => stack_io(3, 1);
0xFA => STATICCALL => contract::static_call::<H, SPEC> => stack_io(6, 1), not_eof;
0xFB => EXTSTATICCALL => contract::extstaticcall => stack_io(3, 1);
// 0xFC
0xFD => REVERT => control::revert::<H, SPEC> => stack_io(2, 0), terminating;
0xFE => INVALID => control::invalid => stack_io(0, 0), terminating;
Expand Down
Loading