diff options
| author | 2021-08-03 19:04:24 -0700 | |
|---|---|---|
| committer | 2021-08-03 19:04:24 -0700 | |
| commit | 58fd17867d661a8eb162efec7d39a6ab1c0fd6fd (patch) | |
| tree | 1ad2e204087b8b77900d7a26147c58752560b86d /src/javascript/jsc | |
| parent | 3b684308c3153a6ca84faa0fecc49b76bbf941a8 (diff) | |
| download | bun-58fd17867d661a8eb162efec7d39a6ab1c0fd6fd.tar.gz bun-58fd17867d661a8eb162efec7d39a6ab1c0fd6fd.tar.zst bun-58fd17867d661a8eb162efec7d39a6ab1c0fd6fd.zip | |
Threader
Former-commit-id: a13dd6402f54527e87e9afdbbf48e5ff1501c8f9
Diffstat (limited to 'src/javascript/jsc')
| -rw-r--r-- | src/javascript/jsc/bindings/ZigGlobalObject.cpp | 1 | ||||
| -rw-r--r-- | src/javascript/jsc/bindings/bindings.cpp | 42 | ||||
| -rw-r--r-- | src/javascript/jsc/bindings/headers-cpp.h | 6 | ||||
| -rw-r--r-- | src/javascript/jsc/bindings/sizes.zig | 6 |
4 files changed, 31 insertions, 24 deletions
diff --git a/src/javascript/jsc/bindings/ZigGlobalObject.cpp b/src/javascript/jsc/bindings/ZigGlobalObject.cpp index 2e5963ef7..f09281fa7 100644 --- a/src/javascript/jsc/bindings/ZigGlobalObject.cpp +++ b/src/javascript/jsc/bindings/ZigGlobalObject.cpp @@ -53,6 +53,7 @@ namespace JSCastingHelpers = JSC::JSCastingHelpers; extern "C" JSC__JSGlobalObject *Zig__GlobalObject__create(JSClassRef *globalObjectClass, int count, void *console_client) { std::set_terminate([]() { Zig__GlobalObject__onCrash(); }); + WTF::initializeMainThread(); JSC::initialize(); JSC::VM &vm = JSC::VM::create(JSC::LargeHeap).leakRef(); diff --git a/src/javascript/jsc/bindings/bindings.cpp b/src/javascript/jsc/bindings/bindings.cpp index c38cb2bb0..6d08f3854 100644 --- a/src/javascript/jsc/bindings/bindings.cpp +++ b/src/javascript/jsc/bindings/bindings.cpp @@ -437,60 +437,66 @@ void JSC__SourceCode__fromString(JSC__SourceCode *arg0, const WTF__String *arg1, JSC__JSValue JSC__JSFunction__callWithArguments(JSC__JSValue JSValue0, JSC__JSGlobalObject *arg1, JSC__JSValue *arg2, size_t arg3, - JSC__Exception **arg4, const char *arg5) { + JSC__Exception **arg4, const unsigned char *arg5) { auto args = makeArgs(arg2, arg3); - return JSC::JSValue::encode( - JSC::call(arg1, JSC::JSValue::decode(JSValue0), JSC::JSValue::decode(JSValue0), args, arg5)); + return JSC::JSValue::encode(JSC::call(arg1, JSC::JSValue::decode(JSValue0), + JSC::JSValue::decode(JSValue0), args, (const char *)arg5)); } JSC__JSValue JSC__JSFunction__callWithArgumentsAndThis(JSC__JSValue JSValue0, JSC__JSValue JSValue1, JSC__JSGlobalObject *arg2, JSC__JSValue *arg3, size_t arg4, - JSC__Exception **arg5, const char *arg6) { + JSC__Exception **arg5, + const unsigned char *arg6) { auto args = makeArgs(arg3, arg4); - return JSC::JSValue::encode( - JSC::call(arg2, JSC::JSValue::decode(JSValue0), JSC::JSValue::decode(JSValue1), args, arg6)); + return JSC::JSValue::encode(JSC::call(arg2, JSC::JSValue::decode(JSValue0), + JSC::JSValue::decode(JSValue1), args, (const char *)arg6)); } JSC__JSValue JSC__JSFunction__callWithoutAnyArgumentsOrThis(JSC__JSValue JSValue0, JSC__JSGlobalObject *arg1, JSC__Exception **arg2, - const char *arg3) { + const unsigned char *arg3) { return JSC::JSValue::encode(JSC::call(arg1, JSC::JSValue::decode(JSValue0), - JSC::JSValue::decode(JSValue0), JSC::ArgList(), arg3)); + JSC::JSValue::decode(JSValue0), JSC::ArgList(), + (const char *)arg3)); } JSC__JSValue JSC__JSFunction__callWithThis(JSC__JSValue JSValue0, JSC__JSGlobalObject *arg1, JSC__JSValue JSValue2, JSC__Exception **arg3, - const char *arg4) { + const unsigned char *arg4) { return JSC::JSValue::encode(JSC::call(arg1, JSC::JSValue::decode(JSValue0), - JSC::JSValue::decode(JSValue2), JSC::ArgList(), arg4)); + JSC::JSValue::decode(JSValue2), JSC::ArgList(), + (const char *)arg4)); } JSC__JSValue JSC__JSFunction__constructWithArguments(JSC__JSValue JSValue0, JSC__JSGlobalObject *arg1, JSC__JSValue *arg2, size_t arg3, JSC__Exception **arg4, - const char *arg5) { + const unsigned char *arg5) { auto args = makeArgs(arg2, arg3); - return JSC::JSValue::encode(JSC::construct(arg1, JSC::JSValue::decode(JSValue0), args, arg5)); + return JSC::JSValue::encode( + JSC::construct(arg1, JSC::JSValue::decode(JSValue0), args, (const char *)arg5)); } JSC__JSValue JSC__JSFunction__constructWithArgumentsAndNewTarget( JSC__JSValue JSValue0, JSC__JSValue JSValue1, JSC__JSGlobalObject *arg2, JSC__JSValue *arg3, - size_t arg4, JSC__Exception **arg5, const char *arg6) { + size_t arg4, JSC__Exception **arg5, const unsigned char *arg6) { auto args = makeArgs(arg3, arg4); return JSC::JSValue::encode(JSC::construct(arg2, JSC::JSValue::decode(JSValue0), - JSC::JSValue::decode(JSValue0), args, arg6)); + JSC::JSValue::decode(JSValue0), args, + (const char *)arg6)); } JSC__JSValue JSC__JSFunction__constructWithNewTarget(JSC__JSValue JSValue0, JSC__JSGlobalObject *arg1, JSC__JSValue JSValue2, JSC__Exception **arg3, - const char *arg4) { + const unsigned char *arg4) { return JSC::JSValue::encode(JSC::construct(arg1, JSC::JSValue::decode(JSValue0), - JSC::JSValue::decode(JSValue2), JSC::ArgList(), arg4)); + JSC::JSValue::decode(JSValue2), JSC::ArgList(), + (const char *)arg4)); } JSC__JSValue JSC__JSFunction__constructWithoutAnyArgumentsOrNewTarget(JSC__JSValue JSValue0, JSC__JSGlobalObject *arg1, JSC__Exception **arg2, - const char *arg3) { + const unsigned char *arg3) { return JSC::JSValue::encode( - JSC::construct(arg1, JSC::JSValue::decode(JSValue0), JSC::ArgList(), arg3)); + JSC::construct(arg1, JSC::JSValue::decode(JSValue0), JSC::ArgList(), (const char *)arg3)); } JSC__JSFunction *JSC__JSFunction__createFromNative(JSC__JSGlobalObject *arg0, uint16_t arg1, diff --git a/src/javascript/jsc/bindings/headers-cpp.h b/src/javascript/jsc/bindings/headers-cpp.h index 2978b8e9a..e8eecf4c5 100644 --- a/src/javascript/jsc/bindings/headers-cpp.h +++ b/src/javascript/jsc/bindings/headers-cpp.h @@ -224,8 +224,8 @@ extern "C" const size_t Zig__GlobalObject_object_align_ = alignof(Zig::GlobalObj extern "C" const size_t Zig__ConsoleClient_object_size_ = sizeof(Zig::ConsoleClient); extern "C" const size_t Zig__ConsoleClient_object_align_ = alignof(Zig::ConsoleClient); -const size_t sizes[28] = {sizeof(JSC::JSObject), sizeof(ZigString), sizeof(JSC::JSCell), sizeof(JSC::JSString), sizeof(Inspector::ScriptArguments), sizeof(JSC::JSModuleLoader), sizeof(JSC::JSModuleRecord), sizeof(JSC::JSPromise), sizeof(JSC::JSInternalPromise), sizeof(JSC::SourceOrigin), sizeof(JSC::SourceCode), sizeof(JSC::JSFunction), sizeof(JSC::JSGlobalObject), sizeof(WTF::URL), sizeof(WTF::String), sizeof(JSC::JSValue), sizeof(JSC::PropertyName), sizeof(JSC::Exception), sizeof(JSC::VM), sizeof(JSC::ThrowScope), sizeof(JSC::CatchScope), sizeof(JSC::CallFrame), sizeof(JSC::Identifier), sizeof(WTF::StringImpl), sizeof(WTF::ExternalStringImpl), sizeof(WTF::StringView), sizeof(Zig::GlobalObject), sizeof(ZigException)}; +const size_t sizes[26] = {sizeof(JSC::JSObject), sizeof(JSC::JSCell), sizeof(JSC::JSString), sizeof(Inspector::ScriptArguments), sizeof(JSC::JSModuleLoader), sizeof(JSC::JSModuleRecord), sizeof(JSC::JSPromise), sizeof(JSC::JSInternalPromise), sizeof(JSC::SourceOrigin), sizeof(JSC::SourceCode), sizeof(JSC::JSFunction), sizeof(JSC::JSGlobalObject), sizeof(WTF::URL), sizeof(WTF::String), sizeof(JSC::JSValue), sizeof(JSC::PropertyName), sizeof(JSC::Exception), sizeof(JSC::VM), sizeof(JSC::ThrowScope), sizeof(JSC::CatchScope), sizeof(JSC::CallFrame), sizeof(JSC::Identifier), sizeof(WTF::StringImpl), sizeof(WTF::ExternalStringImpl), sizeof(WTF::StringView), sizeof(Zig::GlobalObject), }; -const char* names[28] = {"JSC__JSObject", "ZigString", "JSC__JSCell", "JSC__JSString", "Inspector__ScriptArguments", "JSC__JSModuleLoader", "JSC__JSModuleRecord", "JSC__JSPromise", "JSC__JSInternalPromise", "JSC__SourceOrigin", "JSC__SourceCode", "JSC__JSFunction", "JSC__JSGlobalObject", "WTF__URL", "WTF__String", "JSC__JSValue", "JSC__PropertyName", "JSC__Exception", "JSC__VM", "JSC__ThrowScope", "JSC__CatchScope", "JSC__CallFrame", "JSC__Identifier", "WTF__StringImpl", "WTF__ExternalStringImpl", "WTF__StringView", "Zig__GlobalObject", "ZigException"}; +const char* names[26] = {"JSC__JSObject", "JSC__JSCell", "JSC__JSString", "Inspector__ScriptArguments", "JSC__JSModuleLoader", "JSC__JSModuleRecord", "JSC__JSPromise", "JSC__JSInternalPromise", "JSC__SourceOrigin", "JSC__SourceCode", "JSC__JSFunction", "JSC__JSGlobalObject", "WTF__URL", "WTF__String", "JSC__JSValue", "JSC__PropertyName", "JSC__Exception", "JSC__VM", "JSC__ThrowScope", "JSC__CatchScope", "JSC__CallFrame", "JSC__Identifier", "WTF__StringImpl", "WTF__ExternalStringImpl", "WTF__StringView", "Zig__GlobalObject", }; -const size_t aligns[28] = {alignof(JSC::JSObject), alignof(ZigString), alignof(JSC::JSCell), alignof(JSC::JSString), alignof(Inspector::ScriptArguments), alignof(JSC::JSModuleLoader), alignof(JSC::JSModuleRecord), alignof(JSC::JSPromise), alignof(JSC::JSInternalPromise), alignof(JSC::SourceOrigin), alignof(JSC::SourceCode), alignof(JSC::JSFunction), alignof(JSC::JSGlobalObject), alignof(WTF::URL), alignof(WTF::String), alignof(JSC::JSValue), alignof(JSC::PropertyName), alignof(JSC::Exception), alignof(JSC::VM), alignof(JSC::ThrowScope), alignof(JSC::CatchScope), alignof(JSC::CallFrame), alignof(JSC::Identifier), alignof(WTF::StringImpl), alignof(WTF::ExternalStringImpl), alignof(WTF::StringView), alignof(Zig::GlobalObject), alignof(ZigException)}; +const size_t aligns[26] = {alignof(JSC::JSObject), alignof(JSC::JSCell), alignof(JSC::JSString), alignof(Inspector::ScriptArguments), alignof(JSC::JSModuleLoader), alignof(JSC::JSModuleRecord), alignof(JSC::JSPromise), alignof(JSC::JSInternalPromise), alignof(JSC::SourceOrigin), alignof(JSC::SourceCode), alignof(JSC::JSFunction), alignof(JSC::JSGlobalObject), alignof(WTF::URL), alignof(WTF::String), alignof(JSC::JSValue), alignof(JSC::PropertyName), alignof(JSC::Exception), alignof(JSC::VM), alignof(JSC::ThrowScope), alignof(JSC::CatchScope), alignof(JSC::CallFrame), alignof(JSC::Identifier), alignof(WTF::StringImpl), alignof(WTF::ExternalStringImpl), alignof(WTF::StringView), alignof(Zig::GlobalObject), }; diff --git a/src/javascript/jsc/bindings/sizes.zig b/src/javascript/jsc/bindings/sizes.zig index 2b5c4d593..ef4cddb6f 100644 --- a/src/javascript/jsc/bindings/sizes.zig +++ b/src/javascript/jsc/bindings/sizes.zig @@ -1,4 +1,4 @@ -// Auto-generated by src/javascript/jsc/headergen/sizegen.cpp at 2021-07-26 01:37:1627288660. +// Auto-generated by src/javascript/jsc/headergen/sizegen.cpp at 2021-08-03 17:20:1628036419. // These are the byte sizes for the different object types with bindings in JavaScriptCore. // This allows us to safely return stack allocated C++ types to Zig. // It is only safe to do this when these sizes are correct. @@ -21,8 +21,6 @@ pub const JSC__JSString = 16; pub const JSC__JSString_align = 8; pub const Inspector__ScriptArguments = 32; pub const Inspector__ScriptArguments_align = 8; -pub const Zig__GlobalObject = 2400; -pub const Zig__GlobalObject_align = 8; pub const JSC__JSModuleLoader = 16; pub const JSC__JSModuleLoader_align = 8; pub const JSC__JSModuleRecord = 216; @@ -65,3 +63,5 @@ pub const WTF__ExternalStringImpl = 32; pub const WTF__ExternalStringImpl_align = 8; pub const WTF__StringView = 16; pub const WTF__StringView_align = 8; +pub const Zig__GlobalObject = 2400; +pub const Zig__GlobalObject_align = 8; |
