Fixed CR comments

Author: EngoDev

Cargo.lock

@@ -14,7 +14,7 @@ too_many_arguments = 'allow'
 anyhow = { version = "1.0.95", default-features = false }
 heck = { version = "0.5", default-features = false }
 js-component-bindgen = { version = "1.11.0" }
-wirm = { version = "2.1.0", features = ["parallel"] }
+wirm = { version = "2.1.0", default-features = false }
 rand = { version = "0.8", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 wasm-encoder = { version = "0.227.1", features = [ "component-model", "std" ] }

Cargo.toml

@@ -141,112 +141,8 @@ fn main() -> Result<()> {
                     out_dir.join("initializer.js").display()
                 )
             })?;
-
-            // Write exports and imports as JSON (manual serialization)
-            let exports_json = serialize_exports(&result.exports);
-            fs::write(out_dir.join("exports.json"), exports_json).with_context(|| {
-                format!(
-                    "Failed to write exports file: {}",
-                    out_dir.join("exports.json").display()
-                )
-            })?;
-
-            let imports_json = serialize_imports(&result.imports);
-            fs::write(out_dir.join("imports.json"), imports_json).with_context(|| {
-                format!(
-                    "Failed to write imports file: {}",
-                    out_dir.join("imports.json").display()
-                )
-            })?;
-
-            println!(
-                "Successfully generated bindings and saved to {}",
-                out_dir.display()
-            );
         }
     }
 
     Ok(())
 }
-
-/// Manually serialize exports to JSON
-fn serialize_exports(exports: &[(String, CoreFn)]) -> String {
-    let mut result = String::from("[\n");
-    for (i, (name, core_fn)) in exports.iter().enumerate() {
-        if i > 0 {
-            result.push_str(",\n");
-        }
-        result.push_str("  [\"");
-        result.push_str(&name.replace('\\', "\\\\").replace('"', "\\\""));
-        result.push_str("\", ");
-        result.push_str(&serialize_core_fn(core_fn));
-        result.push(']');
-    }
-    result.push_str("\n]");
-    result
-}
-
-/// Manually serialize imports to JSON
-fn serialize_imports(imports: &[(String, String, u32)]) -> String {
-    let mut result = String::from("[\n");
-    for (i, (specifier, name, arg_count)) in imports.iter().enumerate() {
-        if i > 0 {
-            result.push_str(",\n");
-        }
-        result.push_str("  [\"");
-        result.push_str(&specifier.replace('\\', "\\\\").replace('"', "\\\""));
-        result.push_str("\", \"");
-        result.push_str(&name.replace('\\', "\\\\").replace('"', "\\\""));
-        result.push_str("\", ");
-        result.push_str(&arg_count.to_string());
-        result.push(']');
-    }
-    result.push_str("\n]");
-    result
-}
-
-/// Manually serialize CoreFn to JSON
-fn serialize_core_fn(core_fn: &CoreFn) -> String {
-    let mut result = String::from("{");
-
-    // params
-    result.push_str("\"params\": [");
-    for (i, param) in core_fn.params.iter().enumerate() {
-        if i > 0 {
-            result.push_str(", ");
-        }
-        result.push_str(&serialize_core_ty(param));
-    }
-    result.push_str("], ");
-
-    // ret
-    result.push_str("\"ret\": ");
-    if let Some(ref ret) = core_fn.ret {
-        result.push_str(&serialize_core_ty(ret));
-    } else {
-        result.push_str("null");
-    }
-    result.push_str(", ");
-
-    // retptr
-    result.push_str(&format!("\"retptr\": {}, ", core_fn.retptr));
-
-    // retsize
-    result.push_str(&format!("\"retsize\": {}, ", core_fn.retsize));
-
-    // paramptr
-    result.push_str(&format!("\"paramptr\": {}", core_fn.paramptr));
-
-    result.push('}');
-    result
-}
-
-/// Manually serialize CoreTy to JSON
-fn serialize_core_ty(core_ty: &CoreTy) -> String {
-    match core_ty {
-        CoreTy::I32 => "\"i32\"".to_string(),
-        CoreTy::I64 => "\"i64\"".to_string(),
-        CoreTy::F32 => "\"f32\"".to_string(),
-        CoreTy::F64 => "\"f64\"".to_string(),
-    }
-}

crates/spidermonkey-embedding-splicer/src/bin/splicer.rs

@@ -10,7 +10,7 @@ use wirm::ir::id::{ExportsID, FunctionID, LocalID};
 use wirm::ir::module::Module;
 use wirm::ir::types::{BlockType, ElementItems, InstrumentationMode};
 use wirm::module_builder::AddLocal;
-use wirm::opcode::Inject;
+use wirm::opcode::{Inject, InjectAt};
 use wirm::{DataType, Opcode};
 use wit_component::metadata::{decode, Bindgen};
 use wit_component::StringEncoding;
@@ -775,11 +775,20 @@ fn synthesize_import_functions(
                 }
             }
         }
-        // Inject adjustments after the located instruction: add delta and add arg index
-        builder
-            .body
-            .instructions
-            .set_current_mode(table_instr_idx, InstrumentationMode::After);
+
+        builder.inject_at(
+            table_instr_idx,
+            InstrumentationMode::Before,
+            Operator::LocalGet {
+                local_index: *arg_idx,
+            },
+        );
+        builder.inject_at(
+            table_instr_idx + 1,
+            InstrumentationMode::Before,
+            Operator::I32Add,
+        );
+
         if delta != 0 {
             builder
                 .body
@@ -790,17 +799,6 @@ fn synthesize_import_functions(
                 .instructions
                 .add_instr(table_instr_idx, Operator::I32Add);
         }
-        builder.body.instructions.add_instr(
-            table_instr_idx,
-            Operator::LocalGet {
-                local_index: *arg_idx,
-            },
-        );
-        builder
-            .body
-            .instructions
-            .add_instr(table_instr_idx, Operator::I32Add);
-        builder.body.instructions.finish_instr(table_instr_idx);
     }
 
     // remove unnecessary exports