fix-vm: use Machine trait exclusively

2026-06-19 22:37:29 +08:00
parent afbc471e40
commit f0e3f1eeca
13 changed files with 1240 additions and 1326 deletions
@@ -4,57 +4,55 @@ use gc_arena::Mutation;

 use crate::{BytecodeReader, Step, VmRuntimeCtx};

-impl<'gc> crate::Vm<'gc> {
-    #[inline(always)]
-    pub(crate) fn op_jump_if_false(
-        &mut self,
-        reader: &mut BytecodeReader<'_>,
-        mc: &gc_arena::Mutation<'gc>,
-    ) -> Step {
-        let offset = reader.read_i32();
-        let cond = self.force_and_retry::<StrictValue>(reader, mc)?;
-        if cond.as_inline::<bool>() == Some(false) {
-            reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
-        }
-        Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_jump_if_true(
-        &mut self,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-    ) -> Step {
-        let offset = reader.read_i32();
-        let cond = self.force_and_retry::<StrictValue>(reader, mc)?;
-        if cond.as_inline::<bool>() == Some(true) {
-            reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
-        }
-        Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_jump(&mut self, reader: &mut BytecodeReader<'_>) -> Step {
-        let offset = reader.read_i32();
+#[inline(always)]
+pub(crate) fn op_jump_if_false<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &gc_arena::Mutation<'gc>,
+) -> Step {
+    let offset = reader.read_i32();
+    let cond = m.force_and_retry::<StrictValue>(reader, mc)?;
+    if cond.as_inline::<bool>() == Some(false) {
        reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
-        Step::Continue(())
-    }
-
-    #[inline(always)]
-    pub(crate) fn op_assert(
-        &mut self,
-        ctx: &mut impl VmRuntimeCtx,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-    ) -> Step {
-        let raw_id = reader.read_string_id();
-        let raw = ctx.resolve_string(raw_id);
-        let _span_id = reader.read_u32();
-        let assertion = self.force_and_retry::<bool>(reader, mc)?;
-        if !assertion {
-            // FIXME: use catchable error
-            return self.finish_err(Error::eval_error(format!("assertion '{raw}' failed")));
-        }
-        Step::Continue(())
    }
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_jump_if_true<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let offset = reader.read_i32();
+    let cond = m.force_and_retry::<StrictValue>(reader, mc)?;
+    if cond.as_inline::<bool>() == Some(true) {
+        reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
+    }
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_jump<'gc, M: Machine<'gc>>(_m: &mut M, reader: &mut BytecodeReader<'_>) -> Step {
+    let offset = reader.read_i32();
+    reader.set_pc(((reader.pc() as isize) + (offset as isize)) as usize);
+    Step::Continue(())
+}
+
+#[inline(always)]
+pub(crate) fn op_assert<'gc, M: Machine<'gc>>(
+    m: &mut M,
+    ctx: &mut impl VmRuntimeCtx,
+    reader: &mut BytecodeReader<'_>,
+    mc: &Mutation<'gc>,
+) -> Step {
+    let raw_id = reader.read_string_id();
+    let raw = ctx.resolve_string(raw_id);
+    let _span_id = reader.read_u32();
+    let assertion = m.force_and_retry::<bool>(reader, mc)?;
+    if !assertion {
+        // FIXME: use catchable error
+        return m.finish_err(Error::eval_error(format!("assertion '{raw}' failed")));
+    }
+    Step::Continue(())
 }