logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-05-22 09:49:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1320 from topos-protocol/fix-combine-keccak-jumpdest

Browse Source 
Fix merging of jumpdest and keccak_general.
This commit is contained in:
Robin Salen 2023-11-01 11:12:06 -04:00 committed by GitHub
commit 1e8ed78f5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evm/src/cpu/columns/ops.rs
View File

@ -23,7 +23,7 @@ pub struct OpsColumnsView<T: Copy> {
/// Combines SHL and SHR flags. /// Combines SHL and SHR flags.
pub shift: T, pub shift: T,
/// Combines JUMPDEST and KECCAK_GENERAL flags. /// 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. /// Flag for PROVER_INPUT.
pub prover_input: T, pub prover_input: T,
/// Combines JUMP and JUMPI flags. /// Combines JUMP and JUMPI flags.

3
evm/src/cpu/contextops.rs
View File

@ -23,11 +23,10 @@ const KEEPS_CONTEXT: OpsColumnsView<bool> = OpsColumnsView {
logic_op: true, logic_op: true,
not_pop: true, not_pop: true,
shift: true, shift: true,
keccak_general: true, jumpdest_keccak_general: true,
prover_input: true, prover_input: true,
jumps: true, jumps: true,
pc_push0: true, pc_push0: true,
jumpdest: true,
push: true, push: true,
dup_swap: true, dup_swap: true,
context_op: false, context_op: false,