Skip to content

Full direct threaded inline immediates #213

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

Open
malcolmstill wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Full direct threaded inline immediates #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f70b9c5
Dispatch directly with function pointer address instead of lookup thr…
malcolmstill Jan 22, 2023
779d9c4
Also patch for instructions
malcolmstill Jan 22, 2023
5a2ebec
More patching
malcolmstill Jan 22, 2023
5cd499a
Fixes
malcolmstill Jul 23, 2023
0879aa2
@call(.auto, ...)
malcolmstill Jul 23, 2023
ab7a333
WIP immediates
malcolmstill Jul 30, 2023
aec72df
Working fib
malcolmstill Jul 31, 2023
896be6f
fast_call patching
malcolmstill Jul 31, 2023
dabf6d6
Remove panics
malcolmstill Jul 31, 2023
582990e
Fix miscDispatch
malcolmstill Jul 31, 2023
a77dfef
Remove comment
malcolmstill Jul 31, 2023
a21a847
Combine Instruction and Immediates array
malcolmstill Jul 31, 2023
f39a945
Fix br
malcolmstill Jul 31, 2023
00e9c32
WIP
malcolmstill Jul 31, 2023
39c16f4
Working
malcolmstill Aug 1, 2023
04aee43
Clean up
malcolmstill Aug 1, 2023
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
1,246 changes: 655 additions & 591 deletions src/instance/vm.zig
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 35 additions & 18 deletions src/module.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const leb = std.leb;
const math = std.math;
const unicode = std.unicode;
const ArrayList = std.ArrayList;
const VirtualMachine = @import("instance/vm.zig").VirtualMachine;
const Rr = @import("rr.zig").Rr;
const RrOpcode = @import("rr.zig").RrOpcode;
const Instance = @import("instance.zig").Instance;
Expand Down Expand Up @@ -34,7 +35,8 @@ pub const Module = struct {
function_index_start: ?usize = null,
data_count: ?u32 = null,
element_init_offsets: ArrayList(usize),
parsed_code: ArrayList(Rr),
// parsed_code: ArrayList(Rr),
instructions: ArrayList(u64),
local_types: ArrayList(LocalType),
br_table_indices: ArrayList(u32),
references: ArrayList(u32),
Expand All @@ -56,7 +58,8 @@ pub const Module = struct {
.codes = Section(Code).init(alloc),
.datas = Section(DataSegment).init(alloc),
.element_init_offsets = ArrayList(usize).init(alloc),
.parsed_code = ArrayList(Rr).init(alloc),
// .parsed_code = ArrayList(Rr).init(alloc),
.instructions = ArrayList(u64).init(alloc),
.local_types = ArrayList(LocalType).init(alloc),
.br_table_indices = ArrayList(u32).init(alloc),
.references = ArrayList(u32).init(alloc),
Expand All @@ -77,7 +80,8 @@ pub const Module = struct {
self.datas.deinit();

self.element_init_offsets.deinit();
self.parsed_code.deinit();
// self.parsed_code.deinit();
self.instructions.deinit();
self.local_types.deinit();
self.br_table_indices.deinit();
self.references.deinit();
Expand All @@ -96,7 +100,7 @@ pub const Module = struct {
// Push an initial return instruction so we don't have to
// track the end of a function to use its return on invoke
// See https://github.com/malcolmstill/zware/pull/133
try self.parsed_code.append(.@"return");
try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"return")));

var i: usize = 0;
while (true) : (i += 1) {
Expand Down Expand Up @@ -474,9 +478,12 @@ pub const Module = struct {

try self.references.append(funcidx);

const init_offset = self.parsed_code.items.len;
try self.parsed_code.append(Rr{ .@"ref.func" = funcidx });
try self.parsed_code.append(Rr.@"return");
const init_offset = self.instructions.items.len;

try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"ref.func")));
try self.instructions.append(funcidx);
try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"return")));

try self.element_init_offsets.append(init_offset);
}

Expand Down Expand Up @@ -505,9 +512,12 @@ pub const Module = struct {

try self.references.append(funcidx);

const init_offset = self.parsed_code.items.len;
try self.parsed_code.append(Rr{ .@"ref.func" = funcidx });
try self.parsed_code.append(Rr.@"return");
const init_offset = self.instructions.items.len;

try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"ref.func")));
try self.instructions.append(funcidx);
try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"return")));

try self.element_init_offsets.append(init_offset);
}

Expand Down Expand Up @@ -538,9 +548,12 @@ pub const Module = struct {

try self.references.append(funcidx);

const init_offset = self.parsed_code.items.len;
try self.parsed_code.append(Rr{ .@"ref.func" = funcidx });
try self.parsed_code.append(Rr.@"return");
const init_offset = self.instructions.items.len;

try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"ref.func")));
try self.instructions.append(funcidx);
try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"return")));

try self.element_init_offsets.append(init_offset);
}

Expand Down Expand Up @@ -568,9 +581,12 @@ pub const Module = struct {

try self.references.append(funcidx);

const init_offset = self.parsed_code.items.len;
try self.parsed_code.append(Rr{ .@"ref.func" = funcidx });
try self.parsed_code.append(Rr.@"return");
const init_offset = self.instructions.items.len;

try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"ref.func")));
try self.instructions.append(funcidx);
try self.instructions.append(@as(u64, @intFromPtr(&VirtualMachine.@"return")));

try self.element_init_offsets.append(init_offset);
}

Expand Down Expand Up @@ -615,7 +631,7 @@ pub const Module = struct {

var j: usize = 0;
while (j < expr_count) : (j += 1) {
const init_offset = self.parsed_code.items.len;
const init_offset = self.instructions.items.len;
_ = try self.readConstantExpression(.FuncRef);
try self.element_init_offsets.append(init_offset);
}
Expand Down Expand Up @@ -662,7 +678,8 @@ pub const Module = struct {
const count = try self.readULEB128(u32);
self.codes.count = count;

try self.parsed_code.ensureTotalCapacity(count * 32);
// FIXME: better heuristic + also ensure immediates_offset + immediates
try self.instructions.ensureTotalCapacity(count * 32);

if (count == 0) return;

Expand Down
Loading