koffi 2.12.0 → 2.12.2

package/src/koffi/examples/electron-forge/package.json

@@ -10,28 +10,30 @@
     "publish": "electron-forge publish",
     "lint": "echo \"No linting configured\""
   },
+  "devDependencies": {
+    "@electron-forge/cli": "^7.6.1",
+    "@electron-forge/maker-deb": "^7.6.1",
+    "@electron-forge/maker-rpm": "^7.6.1",
+    "@electron-forge/maker-squirrel": "^7.6.1",
+    "@electron-forge/maker-zip": "^7.6.1",
+    "@electron-forge/plugin-auto-unpack-natives": "^7.6.1",
+    "@electron-forge/plugin-fuses": "^7.6.1",
+    "@electron-forge/plugin-webpack": "^7.6.1",
+    "@electron/fuses": "^1.8.0",
+    "@vercel/webpack-asset-relocator-loader": "^1.7.3",
+    "css-loader": "^6.11.0",
+    "electron": "34.2.0",
+    "node-loader": "^2.1.0",
+    "style-loader": "^3.3.4"
+  },
   "keywords": [],
   "author": {
     "name": "Niels Martignène",
     "email": "niels.martignene@protonmail.com"
   },
   "license": "MIT",
-  "devDependencies": {
-    "@electron-forge/cli": "^6.2.1",
-    "@electron-forge/maker-deb": "^6.2.1",
-    "@electron-forge/maker-rpm": "^6.2.1",
-    "@electron-forge/maker-squirrel": "^6.2.1",
-    "@electron-forge/maker-zip": "^6.2.1",
-    "@electron-forge/plugin-auto-unpack-natives": "^6.2.1",
-    "@electron-forge/plugin-webpack": "^6.2.1",
-    "@vercel/webpack-asset-relocator-loader": "^1.7.3",
-    "css-loader": "^6.8.1",
-    "electron": "25.3.2",
-    "node-loader": "^2.0.0",
-    "style-loader": "^3.3.3"
-  },
   "dependencies": {
-    "electron-squirrel-startup": "^1.0.0",
-    "koffi": "^2.5.18"
+    "electron-squirrel-startup": "^1.0.1",
+    "koffi": "^2.10.1"
   }
 }

package/src/koffi/src/abi_arm32.cc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -21,7 +21,7 @@
 
 #if defined(__arm__) || (defined(__M_ARM) && !defined(_M_ARM64))
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"
@@ -64,7 +64,7 @@ extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_va
 
 static int IsHFA(const TypeInfo *type)
 {
-#ifdef __ARM_PCS_VFP
+#if defined(__ARM_PCS_VFP)
     bool float32 = false;
     bool float64 = false;
     int count = 0;
@@ -179,7 +179,7 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
             case PrimitiveKind::Array: { RG_UNREACHABLE(); } break;
             case PrimitiveKind::Float32:
             case PrimitiveKind::Float64: {
-#ifdef __ARM_PCS_VFP
+#if defined(__ARM_PCS_VFP)
                 bool vfp = !param.variadic;
 #else
                 bool vfp = false;
@@ -431,21 +431,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
             } break;
@@ -995,7 +982,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
             }
 
             float f = GetNumber<float>(value);
-#ifdef __ARM_PCS_VFP
+#if defined(__ARM_PCS_VFP)
             memcpy(&out_reg->d0, &f, 4);
 #else
             memcpy(&out_reg->r0, &f, 4);
@@ -1008,7 +995,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
             }
 
             double d = GetNumber<double>(value);
-#ifdef __ARM_PCS_VFP
+#if defined(__ARM_PCS_VFP)
             out_reg->d0 = d;
 #else
             memcpy(&out_reg->r0, &d, 8);

package/src/koffi/src/abi_arm32_asm.S

@@ -1,7 +1,7 @@
-# Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+# Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the “Software”), to deal in 
+# this software and associated documentation files (the “Software”), to deal in
 # the Software without restriction, including without limitation the rights to use,
 # copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 # Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/abi_arm64.cc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -21,11 +21,11 @@
 
 #if defined(__aarch64__) || defined(_M_ARM64)
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"
-#ifdef _WIN32
+#if defined(_WIN32)
     #include "win32.hh"
 #endif
 
@@ -135,7 +135,7 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 
     int gpr_avail = 8;
     int vec_avail = 8;
-#ifdef _M_ARM64EC
+#if defined(_M_ARM64EC)
     if (func->variadic) {
         gpr_avail = 4;
     }
@@ -165,7 +165,7 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
             case PrimitiveKind::String32:
             case PrimitiveKind::Pointer:
             case PrimitiveKind::Callback: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 if (param.variadic)
                     break;
 #endif
@@ -179,7 +179,7 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
             case PrimitiveKind::Union: {
                 HfaInfo hfa = IsHFA(param.type);
 
-#ifdef _M_ARM64EC
+#if defined(_M_ARM64EC)
                 if (func->variadic) {
                     if (IsRegularSize(param.type->size, 8) && gpr_avail) {
                         param.gpr_count = 1;
@@ -283,7 +283,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
         gpr_ptr[8] = (uint64_t)return_ptr;
     }
 
-#ifdef _M_ARM64EC
+#if defined(_M_ARM64EC)
     if (func->variadic) {
         gpr_ptr[4] = (uint64_t)args_ptr;
         gpr_ptr[5] = 0;
@@ -295,7 +295,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
     }
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
     #define PUSH_INTEGER(CType) \
         do { \
             if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
@@ -371,7 +371,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 
                 bool b = value.As<Napi::Boolean>();
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 if (param.gpr_count) [[likely]] {
                     *(gpr_ptr++) = (uint64_t)b;
                 } else {
@@ -401,7 +401,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                 if (!PushString(value, param.directions, &str)) [[unlikely]]
                     return false;
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
                 *(const char **)((param.gpr_count ? gpr_ptr : args_ptr)++) = str;
@@ -411,7 +411,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                 if (!PushString16(value, param.directions, &str16)) [[unlikely]]
                     return false;
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
                 *(const char16_t **)((param.gpr_count ? gpr_ptr : args_ptr)++) = str16;
@@ -431,7 +431,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                 if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
                     return false;
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
@@ -461,7 +461,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                             return false;
                         gpr_ptr += param.gpr_count;
                     } else if (param.type->size) {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                         args_ptr = AlignUp(args_ptr, 8);
 #endif
                         if (!PushObject(obj, param.type, (uint8_t *)args_ptr))
@@ -477,7 +477,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 
                         *(uint8_t **)(gpr_ptr++) = ptr;
                     } else {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                         args_ptr = AlignUp(args_ptr, 8);
 #endif
                         *(uint8_t **)(args_ptr++) = ptr;
@@ -499,13 +499,13 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                 if (param.vec_count) [[likely]] {
                     memset((uint8_t *)vec_ptr + 4, 0, 4);
                     *(float *)(vec_ptr++) = f;
-#ifdef _WIN32
+#if defined(_WIN32)
                 } else if (param.gpr_count) {
                     memset((uint8_t *)gpr_ptr + 4, 0, 4);
                     *(float *)(gpr_ptr++) = f;
 #endif
                 } else {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                     args_ptr = AlignUp(args_ptr, 4);
                     *(float *)args_ptr = f;
                     args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
@@ -525,12 +525,12 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 
                 if (param.vec_count) [[likely]] {
                     *(double *)(vec_ptr++) = d;
-#ifdef _WIN32
+#if defined(_WIN32)
                 } else if (param.gpr_count) {
                     *(double *)(gpr_ptr++) = d;
 #endif
                 } else {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                     args_ptr = AlignUp(args_ptr, 8);
 #endif
                     *(double *)(args_ptr++) = d;
@@ -538,23 +538,10 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
@@ -574,7 +561,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 
 void CallData::Execute(const FunctionInfo *func, void *native)
 {
-#ifdef _WIN32
+#if defined(_WIN32)
     TEB *teb = GetTEB();
 
     // Restore previous stack limits at the end
@@ -727,7 +714,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
-#ifdef _WIN32
+#if defined(_WIN32)
     TEB *teb = GetTEB();
 
     // Restore previous stack limits at the end
@@ -776,7 +763,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
             case PrimitiveKind::Void: { RG_UNREACHABLE(); } break;
 
             case PrimitiveKind::Bool: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 bool b;
                 if (param.gpr_count) {
                     b = *(bool *)(gpr_ptr++);
@@ -792,7 +779,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int8: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     d = (double)*(int8_t *)(gpr_ptr++);
@@ -808,7 +795,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt8: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     d = (double)*(uint8_t *)(gpr_ptr++);
@@ -824,7 +811,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int16: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     d = (double)*(int16_t *)(gpr_ptr++);
@@ -841,7 +828,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int16S: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     int16_t v = *(int16_t *)(gpr_ptr++);
@@ -863,7 +850,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt16: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     d = (double)*(uint16_t *)(gpr_ptr++);
@@ -880,7 +867,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt16S: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     uint16_t v = *(uint16_t *)(gpr_ptr++);
@@ -902,7 +889,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int32: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     d = (double)*(int32_t *)(gpr_ptr++);
@@ -919,7 +906,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int32S: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     int32_t v = *(int32_t *)(gpr_ptr++);
@@ -941,7 +928,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     d = (double)*(uint32_t *)(gpr_ptr++);
@@ -958,7 +945,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32S: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 double d;
                 if (param.gpr_count) {
                     uint32_t v = *(uint32_t *)(gpr_ptr++);
@@ -980,7 +967,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int64: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -990,7 +977,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int64S: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -1000,7 +987,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt64: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -1010,7 +997,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt64S: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -1020,7 +1007,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::String: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -1034,7 +1021,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 }
             } break;
             case PrimitiveKind::String16: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -1059,7 +1046,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
             } break;
             case PrimitiveKind::Pointer:
             case PrimitiveKind::Callback: {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -1106,7 +1093,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                         args_ptr += (param.type->size + 7) / 8;
                     }
                 } else {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                     args_ptr = AlignUp(args_ptr, 8);
 #endif
 
@@ -1121,12 +1108,12 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 float f;
                 if (param.vec_count) [[likely]] {
                     f = *(float *)(vec_ptr++);
-#ifdef _WIN32
+#if defined(_WIN32)
                 } else if (param.gpr_count) {
                     f = *(float *)(gpr_ptr++);
 #endif
                 } else {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                     args_ptr = AlignUp(args_ptr, 4);
                     f = *(float *)args_ptr;
                     args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
@@ -1142,12 +1129,12 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 double d;
                 if (param.vec_count) [[likely]] {
                     d = *(double *)(vec_ptr++);
-#ifdef _WIN32
+#if defined(_WIN32)
                 } else if (param.gpr_count) {
                     d = *(double *)(gpr_ptr++);
 #endif
                 } else {
-#ifdef __APPLE__
+#if defined(__APPLE__)
                     args_ptr = AlignUp(args_ptr, 8);
 #endif
 

package/src/koffi/src/abi_arm64_asm.S

@@ -1,7 +1,7 @@
-# Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+# Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the “Software”), to deal in 
+# this software and associated documentation files (the “Software”), to deal in
 # the Software without restriction, including without limitation the rights to use,
 # copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 # Software, and to permit persons to whom the Software is furnished to do so,
@@ -19,7 +19,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
     #define SYMBOL(Symbol) _ ## Symbol
 #else
     #define SYMBOL(Symbol) Symbol
@@ -28,7 +28,7 @@
 # Forward
 # ----------------------------
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
 # Fix "arm64 function not 4-byte aligned" linker warnings
 .p2align 2
 #endif

package/src/koffi/src/abi_arm64_asm.asm

@@ -1,7 +1,7 @@
-; Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+; Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 ;
 ; Permission is hereby granted, free of charge, to any person obtaining a copy of
-; this software and associated documentation files (the “Software”), to deal in 
+; this software and associated documentation files (the “Software”), to deal in
 ; the Software without restriction, including without limitation the rights to use,
 ; copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 ; Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/abi_loong64_asm.S

@@ -1,7 +1,7 @@
-# Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+# Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the “Software”), to deal in 
+# this software and associated documentation files (the “Software”), to deal in
 # the Software without restriction, including without limitation the rights to use,
 # copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 # Software, and to permit persons to whom the Software is furnished to do so,

package/src/koffi/src/abi_riscv64.cc

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -21,7 +21,7 @@
 
 #if __riscv_xlen == 64 || defined(__loongarch64)
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"
@@ -305,7 +305,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                     } else {
                         RG_ASSERT(param.type->align <= 8);
 
-                        memcpy_safe(args_ptr, regs, param.type->size);
+                        MemCpy(args_ptr, regs, param.type->size);
                         args_ptr += (param.type->size + 7) / 8;
                     }
                 } else {
@@ -362,21 +362,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
             } break;
@@ -703,7 +690,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                     } else {
                         RG_ASSERT(param.type->align <= 8);
 
-                        memcpy_safe(regs, args_ptr, param.type->size);
+                        MemCpy(regs, args_ptr, param.type->size);
                         args_ptr += (param.type->size + 7) / 8;
                     }
 

package/src/koffi/src/abi_riscv64_asm.S

@@ -1,7 +1,7 @@
-# Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+# Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the “Software”), to deal in 
+# this software and associated documentation files (the “Software”), to deal in
 # the Software without restriction, including without limitation the rights to use,
 # copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 # Software, and to permit persons to whom the Software is furnished to do so,