Refactor evm Instruction to be a c-like enum (#8914)
* Add a basic instruction c-like enum * Fix all compiling errors * Fix tests * Access instruction info as a Instruction impl * Use macro to avoid duplication in from_u8 * Use single space instead of multiple tabs to avoid formatting issue * Fix evmbin compile * typo: indentation * Use if let to remove an expect * Address grumbles
This commit is contained in:
@@ -21,7 +21,7 @@ use ethereum_types::H256;
|
||||
use parking_lot::Mutex;
|
||||
use memory_cache::MemoryLruCache;
|
||||
use bit_set::BitSet;
|
||||
use super::super::instructions;
|
||||
use super::super::instructions::{self, Instruction};
|
||||
|
||||
const DEFAULT_CACHE_SIZE: usize = 4 * 1024 * 1024;
|
||||
|
||||
@@ -70,12 +70,14 @@ impl SharedCache {
|
||||
let mut position = 0;
|
||||
|
||||
while position < code.len() {
|
||||
let instruction = code[position];
|
||||
let instruction = Instruction::from_u8(code[position]);
|
||||
|
||||
if instruction == instructions::JUMPDEST {
|
||||
jump_dests.insert(position);
|
||||
} else if instructions::is_push(instruction) {
|
||||
position += instructions::get_push_bytes(instruction);
|
||||
if let Some(instruction) = instruction {
|
||||
if instruction == instructions::JUMPDEST {
|
||||
jump_dests.insert(position);
|
||||
} else if let Some(push_bytes) = instruction.push_bytes() {
|
||||
position += push_bytes;
|
||||
}
|
||||
}
|
||||
position += 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user