Skip to content

Inline immediates #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
malcolmstill wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Inline immediates #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/instance.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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,
Expand Down Expand Up @@ -348,7 +349,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 = @as([*]Instruction, @ptrCast(&self.module.instructions.items[0])),
});

// 8. Execute our function
Expand Down Expand Up @@ -397,7 +398,7 @@ pub const Instance = struct {
try vm.pushLabel(VirtualMachine.Label{
.return_arity = 0,
.op_stack_len = locals_start,
.branch_target = 0,
.branch_target = @as([*]Instruction, @ptrCast(&self.module.instructions.items[0])),
});

try vm.invoke(f.start);
Expand All @@ -409,7 +410,7 @@ pub const Instance = struct {
}
}

pub fn invokeExpression(self: *Instance, start: usize, comptime Result: type, comptime options: VirtualMachineOptions) !Result {
pub fn invokeExpression(self: *Instance, start: [*]Instruction, comptime Result: type, comptime options: VirtualMachineOptions) !Result {
var frame_stack: [options.frame_stack_size]VirtualMachine.Frame = [_]VirtualMachine.Frame{undefined} ** options.frame_stack_size;
var label_stack: [options.label_stack_size]VirtualMachine.Label = [_]VirtualMachine.Label{undefined} ** options.label_stack_size;
var op_stack: [options.operand_stack_size]u64 = [_]u64{0} ** options.operand_stack_size;
Expand All @@ -428,6 +429,7 @@ pub const Instance = struct {
try vm.pushLabel(VirtualMachine.Label{
.return_arity = 1,
.op_stack_len = locals_start,
.branch_target = @as([*]Instruction, @ptrCast(&self.module.instructions.items[0])),
});

try vm.invoke(start);
Expand Down
Loading