feat: implement rodata initialization

Cargo.toml

@@ -65,12 +65,10 @@ thiserror = { version = "1.0", git = "https://github.com/bitwalker/thiserror", b
 toml = { version = "0.8", features = ["preserve_order"] }
 derive_more = "0.99"
 indexmap = "2.1"
-# 2da11ad0a975d2e5d6a2582871f0c89b820b3ffa is the latest commit in 'next' that includes
-# the absolute paths support
-miden-assembly = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "2da11ad0a975d2e5d6a2582871f0c89b820b3ffa" }
-miden-core = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "2da11ad0a975d2e5d6a2582871f0c89b820b3ffa" }
-miden-processor = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "2da11ad0a975d2e5d6a2582871f0c89b820b3ffa" }
-miden-stdlib = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "2da11ad0a975d2e5d6a2582871f0c89b820b3ffa" }
+miden-assembly = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "f194eb4e25f568b370164b8cb1bcdd7bb972f427" }
+miden-core = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "f194eb4e25f568b370164b8cb1bcdd7bb972f427" }
+miden-processor = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "f194eb4e25f568b370164b8cb1bcdd7bb972f427" }
+miden-stdlib = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "f194eb4e25f568b370164b8cb1bcdd7bb972f427" }
 midenc-codegen-masm = { path = "codegen/masm" }
 miden-diagnostics = "0.1"
 midenc-hir = { path = "hir" }

codegen/masm/Cargo.toml

@@ -20,6 +20,7 @@ log.workspace = true
 miden-assembly.workspace = true
 miden-core.workspace = true
 miden-diagnostics.workspace = true
+miden-processor.workspace = true
 miden-stdlib.workspace = true
 midenc-hir.workspace = true
 midenc-hir-analysis.workspace = true

codegen/masm/src/codegen/emitter.rs

@@ -1064,8 +1064,16 @@ impl<'b, 'f: 'b> BlockEmitter<'b, 'f> {
             }
             // Entering a top-level loop, set the controlling loop
             (None, controlling_loop @ Some(_)) => {
+                for l in self.function.loops.loops() {
+                    dbg!(l, self.function.loops.loop_header(l));
+                    dbg!(self.function.loops.is_in_loop(current_block, l));
+                    dbg!(self.function.loops.is_in_loop(target_block, l));
+                }
                 assert!(is_first_visit);
-                assert_eq!(self.controlling_loop, None);
+                assert_eq!(
+                    self.controlling_loop, None,
+                    "expected no controlling loop entering {target_block} from {current_block}"
+                );
                 controlling_loop
             }
             // Escaping a loop

codegen/masm/src/convert.rs

@@ -56,14 +56,15 @@ impl ConversionPass for ConvertHirToMasm<hir::Program> {
         analyses: &mut AnalysisManager,
         session: &Session,
     ) -> ConversionResult<Self::To> {
-        let mut masm_program = Box::new(masm::Program::from_hir(&program));
+        // Ensure global variable analysis is computed
+        let globals =
+            analyses.get_or_compute::<ProgramGlobalVariableAnalysis>(&program, session)?;
+
+        let mut masm_program = Box::new(masm::Program::from_hir(&program, &globals));
 
         // Remove the set of modules to compile from the program
         let modules = program.modules_mut().take();
 
-        // Ensure global variable analysis is computed
-        analyses.get_or_compute::<ProgramGlobalVariableAnalysis>(&program, session)?;
-
         for module in modules.into_iter() {
             // Convert the module
             let mut convert_to_masm = ConvertHirToMasm::<hir::Module>::default();
@@ -153,6 +154,8 @@ impl<'a> ConversionPass for ConvertHirToMasm<&'a hir::Function> {
     ) -> ConversionResult<Self::To> {
         use midenc_hir::ProgramAnalysisKey;
 
+        println!("{f}");
+
         let mut f_prime = masm::Function::new(f.id, f.signature.clone());
 
         // Start at the function entry

codegen/masm/src/lib.rs

@@ -1,4 +1,5 @@
 #![feature(array_windows)]
+#![feature(iter_array_chunks)]
 #![feature(is_sorted)]
 
 mod codegen;