WIP

malcolmstill · Jan 30, 2023 · fea39c1 · fea39c1
1 parent 8676bb8
commit fea39c1
Show file tree

Hide file tree

Showing 5 changed files with 1,134 additions and 877 deletions.
diff --git a/src/instance.zig b/src/instance.zig
@@ -11,6 +11,7 @@ const Global = @import("store/global.zig").Global;
 const Elem = @import("store/elem.zig").Elem;
 const Data = @import("store/data.zig").Data;
 const VirtualMachine = @import("instance/vm.zig").VirtualMachine;
+const Instruction = VirtualMachine.Instruction;
 
 const VirtualMachineOptions = struct {
     frame_stack_size: comptime_int = 1024,
@@ -322,7 +323,7 @@ pub const Instance = struct {
                 try vm.pushLabel(VirtualMachine.Label{
                     .return_arity = function.results.len,
                     .op_stack_len = locals_start,
-                    .branch_target = 0,
+                    .branch_target = @ptrCast([*]Instruction, &self.module.instructions.items[0]),
                 });
 
                 // 8. Execute our function
@@ -371,7 +372,7 @@ pub const Instance = struct {
                 try vm.pushLabel(VirtualMachine.Label{
                     .return_arity = 0,
                     .op_stack_len = locals_start,
-                    .branch_target = 0,
+                    .branch_target = @ptrCast([*]Instruction, &self.module.instructions.items[0]),
                 });
 
                 try vm.invoke(f.start);
@@ -402,6 +403,7 @@ pub const Instance = struct {
         try vm.pushLabel(VirtualMachine.Label{
             .return_arity = 1,
             .op_stack_len = locals_start,
+            .branch_target = @ptrCast([*]Instruction, &self.module.instructions.items[0]),
         });
 
         try vm.invoke(start);