zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sysjs: Allow passing arbitary values (called 'captures') alongside native functions

Browse source
This commit is contained in:
iddev5 2022-07-17 17:58:05 +05:30 • committed by Stephen Gutekanst
parent b39261a655
commit 4c264c80cd
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sysjs/src/mach-sysjs.js
View file

@ -108,10 +108,10 @@ const zig = {
return zig.addValue(memory.getString(str, len)); return zig.addValue(memory.getString(str, len));
}, },
zigCreateFunction(id) { zigCreateFunction(id, captures, len) {
return zig.addValue(function () { return zig.addValue(function () {
const args = zig.addValue(arguments); const args = zig.addValue(arguments);
zig.wasm.exports.wasmCallFunction(id, args, arguments.length); zig.wasm.exports.wasmCallFunction(id, args, arguments.length, captures, len);
const return_value = values[args]["return_value"]; const return_value = values[args]["return_value"];
zig.zigCleanupObject(args); zig.zigCleanupObject(args);
return return_value; return return_value;

20
sysjs/src/main.zig
View file

@ -6,7 +6,7 @@ const js = struct {
extern fn zigCreateMap() u32; extern fn zigCreateMap() u32;
extern fn zigCreateArray() u32; extern fn zigCreateArray() u32;
extern fn zigCreateString(str: [*]const u8, len: u32) u32; extern fn zigCreateString(str: [*]const u8, len: u32) u32;
extern fn zigCreateFunction(id: *const anyopaque) u32; extern fn zigCreateFunction(id: *const anyopaque, captures: [*]Value, len: u32) u32;
extern fn zigGetAttributeCount(id: u64) u32; extern fn zigGetAttributeCount(id: u64) u32;
extern fn zigGetProperty(id: u64, name: [*]const u8, len: u32, ret_ptr: *anyopaque) void; extern fn zigGetProperty(id: u64, name: [*]const u8, len: u32, ret_ptr: *anyopaque) void;
extern fn zigSetProperty(id: u64, name: [*]const u8, len: u32, set_ptr: *const anyopaque) void; extern fn zigSetProperty(id: u64, name: [*]const u8, len: u32, set_ptr: *const anyopaque) void;
@ -197,13 +197,17 @@ pub const String = struct {
} }
}; };
export fn wasmCallFunction(id: *anyopaque, args: u32, len: u32) void { export fn wasmCallFunction(id: *anyopaque, args: u32, len: u32, captures: [*]Value, captures_len: u32) void {
var captures_slice: []Value = undefined;
captures_slice.ptr = captures;
captures_slice.len = captures_len;
const obj = Object{ .ref = args }; const obj = Object{ .ref = args };
if (builtin.zig_backend == .stage1) { if (builtin.zig_backend == .stage1) {
obj.set("return_value", functions.items[@ptrToInt(id) - 1](obj, len)); obj.set("return_value", functions.items[@ptrToInt(id) - 1](obj, len, captures_slice));
} else { } else {
var func = @ptrCast(*FunType, @alignCast(std.meta.alignment(*FunType), id)); var func = @ptrCast(*FunType, @alignCast(std.meta.alignment(*FunType), id));
obj.set("return_value", func(obj, len)); obj.set("return_value", func(obj, len, captures_slice));
} }
} }
@ -239,16 +243,16 @@ pub fn createUndefined() Value {
return .{ .tag = .undef, .val = undefined }; return .{ .tag = .undef, .val = undefined };
} }
const FunType = fn (args: Object, args_len: u32) Value; const FunType = fn (args: Object, args_len: u32, captures: []Value) Value;
var functions: std.ArrayListUnmanaged(FunType) = .{}; var functions: std.ArrayListUnmanaged(FunType) = .{};
pub fn createFunction(fun: FunType) Function { pub fn createFunction(fun: FunType, captures: []Value) Function {
if (builtin.zig_backend == .stage1) { if (builtin.zig_backend == .stage1) {
functions.append(std.heap.page_allocator, fun) catch unreachable; functions.append(std.heap.page_allocator, fun) catch unreachable;
return .{ .ref = js.zigCreateFunction(@intToPtr(*anyopaque, functions.items.len)) }; return .{ .ref = js.zigCreateFunction(@intToPtr(*anyopaque, functions.items.len), captures.ptr, captures.len) };
} }
return .{ .ref = js.zigCreateFunction(&fun) }; return .{ .ref = js.zigCreateFunction(&fun, captures.ptr, captures.len) };
} }
pub fn constructType(t: []const u8, args: []const Value) Object { pub fn constructType(t: []const u8, args: []const Value) Object {