koffi 2.12.0 → 2.12.2

package/src/koffi/src/abi_x64_sysv.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(__x86_64__) && !defined(_WIN32)
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"
@@ -403,21 +403,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;

package/src/koffi/src/abi_x64_sysv_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
@@ -187,7 +187,7 @@ SYMBOL(ForwardCallXDD):
     movq %rsp, %rsi
     leaq 160(%rsp), %rdx
     leaq 112(%rsp), %rcx
-#ifdef __linux__
+#if defined(__linux__)
     call *RelayCallback@GOTPCREL(%rip)
 #else
     call SYMBOL(RelayCallback)
@@ -225,7 +225,7 @@ SYMBOL(ForwardCallXDD):
     movq %rsp, %rsi
     leaq 160(%rsp), %rdx
     leaq 112(%rsp), %rcx
-#ifdef __linux__
+#if defined(__linux__)
     call *RelayCallback@GOTPCREL(%rip)
 #else
     call SYMBOL(RelayCallback)

package/src/koffi/src/abi_x64_win.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(_WIN32) && (defined(__x86_64__) || defined(_M_AMD64))
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "util.hh"
@@ -200,21 +200,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 **)(args_ptr++) = ptr;
             } break;

package/src/koffi/src/abi_x64_win_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_x86.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(__i386__) || defined(_M_IX86)
 
-#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
 
@@ -89,7 +89,7 @@ bool AnalyseFunction(Napi::Env env, InstanceData *instance, FunctionInfo *func)
     #endif
 #endif
     }
-#ifndef _WIN32
+#if !defined(_WIN32)
     if (fast && !func->ret.trivial) {
         func->ret.fast = 1;
         fast--;
@@ -294,21 +294,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.fast ? fast_ptr : args_ptr)++) = ptr;
             } break;
@@ -329,7 +316,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
@@ -481,7 +468,7 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
-#ifdef _WIN32
+#if defined(_WIN32)
     TEB *teb = GetTEB();
 
     // Restore previous stack limits at the end
@@ -512,7 +499,7 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
     if (proto->convention == CallConvention::Stdcall) {
         out_reg->ret_pop = (int)proto->args_size;
     } else {
-#ifdef _WIN32
+#if defined(_WIN32)
         out_reg->ret_pop = 0;
 #else
         out_reg->ret_pop = return_ptr ? 4 : 0;

package/src/koffi/src/abi_x86_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_x86_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/call.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,
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "call.hh"
 #include "ffi.hh"
 #include "util.hh"
@@ -743,22 +743,8 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(member.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, member.type->ref.marker)) {
-                    Napi::External<void> external = value.As<Napi::External<void>>();
-                    ptr = external.Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), member.type->name);
+                if (!PushCallback(value, member.type, &ptr))
                     return false;
-                }
 
                 *(void **)dest = ptr;
             } break;
@@ -991,22 +977,8 @@ bool CallData::PushNormalArray(Napi::Array array, Size len, const TypeInfo *type
                 uint8_t *dest = origin + offset;
 
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(ref->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, ref->ref.marker)) {
-                    Napi::External<void> external = value.As<Napi::External<void>>();
-                    ptr = external.Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), ref->name);
+                if (!PushCallback(value, ref, &ptr))
                     return false;
-                }
 
                 *(void **)dest = ptr;
 
@@ -1027,8 +999,8 @@ void CallData::PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo
     buffer.len = std::min(buffer.len, size);
 
     // Go fast brrrrrrr :)
-    memcpy_safe(origin, buffer.ptr, (size_t)buffer.len);
-    memset_safe(origin + buffer.len, 0, (size_t)(size - buffer.len));
+    MemCpy(origin, buffer.ptr, (size_t)buffer.len);
+    MemSet(origin + buffer.len, 0, (size_t)(size - buffer.len));
 
 #define SWAP(CType) \
         do { \
@@ -1080,7 +1052,7 @@ bool CallData::PushStringArray(Napi::Value obj, const TypeInfo *type, uint8_t *o
         } break;
     }
 
-    memset_safe(origin + encoded, 0, type->size - encoded);
+    MemSet(origin + encoded, 0, type->size - encoded);
 
     return true;
 }
@@ -1155,7 +1127,7 @@ bool CallData::PushPointer(Napi::Value value, const TypeInfo *type, int directio
                         if (!PushNormalArray(array, len, type, ptr))
                             return false;
                     } else {
-                        memset_safe(ptr, 0, size);
+                        MemSet(ptr, 0, size);
                     }
 
                     out_kind = OutArgument::Kind::Array;
@@ -1185,7 +1157,7 @@ bool CallData::PushPointer(Napi::Value value, const TypeInfo *type, int directio
                     if (!PushObject(obj, type->ref.type, ptr))
                         return false;
                 } else {
-                    memset_safe(ptr, 0, type->size);
+                    MemSet(ptr, 0, type->size);
                 }
 
                 out_kind = OutArgument::Kind::Object;
@@ -1274,6 +1246,41 @@ unexpected:
     return false;
 }
 
+bool CallData::PushCallback(Napi::Value value, const TypeInfo *type, void **out_ptr)
+{
+    if (value.IsFunction()) {
+        Napi::Function func = value.As<Napi::Function>();
+
+        void *ptr = ReserveTrampoline(type->ref.proto, func);
+        if (!ptr) [[unlikely]]
+            return false;
+
+        *out_ptr = ptr;
+    } else if (CheckValueTag(instance, value, type->ref.marker)) {
+        *out_ptr = value.As<Napi::External<void>>().Data();
+    } else if (CheckValueTag(instance, value, &CastMarker)) {
+        Napi::External<ValueCast> external = value.As<Napi::External<ValueCast>>();
+        ValueCast *cast = external.Data();
+
+        value = cast->ref.Value();
+
+        if (!value.IsExternal() || cast->type != type)
+            goto unexpected;
+
+        *out_ptr = value.As<Napi::External<void>>().Data();
+    } else if (IsNullOrUndefined(value)) {
+        *out_ptr = nullptr;
+    } else {
+        goto unexpected;
+    }
+
+    return true;
+
+unexpected:
+    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);
+    return false;
+}
+
 Size CallData::PushIndirectString(Napi::Array array, const TypeInfo *ref, uint8_t **out_ptr)
 {
     if (array.Length() != 1)
@@ -1334,16 +1341,16 @@ void *CallData::ReserveTrampoline(const FunctionInfo *proto, Napi::Function func
 
 void CallData::DumpForward(const FunctionInfo *func) const
 {
-    PrintLn(stderr, "%!..+---- %1 (%2) ----%!0", func->name, CallConventionNames[(int)func->convention]);
+    PrintLn(StdErr, "%!..+---- %1 (%2) ----%!0", func->name, CallConventionNames[(int)func->convention]);
 
     if (func->parameters.len) {
-        PrintLn(stderr, "Parameters:");
+        PrintLn(StdErr, "Parameters:");
         for (Size i = 0; i < func->parameters.len; i++) {
             const ParameterInfo &param = func->parameters[i];
-            PrintLn(stderr, "  %1 = %2 (%3)", i, param.type->name, FmtMemSize(param.type->size));
+            PrintLn(StdErr, "  %1 = %2 (%3)", i, param.type->name, FmtMemSize(param.type->size));
         }
     }
-    PrintLn(stderr, "Return: %1 (%2)", func->ret.type->name, FmtMemSize(func->ret.type->size));
+    PrintLn(StdErr, "Return: %1 (%2)", func->ret.type->name, FmtMemSize(func->ret.type->size));
 
     Span<const uint8_t> stack = MakeSpan(mem->stack.end(), old_stack_mem.end() - mem->stack.end());
     Span<const uint8_t> heap = MakeSpan(old_heap_mem.ptr, mem->heap.ptr - old_heap_mem.ptr);

package/src/koffi/src/call.hh

@@ -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 @@
 
 #pragma once
 
-#include "src/core/libcc/libcc.hh"
+#include "src/core/base/base.hh"
 #include "ffi.hh"
 #include "util.hh"
 
@@ -92,8 +92,8 @@ public:
 
     void Dispose();
 
-#ifdef UNITY_BUILD
-    #ifdef _MSC_VER
+#if defined(UNITY_BUILD)
+    #if defined(_MSC_VER)
         #define INLINE_IF_UNITY __forceinline
     #else
         #define INLINE_IF_UNITY __attribute__((always_inline)) inline
@@ -125,6 +125,7 @@ public:
     void PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo *type, uint8_t *origin);
     bool PushStringArray(Napi::Value value, const TypeInfo *type, uint8_t *origin);
     bool PushPointer(Napi::Value value, const TypeInfo *type, int directions, void **out_ptr);
+    bool PushCallback(Napi::Value value, const TypeInfo *type, void **out_ptr);
     Size PushIndirectString(Napi::Array array, const TypeInfo *ref, uint8_t **out_ptr);
 
     void *ReserveTrampoline(const FunctionInfo *proto, Napi::Function func);
@@ -152,7 +153,7 @@ inline bool CallData::AllocStack(Size size, Size align, T **out_ptr)
         return false;
     }
 
-#ifdef RG_DEBUG
+#if defined(RG_DEBUG)
     memset(ptr, 0, delta);
 #endif
 
@@ -169,7 +170,7 @@ inline T *CallData::AllocHeap(Size size, Size align)
     Size delta = size + (ptr - mem->heap.ptr);
 
     if (size < 4096 && delta <= mem->heap.len) [[likely]] {
-#ifdef RG_DEBUG
+#if defined(RG_DEBUG)
         memset(mem->heap.ptr, 0, (size_t)delta);
 #endif
 
@@ -178,7 +179,7 @@ inline T *CallData::AllocHeap(Size size, Size align)
 
         return ptr;
     } else {
-#ifdef RG_DEBUG
+#if defined(RG_DEBUG)
         int flags = (int)AllocFlag::Zero;
 #else
         int flags = 0;