Move logic inside vm

lambdaclass · Jan 11, 2024 · d3eeb20 · d3eeb20
1 parent b3bd50c
commit d3eeb20
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/cairo1-run/src/main.rs b/cairo1-run/src/main.rs
@@ -399,15 +399,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<Vec<MaybeRelocatable>, Erro
             stack_pointer.offset += size as usize;
         }
         // Set stop pointer for each builtin
-        for builtin in vm.builtin_runners.iter_mut() {
-            builtin.final_stack(
-                &vm.segments,
-                builtin_name_to_stack_pointer
-                    .get(builtin.name())
-                    .cloned()
-                    .unwrap_or_default(),
-            )?;
-        }
+        vm.builtins_final_stack_from_stack_pointer_dict(&builtin_name_to_stack_pointer)?;
 
         // Build execution public memory
         runner.finalize_segments(&mut vm)?;

diff --git a/vm/src/vm/vm_core.rs b/vm/src/vm/vm_core.rs
@@ -78,8 +78,8 @@ impl DeducedOperands {
 
 pub struct VirtualMachine {
     pub(crate) run_context: RunContext,
-    pub builtin_runners: Vec<BuiltinRunner>,
-    pub segments: MemorySegmentManager,
+    pub(crate) builtin_runners: Vec<BuiltinRunner>,
+    pub(crate) segments: MemorySegmentManager,
     pub(crate) trace: Option<Vec<TraceEntry>>,
     pub(crate) current_step: usize,
     pub(crate) rc_limits: Option<(isize, isize)>,
@@ -1077,6 +1077,23 @@ impl VirtualMachine {
             })
             .collect()
     }
+
+    #[doc(hidden)]
+    pub fn builtins_final_stack_from_stack_pointer_dict(
+        &mut self,
+        builtin_name_to_stack_pointer: &HashMap<&'static str, Relocatable>,
+    ) -> Result<(), RunnerError> {
+        for builtin in self.builtin_runners.iter_mut() {
+            builtin.final_stack(
+                &self.segments,
+                builtin_name_to_stack_pointer
+                    .get(builtin.name())
+                    .cloned()
+                    .unwrap_or_default(),
+            )?;
+        }
+        Ok(())
+    }
 }
 
 pub struct VirtualMachineBuilder {