mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-14 21:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Last commit was missing some code

Browse Source
This commit is contained in:
Jarred Sumner
2022-09-08 23:37:59 -07:00
parent 206820d27a
commit bcbe1b410a
2 changed files with 234 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
src/bun.js/api/bun.zig
View File

@@ -274,7 +274,7 @@ pub fn getStdin(
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("BunSTDIN"));
var existing = ctx.ptr().getCachedObject(ZigString.static("BunSTDIN"));
if (existing.isEmpty()) {
var rare_data = JSC.VirtualMachine.vm.rareData();
var store = rare_data.stdin();
@@ -297,7 +297,7 @@ pub fn getStderr(
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("BunSTDERR"));
var existing = ctx.ptr().getCachedObject(ZigString.static("BunSTDERR"));
if (existing.isEmpty()) {
var rare_data = JSC.VirtualMachine.vm.rareData();
var store = rare_data.stderr();
@@ -320,7 +320,7 @@ pub fn getStdout(
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("BunSTDOUT"));
var existing = ctx.ptr().getCachedObject(ZigString.static("BunSTDOUT"));
if (existing.isEmpty()) {
var rare_data = JSC.VirtualMachine.vm.rareData();
var store = rare_data.stdout();
@@ -1681,7 +1681,7 @@ pub fn getTranspilerConstructor(
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("BunTranspiler"));
var existing = ctx.ptr().getCachedObject(ZigString.static("BunTranspiler"));
if (existing.isEmpty()) {
return ctx.ptr().putCachedObject(
&ZigString.init("BunTranspiler"),
@@ -1699,7 +1699,7 @@ pub fn getHashObject(
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("BunHash"));
var existing = ctx.ptr().getCachedObject(ZigString.static("BunHash"));
if (existing.isEmpty()) {
return ctx.ptr().putCachedObject(
&ZigString.init("BunHash"),
@@ -1833,7 +1833,7 @@ pub fn getTOMLObject(
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("TOML"));
var existing = ctx.ptr().getCachedObject(ZigString.static("TOML"));
if (existing.isEmpty()) {
return ctx.ptr().putCachedObject(
&ZigString.init("TOML"),
@@ -1851,7 +1851,7 @@ pub fn getUnsafe(
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("Unsafe"));
var existing = ctx.ptr().getCachedObject(ZigString.static("Unsafe"));
if (existing.isEmpty()) {
return ctx.ptr().putCachedObject(
&ZigString.init("Unsafe"),
@@ -2290,6 +2290,7 @@ pub const FFI = struct {
.rfn = JSC.wrapWithHasContainer(JSC.FFI, "linkSymbols", false, false, false),
},
.ptr = JSC.DOMCall("FFI", @This(), "ptr", f64, JSC.DOMEffect.forRead(.TypedArrayProperties)),
.toBuffer = .{
.rfn = JSC.wrapWithHasContainer(@This(), "toBuffer", false, false, true),
},
@@ -2298,12 +2299,209 @@ pub const FFI = struct {
},
},
.{
.read = .{
.get = FFI.Reader.getter,
},
.CString = .{
.get = UnsafeCString.getter,
},
},
);
pub const Reader = struct {
pub const Class = NewClass(
void,
.{ .name = "FFI", .has_dom_calls = true },
.{
.@"u8" = JSC.DOMCall("Reader", @This(), "u8", i32, JSC.DOMEffect.forRead(.World)),
.@"u16" = JSC.DOMCall("Reader", @This(), "u16", i32, JSC.DOMEffect.forRead(.World)),
.@"u32" = JSC.DOMCall("Reader", @This(), "u32", i32, JSC.DOMEffect.forRead(.World)),
.@"ptr" = JSC.DOMCall("Reader", @This(), "ptr", i64, JSC.DOMEffect.forRead(.World)),
.@"i8" = JSC.DOMCall("Reader", @This(), "i8", i32, JSC.DOMEffect.forRead(.World)),
.@"i16" = JSC.DOMCall("Reader", @This(), "i16", i32, JSC.DOMEffect.forRead(.World)),
.@"i32" = JSC.DOMCall("Reader", @This(), "i32", i32, JSC.DOMEffect.forRead(.World)),
.@"intptr" = JSC.DOMCall("Reader", @This(), "intptr", i64, JSC.DOMEffect.forRead(.World)),
},
.{},
);
pub fn @"u8"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, arguments[1].to(i32));
const value = @intToPtr(*align(1) u8, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"u16"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, arguments[1].to(i32));
const value = @intToPtr(*align(1) u16, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"u32"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, if (arguments.len > 1) arguments[1].to(i32) else @as(i32, 0));
const value = @intToPtr(*align(1) u32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"ptr"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, if (arguments.len > 1) arguments[1].to(i32) else @as(i32, 0));
const value = @intToPtr(*align(1) u64, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i8"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, if (arguments.len > 1) arguments[1].to(i32) else @as(i32, 0));
const value = @intToPtr(*align(1) i8, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i16"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, if (arguments.len > 1) arguments[1].to(i32) else @as(i32, 0));
const value = @intToPtr(*align(1) i16, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i32"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, if (arguments.len > 1) arguments[1].to(i32) else @as(i32, 0));
const value = @intToPtr(*align(1) i32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"intptr"(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
) JSValue {
const addr = arguments[0].asPtrAddress() + @intCast(usize, if (arguments.len > 1) arguments[1].to(i32) else @as(i32, 0));
const value = @intToPtr(*align(1) i64, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"u8WithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) u8, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"u16WithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) u16, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"u32WithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) u32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"ptrWithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) u64, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i8WithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) i8, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i16WithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) i16, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i32WithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) i32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"intptrWithoutTypeChecks"(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
const addr = @intCast(usize, raw_addr + @as(i64, offset));
const value = @intToPtr(*align(1) i64, addr).*;
return JSValue.jsNumber(value);
}
pub fn getter(
_: void,
ctx: js.JSContextRef,
_: js.JSValueRef,
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(ZigString.static("FFIReader"));
if (existing.isEmpty()) {
var prototype = JSC.C.JSObjectMake(ctx, FFI.Reader.Class.get().?[0], null);
var base = JSC.C.JSObjectMake(ctx, null, null);
JSC.C.JSObjectSetPrototype(ctx, base, prototype);
FFI.Reader.Class.putDOMCalls(ctx, JSC.JSValue.c(base));
return ctx.ptr().putCachedObject(
ZigString.static("FFIReader"),
JSValue.fromRef(base),
).asObjectRef();
}
return existing.asObjectRef();
}
};
pub fn ptr(
globalThis: *JSGlobalObject,
_: JSValue,
@@ -2583,14 +2781,14 @@ pub const FFI = struct {
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("FFI"));
var existing = ctx.ptr().getCachedObject(ZigString.static("FFI"));
if (existing.isEmpty()) {
var prototype = JSC.C.JSObjectMake(ctx, FFI.Class.get().?[0], null);
var base = JSC.C.JSObjectMake(ctx, null, null);
JSC.C.JSObjectSetPrototype(ctx, base, prototype);
FFI.Class.putDOMCalls(ctx, JSC.JSValue.c(base));
return ctx.ptr().putCachedObject(
&ZigString.init("FFI"),
ZigString.static("FFI"),
JSValue.fromRef(base),
).asObjectRef();
}
@@ -2633,10 +2831,10 @@ pub const UnsafeCString = struct {
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("UnsafeCString"));
var existing = ctx.ptr().getCachedObject(ZigString.static("UnsafeCString"));
if (existing.isEmpty()) {
return ctx.ptr().putCachedObject(
&ZigString.init("UnsafeCString"),
ZigString.static("UnsafeCString"),
JSValue.fromRef(JSC.C.JSObjectMakeConstructor(ctx, null, constructor)),
).asObjectRef();
}
@@ -2687,10 +2885,10 @@ pub const EnvironmentVariables = struct {
_: js.JSStringRef,
_: js.ExceptionRef,
) js.JSValueRef {
var existing = ctx.ptr().getCachedObject(&ZigString.init("Bun.env"));
var existing = ctx.ptr().getCachedObject(ZigString.static("Bun.env"));
if (existing.isEmpty()) {
return ctx.ptr().putCachedObject(
&ZigString.init("Bun.env"),
ZigString.static("Bun.env"),
JSValue.fromRef(js.JSObjectMake(ctx, EnvironmentVariables.Class.get().*, null)),
).asObjectRef();
}

47
test/bun.js/ffi.test.js
View File

@@ -1,18 +1,14 @@
import { describe, it, expect } from "bun:test";
import { unsafe } from "bun";
import { expect, it } from "bun:test";
//
import {
native,
viewSource,
dlopen as _dlopen,
CString,
ptr,
toBuffer,
toArrayBuffer,
FFIType,
callback,
CFunction,
CString,
dlopen as _dlopen,
ptr,
read,
toArrayBuffer,
toBuffer,
viewSource,
} from "bun:ffi";
const dlopen = (...args) => {
@@ -614,25 +610,28 @@ function ffiRunner(fast) {
// ffiRunner(true);
// });
it("FFI.read", () => {
it("read", () => {
const buffer = new BigInt64Array(64);
const view = new DataView(buffer.buffer);
const ptr_ = ptr(buffer);
const dataView = new DataView(buffer.buffer);
const addr = ptr(buffer);
for (let i = 0; i < 64; i++) {
buffer[i] = BigInt(i);
expect(read.intptr(ptr_, i * 8)).toBe(
Number(view.getBigInt64(i * 8, true))
expect(read.intptr(addr, i * 8)).toBe(
Number(dataView.getBigInt64(i * 8, true))
);
expect(read.ptr(addr, i * 8)).toBe(
Number(dataView.getBigUint64(i * 8, true))
);
expect(read.ptr(ptr_, i * 8)).toBe(Number(view.getBigUint64(i * 8, true)));
}
for (let i = 0; i < buffer.byteLength / 4; i++) {
expect(read.i8(ptr_, i)).toBe(view.getInt8(i, true));
expect(read.i16(ptr_, i)).toBe(view.getInt16(i, true));
expect(read.i32(ptr_, i)).toBe(view.getInt32(i, true));
expect(read.u8(ptr_, i)).toBe(view.getUint8(i, true));
expect(read.u16(ptr_, i)).toBe(view.getUint16(i, true));
expect(read.u32(ptr_, i)).toBe(view.getUint32(i, true));
for (let i = 0; i < buffer.byteLength - 4; i++) {
expect(read.i8(addr, i)).toBe(dataView.getInt8(i, true));
expect(read.i16(addr, i)).toBe(dataView.getInt16(i, true));
expect(read.i32(addr, i)).toBe(dataView.getInt32(i, true));
expect(read.u8(addr, i)).toBe(dataView.getUint8(i, true));
expect(read.u16(addr, i)).toBe(dataView.getUint16(i, true));
expect(read.u32(addr, i)).toBe(dataView.getUint32(i, true));
}
});