From c50e0b52b2f545e2ffe6c2d1b0c828815ec2f38d Mon Sep 17 00:00:00 2001
From: Oliver Nordbjerg <hi@notbjerg.me>
Date: Sun, 5 Mar 2023 22:25:40 +0100
Subject: [PATCH] feat: use singular bytes for the jumpmap

---
 crates/interpreter/src/interpreter/analysis.rs |  4 +++-
 crates/primitives/src/bytecode.rs              | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/crates/interpreter/src/interpreter/analysis.rs b/crates/interpreter/src/interpreter/analysis.rs
index e52f7c6d7e..7227f68827 100644
--- a/crates/interpreter/src/interpreter/analysis.rs
+++ b/crates/interpreter/src/interpreter/analysis.rs
@@ -1,7 +1,9 @@
 use crate::opcode;
 use crate::primitives::{Bytecode, BytecodeState, Bytes, B256};
 use alloc::sync::Arc;
+use bitvec::order::Lsb0;
 use bitvec::prelude::bitvec;
+use bitvec::vec::BitVec;
 use revm_primitives::JumpMap;
 
 /// Perform bytecode analysis.
@@ -31,7 +33,7 @@ pub fn to_analysed(bytecode: Bytecode) -> Bytecode {
 
 /// Analyzs bytecode to build a jump map.
 fn analyze(code: &[u8]) -> JumpMap {
-    let mut jumps = bitvec![0; code.len()];
+    let mut jumps: BitVec<u8> = bitvec![u8, Lsb0; 0; code.len()];
 
     let range = code.as_ptr_range();
     let start = range.start;
diff --git a/crates/primitives/src/bytecode.rs b/crates/primitives/src/bytecode.rs
index 68d8fd8089..1cd8aa8f9b 100644
--- a/crates/primitives/src/bytecode.rs
+++ b/crates/primitives/src/bytecode.rs
@@ -5,11 +5,21 @@ use bitvec::vec::BitVec;
 use bytes::Bytes;
 
 /// A map of valid `jump` destinations.
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, Default)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct JumpMap(pub Arc<BitVec>);
+pub struct JumpMap(pub Arc<BitVec<u8>>);
 
 impl JumpMap {
+    /// Get the raw bytes of the jump map
+    pub fn as_slice(&self) -> &[u8] {
+        self.0.as_raw_slice()
+    }
+
+    /// Construct a jump map from raw bytes
+    pub fn from_slice(slice: &[u8]) -> Self {
+        Self(Arc::new(BitVec::from_slice(slice)))
+    }
+
     /// Check if `pc` is a valid jump destination.
     pub fn is_valid(&self, pc: usize) -> bool {
         pc < self.0.len() && self.0[pc]
@@ -47,7 +57,7 @@ impl Bytecode {
             hash: KECCAK_EMPTY,
             state: BytecodeState::Analysed {
                 len: 0,
-                jump_map: JumpMap(Arc::new(bitvec![0])),
+                jump_map: JumpMap(Arc::new(bitvec![u8, Lsb0; 0])),
             },
         }
     }