Skip to content

add tracing extensions #4

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

Merged
n-hutton merged 2 commits into from
Feb 23, 2023
Merged

add tracing extensions #4

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
1aa2757
add tracing extensions
n-hutton Feb 21, 2023
269d95f
cleanup
n-hutton Feb 21, 2023
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
157 changes: 157 additions & 0 deletions core/src/opcode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::fmt;

/// Opcode enum. One-to-one corresponding to an `u8` value.
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
#[cfg_attr(
Expand Down Expand Up @@ -269,3 +271,158 @@ impl Opcode {
self.0 as usize
}
}

impl fmt::Display for Opcode {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
//write!(f, "{}", "urgh...")
let op = match self {
&Opcode::STOP => "STOP",
&Opcode::ADD => "ADD",
&Opcode::MUL => "MUL",
&Opcode::SUB => "SUB",
&Opcode::DIV => "DIV",
&Opcode::SDIV => "SDIV",
&Opcode::MOD => "MOD",
&Opcode::SMOD => "SMOD",
&Opcode::ADDMOD => "ADDMOD",
&Opcode::MULMOD => "MULMOD",
&Opcode::EXP => "EXP",
&Opcode::SIGNEXTEND => "SIGNEXTEND",
&Opcode::LT => "LT",
&Opcode::GT => "GT",
&Opcode::SLT => "SLT",
&Opcode::SGT => "SGT",
&Opcode::EQ => "EQ",
&Opcode::ISZERO => "ISZERO",
&Opcode::AND => "AND",
&Opcode::OR => "OR",
&Opcode::XOR => "XOR",
&Opcode::NOT => "NOT",
&Opcode::BYTE => "BYTE",
&Opcode::CALLDATALOAD => "CALLDATALOAD",
&Opcode::CALLDATASIZE => "CALLDATASIZE",
&Opcode::CALLDATACOPY => "CALLDATACOPY",
&Opcode::CODESIZE => "CODESIZE",
&Opcode::CODECOPY => "CODECOPY",
&Opcode::SHL => "SHL",
&Opcode::SHR => "SHR",
&Opcode::SAR => "SAR",
&Opcode::POP => "POP",
&Opcode::MLOAD => "MLOAD",
&Opcode::MSTORE => "MSTORE",
&Opcode::MSTORE8 => "MSTORE8",
&Opcode::JUMP => "JUMP",
&Opcode::JUMPI => "JUMPI",
&Opcode::PC => "PC",
&Opcode::MSIZE => "MSIZE",
&Opcode::JUMPDEST => "JUMPDEST",
&Opcode::PUSH1 => "PUSH1",
&Opcode::PUSH2 => "PUSH2",
&Opcode::PUSH3 => "PUSH3",
&Opcode::PUSH4 => "PUSH4",
&Opcode::PUSH5 => "PUSH5",
&Opcode::PUSH6 => "PUSH6",
&Opcode::PUSH7 => "PUSH7",
&Opcode::PUSH8 => "PUSH8",
&Opcode::PUSH9 => "PUSH9",
&Opcode::PUSH10 => "PUSH10",
&Opcode::PUSH11 => "PUSH11",
&Opcode::PUSH12 => "PUSH12",
&Opcode::PUSH13 => "PUSH13",
&Opcode::PUSH14 => "PUSH14",
&Opcode::PUSH15 => "PUSH15",
&Opcode::PUSH16 => "PUSH16",
&Opcode::PUSH17 => "PUSH17",
&Opcode::PUSH18 => "PUSH18",
&Opcode::PUSH19 => "PUSH19",
&Opcode::PUSH20 => "PUSH20",
&Opcode::PUSH21 => "PUSH21",
&Opcode::PUSH22 => "PUSH22",
&Opcode::PUSH23 => "PUSH23",
&Opcode::PUSH24 => "PUSH24",
&Opcode::PUSH25 => "PUSH25",
&Opcode::PUSH26 => "PUSH26",
&Opcode::PUSH27 => "PUSH27",
&Opcode::PUSH28 => "PUSH28",
&Opcode::PUSH29 => "PUSH29",
&Opcode::PUSH30 => "PUSH30",
&Opcode::PUSH31 => "PUSH31",
&Opcode::PUSH32 => "PUSH32",
&Opcode::DUP1 => "DUP1",
&Opcode::DUP2 => "DUP2",
&Opcode::DUP3 => "DUP3",
&Opcode::DUP4 => "DUP4",
&Opcode::DUP5 => "DUP5",
&Opcode::DUP6 => "DUP6",
&Opcode::DUP7 => "DUP7",
&Opcode::DUP8 => "DUP8",
&Opcode::DUP9 => "DUP9",
&Opcode::DUP10 => "DUP10",
&Opcode::DUP11 => "DUP11",
&Opcode::DUP12 => "DUP12",
&Opcode::DUP13 => "DUP13",
&Opcode::DUP14 => "DUP14",
&Opcode::DUP15 => "DUP15",
&Opcode::DUP16 => "DUP16",
&Opcode::SWAP1 => "SWAP1",
&Opcode::SWAP2 => "SWAP2",
&Opcode::SWAP3 => "SWAP3",
&Opcode::SWAP4 => "SWAP4",
&Opcode::SWAP5 => "SWAP5",
&Opcode::SWAP6 => "SWAP6",
&Opcode::SWAP7 => "SWAP7",
&Opcode::SWAP8 => "SWAP8",
&Opcode::SWAP9 => "SWAP9",
&Opcode::SWAP10 => "SWAP10",
&Opcode::SWAP11 => "SWAP11",
&Opcode::SWAP12 => "SWAP12",
&Opcode::SWAP13 => "SWAP13",
&Opcode::SWAP14 => "SWAP14",
&Opcode::SWAP15 => "SWAP15",
&Opcode::SWAP16 => "SWAP16",
&Opcode::RETURN => "RETURN",
&Opcode::REVERT => "REVERT",
&Opcode::INVALID => "INVALID",
&Opcode::EOFMAGIC => "EOFMAGIC",
&Opcode::SHA3 => "SHA3",
&Opcode::ADDRESS => "ADDRESS",
&Opcode::BALANCE => "BALANCE",
&Opcode::SELFBALANCE => "SELFBALANCE",
&Opcode::BASEFEE => "BASEFEE",
&Opcode::ORIGIN => "ORIGIN",
&Opcode::CALLER => "CALLER",
&Opcode::CALLVALUE => "CALLVALUE",
&Opcode::GASPRICE => "GASPRICE",
&Opcode::EXTCODESIZE => "EXTCODESIZE",
&Opcode::EXTCODECOPY => "EXTCODECOPY",
&Opcode::EXTCODEHASH => "EXTCODEHASH",
&Opcode::RETURNDATASIZE => "RETURNDATASIZE",
&Opcode::RETURNDATACOPY => "RETURNDATACOPY",
&Opcode::BLOCKHASH => "BLOCKHASH",
&Opcode::COINBASE => "COINBASE",
&Opcode::TIMESTAMP => "TIMESTAMP",
&Opcode::NUMBER => "NUMBER",
&Opcode::DIFFICULTY => "DIFFICULTY",
&Opcode::GASLIMIT => "GASLIMIT",
&Opcode::SLOAD => "SLOAD",
&Opcode::SSTORE => "SSTORE",
&Opcode::GAS => "GAS",
&Opcode::LOG0 => "LOG0",
&Opcode::LOG1 => "LOG1",
&Opcode::LOG2 => "LOG2",
&Opcode::LOG3 => "LOG3",
&Opcode::LOG4 => "LOG4",
&Opcode::CREATE => "CREATE",
&Opcode::CREATE2 => "CREATE2",
&Opcode::CALL => "CALL",
&Opcode::CALLCODE => "CALLCODE",
&Opcode::DELEGATECALL => "DELEGATECALL",
&Opcode::STATICCALL => "STATICCALL",
&Opcode::SUICIDE => "SUICIDE",
&Opcode::CHAINID => "CHAINID",
_ => "UNKNOWNOP",
};
write!(f, "{}", op)
}
}

1 change: 1 addition & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ extern crate alloc;

pub use evm_core::*;
pub use evm_gasometer as gasometer;
pub use evm_runtime as runtime;
Copy link
Copy Markdown
Author

@n-hutton n-hutton Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needed to expose the events to main.rs in evm-ds

pub use evm_runtime::*;

#[cfg(feature = "tracing")]
Expand Down