bump womir and use default allocate_loop_frame_slots

Author: pacheco

Cargo.lock

@@ -44,7 +44,7 @@ rrs-lib = "0.1.0"
 tracing = "0.1.40"
 
 wasmparser = { version = "0.235", default-features = false }
-womir = { git = "https://github.com/powdr-labs/womir.git", rev = "44f1580" }
+womir = { git = "https://github.com/powdr-labs/womir.git", rev = "5c95d4b" }
 
 # [patch."https://github.com/powdr-labs/openvm.git"]
 # openvm-sdk = { path = "../openvm/crates/sdk" }

Cargo.toml

@@ -1,8 +1,4 @@
-use std::{
-    collections::{BTreeSet, HashMap},
-    ops::Range,
-    vec,
-};
+use std::{collections::HashMap, ops::Range, vec};
 
 use crate::instruction_builder as ib;
 use openvm_instructions::{exe::VmExe, instruction::Instruction, program::Program, riscv};
@@ -12,8 +8,8 @@ use womir::{
     linker::LabelValue,
     loader::{
         flattening::{
-            settings::{ComparisonFunction, JumpCondition, LoopFrameLayout, Settings},
-            Generators, RegisterGenerator, ReturnInfo, WriteOnceASM,
+            settings::{ComparisonFunction, JumpCondition, Settings},
+            Generators, WriteOnceASM,
         },
         func_idx_to_label, CommonProgram,
     },
@@ -237,38 +233,6 @@ impl<'a, F: PrimeField32> Settings<'a> for OpenVMSettings<F> {
         true
     }
 
-    fn allocate_loop_frame_slots(
-        &self,
-        need_ret_info: bool,
-        saved_fps: BTreeSet<u32>,
-    ) -> (RegisterGenerator<'a, Self>, LoopFrameLayout) {
-        let mut rgen = RegisterGenerator::new();
-
-        let ret_info = need_ret_info.then(|| {
-            // Allocate the return PC and frame pointer for the loop.
-            let ret_pc = rgen.allocate_words(Self::words_per_ptr());
-            let ret_fp = rgen.allocate_words(Self::words_per_ptr());
-            ReturnInfo { ret_pc, ret_fp }
-        });
-
-        // Allocate the slots for the saved frame pointers.
-        let saved_fps = saved_fps
-            .into_iter()
-            .map(|depth| {
-                let outer_fp = rgen.allocate_words(Self::words_per_ptr());
-                (depth, outer_fp)
-            })
-            .collect();
-
-        (
-            rgen,
-            LoopFrameLayout {
-                saved_fps,
-                ret_info,
-            },
-        )
-    }
-
     fn to_plain_local_jump(directive: Self::Directive) -> Result<String, Self::Directive> {
         if let Directive::Jump { target } = directive {
             Ok(target)