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

perf: make Stack::peek() return a reference #12

Closed
wants to merge 2 commits into from
Closed

perf: make Stack::peek() return a reference #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a945027
refactor: make Stack::peek return a reference
mooori Jul 11, 2022
922a99f
Update call sites
mooori Jul 11, 2022
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
6 changes: 3 additions & 3 deletions core/src/eval/misc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ pub fn push2(state: &mut Machine, position: usize) -> Control {
#[inline]
pub fn dup(state: &mut Machine, n: usize) -> Control {
let value = match state.stack.peek(n - 1) {
Ok(value) => value,
Ok(&value) => value,
Err(e) => return Control::Exit(e.into()),
};
push_u256!(state, value);
Expand All @@ -193,11 +193,11 @@ pub fn dup(state: &mut Machine, n: usize) -> Control {
#[inline]
pub fn swap(state: &mut Machine, n: usize) -> Control {
let val1 = match state.stack.peek(0) {
Ok(value) => value,
Ok(&value) => value,
Err(e) => return Control::Exit(e.into()),
};
let val2 = match state.stack.peek(n) {
Ok(value) => value,
Ok(&value) => value,
Err(e) => return Control::Exit(e.into()),
};
match state.stack.set(0, val2) {
Expand Down
4 changes: 2 additions & 2 deletions core/src/stack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ impl Stack {
/// Peek a value at given index for the stack, where the top of
/// the stack is at index `0`. If the index is too large,
/// `StackError::Underflow` is returned.
pub fn peek(&self, no_from_top: usize) -> Result<U256, ExitError> {
pub fn peek(&self, no_from_top: usize) -> Result<&U256, ExitError> {
if self.data.len() > no_from_top {
Ok(self.data[self.data.len() - no_from_top - 1])
Ok(&self.data[self.data.len() - no_from_top - 1])
} else {
Err(ExitError::StackUnderflow)
}
Expand Down
72 changes: 36 additions & 36 deletions gasometer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,8 @@ pub fn dynamic_opcode_cost<H: Handler>(
let target = stack.peek_h256(1)?.into();
storage_target = StorageTarget::Address(target);
GasCost::CallCode {
value: stack.peek(2)?,
gas: stack.peek(0)?,
value: *stack.peek(2)?,
gas: *stack.peek(0)?,
target_is_cold: handler.is_cold(target, None),
target_exists: handler.exists(target),
}
Expand All @@ -509,27 +509,27 @@ pub fn dynamic_opcode_cost<H: Handler>(
let target = stack.peek_h256(1)?.into();
storage_target = StorageTarget::Address(target);
GasCost::StaticCall {
gas: stack.peek(0)?,
gas: *stack.peek(0)?,
target_is_cold: handler.is_cold(target, None),
target_exists: handler.exists(target),
}
}
Opcode::SHA3 => GasCost::Sha3 {
len: stack.peek(1)?,
len: *stack.peek(1)?,
},
Opcode::EXTCODECOPY => {
let target = stack.peek_h256(0)?.into();
storage_target = StorageTarget::Address(target);
GasCost::ExtCodeCopy {
target_is_cold: handler.is_cold(target, None),
len: stack.peek(3)?,
len: *stack.peek(3)?,
}
}
Opcode::CALLDATACOPY | Opcode::CODECOPY => GasCost::VeryLowCopy {
len: stack.peek(2)?,
len: *stack.peek(2)?,
},
Opcode::EXP => GasCost::Exp {
power: stack.peek(1)?,
power: *stack.peek(1)?,
},
Opcode::SLOAD => {
let index = stack.peek_h256(0)?;
Expand All @@ -543,7 +543,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
let target = stack.peek_h256(1)?.into();
storage_target = StorageTarget::Address(target);
GasCost::DelegateCall {
gas: stack.peek(0)?,
gas: *stack.peek(0)?,
target_is_cold: handler.is_cold(target, None),
target_exists: handler.exists(target),
}
Expand All @@ -552,7 +552,7 @@ pub fn dynamic_opcode_cost<H: Handler>(

Opcode::RETURNDATASIZE if config.has_return_data => GasCost::Base,
Opcode::RETURNDATACOPY if config.has_return_data => GasCost::VeryLowCopy {
len: stack.peek(2)?,
len: *stack.peek(2)?,
},
Opcode::RETURNDATASIZE | Opcode::RETURNDATACOPY => GasCost::Invalid,

Expand All @@ -570,27 +570,27 @@ pub fn dynamic_opcode_cost<H: Handler>(
}
Opcode::LOG0 if !is_static => GasCost::Log {
n: 0,
len: stack.peek(1)?,
len: *stack.peek(1)?,
},
Opcode::LOG1 if !is_static => GasCost::Log {
n: 1,
len: stack.peek(1)?,
len: *stack.peek(1)?,
},
Opcode::LOG2 if !is_static => GasCost::Log {
n: 2,
len: stack.peek(1)?,
len: *stack.peek(1)?,
},
Opcode::LOG3 if !is_static => GasCost::Log {
n: 3,
len: stack.peek(1)?,
len: *stack.peek(1)?,
},
Opcode::LOG4 if !is_static => GasCost::Log {
n: 4,
len: stack.peek(1)?,
len: *stack.peek(1)?,
},
Opcode::CREATE if !is_static => GasCost::Create,
Opcode::CREATE2 if !is_static && config.has_create2 => GasCost::Create2 {
len: stack.peek(2)?,
len: *stack.peek(2)?,
},
Opcode::SUICIDE if !is_static => {
let target = stack.peek_h256(0)?.into();
Expand All @@ -602,12 +602,12 @@ pub fn dynamic_opcode_cost<H: Handler>(
already_removed: handler.deleted(address),
}
}
Opcode::CALL if !is_static || (is_static && stack.peek(2)? == U256::zero()) => {
Opcode::CALL if !is_static || (is_static && *stack.peek(2)? == U256::zero()) => {
let target = stack.peek_h256(1)?.into();
storage_target = StorageTarget::Address(target);
GasCost::Call {
value: stack.peek(2)?,
gas: stack.peek(0)?,
value: *stack.peek(2)?,
gas: *stack.peek(0)?,
target_is_cold: handler.is_cold(target, None),
target_exists: handler.exists(target),
}
Expand All @@ -625,54 +625,54 @@ pub fn dynamic_opcode_cost<H: Handler>(
| Opcode::LOG2
| Opcode::LOG3
| Opcode::LOG4 => Some(MemoryCost {
offset: stack.peek(0)?,
len: stack.peek(1)?,
offset: *stack.peek(0)?,
len: *stack.peek(1)?,
}),

Opcode::CODECOPY | Opcode::CALLDATACOPY | Opcode::RETURNDATACOPY => Some(MemoryCost {
offset: stack.peek(0)?,
len: stack.peek(2)?,
offset: *stack.peek(0)?,
len: *stack.peek(2)?,
}),

Opcode::EXTCODECOPY => Some(MemoryCost {
offset: stack.peek(1)?,
len: stack.peek(3)?,
offset: *stack.peek(1)?,
len: *stack.peek(3)?,
}),

Opcode::MLOAD | Opcode::MSTORE => Some(MemoryCost {
offset: stack.peek(0)?,
offset: *stack.peek(0)?,
len: U256::from(32),
}),

Opcode::MSTORE8 => Some(MemoryCost {
offset: stack.peek(0)?,
offset: *stack.peek(0)?,
len: U256::from(1),
}),

Opcode::CREATE | Opcode::CREATE2 => Some(MemoryCost {
offset: stack.peek(1)?,
len: stack.peek(2)?,
offset: *stack.peek(1)?,
len: *stack.peek(2)?,
}),

Opcode::CALL | Opcode::CALLCODE => Some(
MemoryCost {
offset: stack.peek(3)?,
len: stack.peek(4)?,
offset: *stack.peek(3)?,
len: *stack.peek(4)?,
}
.join(MemoryCost {
offset: stack.peek(5)?,
len: stack.peek(6)?,
offset: *stack.peek(5)?,
len: *stack.peek(6)?,
}),
),

Opcode::DELEGATECALL | Opcode::STATICCALL => Some(
MemoryCost {
offset: stack.peek(2)?,
len: stack.peek(3)?,
offset: *stack.peek(2)?,
len: *stack.peek(3)?,
}
.join(MemoryCost {
offset: stack.peek(4)?,
len: stack.peek(5)?,
offset: *stack.peek(4)?,
len: *stack.peek(5)?,
}),
),

Expand Down