Merge remote-tracking branch 'origin/main' into matthias/rump-cpu

0xmozak · May 9, 2024 · 49c76bc · 49c76bc
2 parents c4f0b59 + 8be3e75
commit 49c76bc
Show file tree

Hide file tree

Showing 73 changed files with 4,602 additions and 4,120 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,6 +56,7 @@ plonky2_crypto = { git = "https://github.com/0xmozak/plonky2-crypto.git" }
 criterion = { version = "0.5", default-features = false, features = ["html_reports", "plotters", "cargo_bench_support"] }
 
 [patch.crates-io]
+clio = { git = "https://github.com/0xmozak/clio.git" }
 plonky2 = { git = "https://github.com/0xmozak/plonky2.git" }
 plonky2_maybe_rayon = { git = "https://github.com/0xmozak/plonky2.git" }
 starky = { git = "https://github.com/0xmozak/plonky2.git" }
diff --git a/circuits/src/cpu/columns.rs b/circuits/src/cpu/columns.rs
@@ -180,6 +180,7 @@ pub struct CpuState<T> {
     pub is_event_tape: T,
     pub is_events_commitment_tape: T,
     pub is_cast_list_commitment_tape: T,
+    pub is_self_prog_id_tape: T,
     pub is_halt: T,
     pub is_poseidon2: T,
 }
@@ -336,6 +337,7 @@ pub fn lookup_for_storage_tables() -> TableWithTypedOutput<StorageDeviceCtl<Colu
                 CPU.is_event_tape,
                 CPU.is_events_commitment_tape,
                 CPU.is_cast_list_commitment_tape,
+                CPU.is_self_prog_id_tape,
             ]),
             clk: CPU.clk,
             addr: CPU.io_addr,
@@ -348,6 +350,7 @@ pub fn lookup_for_storage_tables() -> TableWithTypedOutput<StorageDeviceCtl<Colu
             CPU.is_event_tape,
             CPU.is_events_commitment_tape,
             CPU.is_cast_list_commitment_tape,
+            CPU.is_self_prog_id_tape,
         ]
         .iter()
         .sum(),