koffi 2.7.3 → 2.7.4-beta.1

package/index.js

@@ -378,7 +378,7 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.7.3",
+      version: "2.7.4-beta.1",
       stable: "2.7.3",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [

package/indirect.js

@@ -378,7 +378,7 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.7.3",
+      version: "2.7.4-beta.1",
       stable: "2.7.3",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.7.3",
+    "version": "2.7.4-beta.1",
     "stable": "2.7.3",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [

package/src/koffi/src/abi_arm32.cc

@@ -564,7 +564,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     RG_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
 {
     if (env.IsExceptionPending()) [[unlikely]]
         return;
@@ -827,11 +827,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
 
     // Make the call
     napi_value ret;
-    if (async) {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    } else {
+    if (switch_stack) {
         ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
                               [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
+    } else {
+        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
     }
     Napi::Value value(env, ret);
 

package/src/koffi/src/abi_arm64.cc

@@ -709,7 +709,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     RG_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
 {
     if (env.IsExceptionPending()) [[unlikely]]
         return;
@@ -1143,11 +1143,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
 
     // Make the call
     napi_value ret;
-    if (async) {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    } else {
+    if (switch_stack) {
         ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
                               [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
+    } else {
+        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
     }
     Napi::Value value(env, ret);
 

package/src/koffi/src/abi_riscv64.cc

@@ -506,7 +506,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     RG_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
 {
     if (env.IsExceptionPending()) [[unlikely]]
         return;
@@ -740,11 +740,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
 
     // Make the call
     napi_value ret;
-    if (async) {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    } else {
+    if (switch_stack) {
         ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
                               [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
+    } else {
+        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
     }
     Napi::Value value(env, ret);
 

package/src/koffi/src/abi_x64_sysv.cc

@@ -541,7 +541,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     RG_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
 {
     if (env.IsExceptionPending()) [[unlikely]]
         return;
@@ -764,11 +764,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
 
     // Make the call
     napi_value ret;
-    if (async) {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    } else {
+    if (switch_stack) {
         ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
                               [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
+    } else {
+        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
     }
     Napi::Value value(env, ret);
 

package/src/koffi/src/abi_x64_win.cc

@@ -350,7 +350,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     RG_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
 {
     if (env.IsExceptionPending()) [[unlikely]]
         return;
@@ -587,11 +587,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
 
     // Make the call
     napi_value ret;
-    if (async) {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    } else {
+    if (switch_stack) {
         ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
                               [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
+    } else {
+        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
     }
     Napi::Value value(env, ret);
 

package/src/koffi/src/abi_x86.cc

@@ -464,7 +464,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     RG_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
 {
     if (env.IsExceptionPending()) [[unlikely]]
         return;
@@ -700,11 +700,11 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool async, BackRe
 
     // Make the call
     napi_value ret;
-    if (async) {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    } else {
+    if (switch_stack) {
         ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
                               [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
+    } else {
+        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
     }
     Napi::Value value(env, ret);
 

package/src/koffi/src/call.cc

@@ -101,7 +101,7 @@ void CallData::Dispose()
     instance = nullptr;
 }
 
-void CallData::RelaySafe(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool dispose_call, BackRegisters *out_reg)
+void CallData::RelaySafe(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool outside_call, BackRegisters *out_reg)
 {
     if (std::this_thread::get_id() != instance->main_thread_id) {
         // JS/V8 is single-threaded, and runs on main_thread_id. Forward the call
@@ -110,7 +110,7 @@ void CallData::RelaySafe(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool dis
         RelayContext ctx;
 
         ctx.call = this;
-        ctx.dispose_call = dispose_call;
+        ctx.dispose_call = outside_call;
         ctx.idx = idx;
         ctx.own_sp = own_sp;
         ctx.caller_sp = caller_sp;
@@ -124,8 +124,8 @@ void CallData::RelaySafe(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool dis
             ctx.cv.wait(lock);
         }
     } else {
-        RG_ASSERT(!dispose_call);
-        Relay(idx, own_sp, caller_sp, false, out_reg);
+        Napi::HandleScope scope(env);
+        Relay(idx, own_sp, caller_sp, !outside_call, out_reg);
     }
 }
 
@@ -133,7 +133,7 @@ void CallData::RelayAsync(napi_env, napi_value, void *, void *udata)
 {
     RelayContext *ctx = (RelayContext *)udata;
 
-    ctx->call->Relay(ctx->idx, ctx->own_sp, ctx->caller_sp, true, ctx->out_reg);
+    ctx->call->Relay(ctx->idx, ctx->own_sp, ctx->caller_sp, false, ctx->out_reg);
 
     if (ctx->dispose_call) {
         ctx->call->Dispose();

package/src/koffi/src/call.hh

@@ -107,8 +107,8 @@ public:
 
 #undef INLINE_IF_UNITY
 
-    void Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async, BackRegisters *out_reg);
-    void RelaySafe(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool dispose_call, BackRegisters *out_reg);
+    void Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg);
+    void RelaySafe(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool outside_call, BackRegisters *out_reg);
     static void RelayAsync(napi_env, napi_value, void *, void *udata);
 
     void DumpForward(const FunctionInfo *func) const;

package/src/koffi/src/ffi.cc

@@ -48,10 +48,6 @@
 #endif
 
 #include <napi.h>
-#if NODE_WANT_INTERNALS
-    #include <env-inl.h>
-    #include <js_native_api_v8.h>
-#endif
 
 namespace RG {
 
@@ -2084,11 +2080,6 @@ bool InitAsyncBroker(Napi::Env env, InstanceData *instance)
     return true;
 }
 
-CallData *GetThreadCall()
-{
-    return exec_call;
-}
-
 static void RegisterPrimitiveType(Napi::Env env, Napi::Object map, std::initializer_list<const char *> names,
                                   PrimitiveKind primitive, int32_t size, int16_t align, const char *ref = nullptr)
 {

package/src/koffi/src/ffi.hh

@@ -352,6 +352,5 @@ Napi::Value TranslateVariadicCall(const Napi::CallbackInfo &info);
 Napi::Value TranslateAsyncCall(const Napi::CallbackInfo &info);
 
 bool InitAsyncBroker(Napi::Env env, InstanceData *instance);
-CallData *GetThreadCall();
 
 }