From b5c046696a5a0a1f369f2da305aa396d6e139b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Masip?= Date: Tue, 17 Dec 2024 15:56:18 +0000 Subject: [PATCH] adpating to the new proofman --- state-machines/binary/src/binary_extension.rs | 2 +- state-machines/mem/pil/mem_align.pil | 2 +- state-machines/mem/src/input_data_sm.rs | 3 +-- state-machines/mem/src/mem_align_sm.rs | 2 +- state-machines/mem/src/mem_sm.rs | 3 +-- state-machines/mem/src/rom_data.rs | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/state-machines/binary/src/binary_extension.rs b/state-machines/binary/src/binary_extension.rs index 4e22f8fe..bd38193b 100644 --- a/state-machines/binary/src/binary_extension.rs +++ b/state-machines/binary/src/binary_extension.rs @@ -100,7 +100,7 @@ impl BinaryExtensionSM { self.binary_extension_table_sm.unregister_predecessor(); - self.std.unregister_predecessor(self.wcm.get_pctx(), None); + self.std.unregister_predecessor(); } } diff --git a/state-machines/mem/pil/mem_align.pil b/state-machines/mem/pil/mem_align.pil index dae9a47a..3fd8259e 100644 --- a/state-machines/mem/pil/mem_align.pil +++ b/state-machines/mem/pil/mem_align.pil @@ -184,5 +184,5 @@ airtemplate MemAlign(const int N = 2**10, const int RC = 2, const int CHUNK_NUM for (int i = 0; i < RC; i++) { value[i] === sel_prove * prove_val[i] + sel_assume * assume_val[i]; } - permutation(MEMORY_ID, expressions: [wr * (MEMORY_STORE_OP - MEMORY_LOAD_OP) + MEMORY_LOAD_OP, addr * CHUNK_NUM + offset, step, width, ...value], sel: sel_prove - sel_assume, bus_type: PIOP_BUS_PROD); + permutation(MEMORY_ID, expressions: [wr * (MEMORY_STORE_OP - MEMORY_LOAD_OP) + MEMORY_LOAD_OP, addr * CHUNK_NUM + offset, step, width, ...value], sel: sel_prove - sel_assume); } \ No newline at end of file diff --git a/state-machines/mem/src/input_data_sm.rs b/state-machines/mem/src/input_data_sm.rs index 2717e1e6..96f6703d 100644 --- a/state-machines/mem/src/input_data_sm.rs +++ b/state-machines/mem/src/input_data_sm.rs @@ -70,8 +70,7 @@ impl InputDataSM { pub fn unregister_predecessor(&self) { if self.registered_predecessors.fetch_sub(1, Ordering::SeqCst) == 1 { - let pctx = self.wcm.get_pctx(); - self.std.unregister_predecessor(pctx, None); + self.std.unregister_predecessor(); } } pub fn prove(&self, inputs: &[MemInput]) { diff --git a/state-machines/mem/src/mem_align_sm.rs b/state-machines/mem/src/mem_align_sm.rs index 7433c007..811caf32 100644 --- a/state-machines/mem/src/mem_align_sm.rs +++ b/state-machines/mem/src/mem_align_sm.rs @@ -128,7 +128,7 @@ impl MemAlignSM { } self.mem_align_rom_sm.unregister_predecessor(); - self.std.unregister_predecessor(pctx, None); + self.std.unregister_predecessor(); } } diff --git a/state-machines/mem/src/mem_sm.rs b/state-machines/mem/src/mem_sm.rs index 051277e6..00b0a83c 100644 --- a/state-machines/mem/src/mem_sm.rs +++ b/state-machines/mem/src/mem_sm.rs @@ -75,8 +75,7 @@ impl MemSM { pub fn unregister_predecessor(&self) { if self.registered_predecessors.fetch_sub(1, Ordering::SeqCst) == 1 { - let pctx = self.wcm.get_pctx(); - self.std.unregister_predecessor(pctx, None); + self.std.unregister_predecessor(); } } diff --git a/state-machines/mem/src/rom_data.rs b/state-machines/mem/src/rom_data.rs index 57243430..77129273 100644 --- a/state-machines/mem/src/rom_data.rs +++ b/state-machines/mem/src/rom_data.rs @@ -62,8 +62,7 @@ impl RomDataSM { pub fn unregister_predecessor(&self) { if self.registered_predecessors.fetch_sub(1, Ordering::SeqCst) == 1 { - let pctx = self.wcm.get_pctx(); - self.std.unregister_predecessor(pctx, None); + self.std.unregister_predecessor(); } }