Fix merging of jumpdest and keccak_general.

topos-protocol · Nov 1, 2023 · 85b38be · 85b38be
1 parent 4136207
commit 85b38be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/evm/src/cpu/columns/ops.rs b/evm/src/cpu/columns/ops.rs
@@ -23,7 +23,7 @@ pub struct OpsColumnsView<T: Copy> {
     /// Combines SHL and SHR flags.
     pub shift: T,
     /// Combines JUMPDEST and KECCAK_GENERAL flags.
-    pub jumpdest_keccak_general: T, // Combines JUMPDEST and KECCAK_GENERAL flags.
+    pub jumpdest_keccak_general: T,
     /// Flag for PROVER_INPUT.
     pub prover_input: T,
     /// Combines JUMP and JUMPI flags.

diff --git a/evm/src/cpu/contextops.rs b/evm/src/cpu/contextops.rs
@@ -23,11 +23,10 @@ const KEEPS_CONTEXT: OpsColumnsView<bool> = OpsColumnsView {
     logic_op: true,
     not_pop: true,
     shift: true,
-    keccak_general: true,
+    jumpdest_keccak_general: true,
     prover_input: true,
     jumps: true,
     pc_push0: true,
-    jumpdest: true,
     push: true,
     dup_swap: true,
     context_op: false,