refactor: reorganize crate hierarchy
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use fix_abstract_vm::{resolve_operand, *};
|
||||
use fix_builtins::PrimOpPhase;
|
||||
use fix_bytecode::PrimOpPhase;
|
||||
use fix_error::Error;
|
||||
use fix_runtime::{resolve_operand, *};
|
||||
use gc_arena::{Gc, Mutation, RefLock};
|
||||
|
||||
use crate::{
|
||||
@@ -120,7 +120,7 @@ impl<'gc> crate::Vm<'gc> {
|
||||
reader: &mut BytecodeReader<'_>,
|
||||
mc: &Mutation<'gc>,
|
||||
) -> Step {
|
||||
let arg = resolve_operand(&reader.read_operand_data(ctx), mc, self);
|
||||
let arg = resolve_operand(&reader.read_operand_data(), mc, ctx, self);
|
||||
let pc = reader.pc();
|
||||
self.call(reader, mc, arg, pc)
|
||||
}
|
||||
@@ -178,6 +178,6 @@ impl<'gc> crate::Vm<'gc> {
|
||||
reader: &mut BytecodeReader<'_>,
|
||||
mc: &Mutation<'gc>,
|
||||
) -> Step {
|
||||
fix_primops::dispatch_primop(self, ctx, reader, mc)
|
||||
crate::primops::dispatch_primop(self, ctx, reader, mc)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user