koffi 2.3.8 → 2.3.10-beta.1

package/src/cnoke/src/builder.js

@@ -1,15 +1,23 @@
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// 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 
+// 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,
+// subject to the following conditions:
 //
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see https://www.gnu.org/licenses/.
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
 

package/src/cnoke/src/index.js

@@ -1,15 +1,23 @@
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// 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 
+// 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,
+// subject to the following conditions:
 //
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see https://www.gnu.org/licenses/.
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 const builder = require('./builder.js');
 const tools = require('./tools.js');

package/src/cnoke/src/tools.js

@@ -1,15 +1,23 @@
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// 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 
+// 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,
+// subject to the following conditions:
 //
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see https://www.gnu.org/licenses/.
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
 

package/src/core/libcc/libcc.cc

@@ -1,15 +1,23 @@
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
+// Copyright 2023 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 
+// 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,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 #include "libcc.hh"
 #if !defined(LIBCC_NO_MINIZ) && __has_include("vendor/miniz/miniz.h")
@@ -7407,51 +7415,103 @@ void InitPackedMap(Span<const AssetInfo> assets)
 
 #endif
 
-// This won't win any beauty or speed contest (especially when writing
-// a compressed stream) but whatever.
-Span<const uint8_t> PatchAsset(const AssetInfo &asset, Allocator *alloc,
-                               FunctionRef<void(const char *, StreamWriter *)> func)
+bool PatchFile(StreamReader *reader, StreamWriter *writer,
+               FunctionRef<void(Span<const char>, StreamWriter *)> func)
 {
-    RG_ASSERT(alloc);
-
-    HeapArray<uint8_t> buf(alloc);
-
-    StreamReader reader(asset.data, nullptr, asset.compression_type);
-    StreamWriter writer(&buf, nullptr, asset.compression_type);
-
     char c;
-    while (reader.Read(1, &c) == 1) {
+    while (reader->Read(1, &c) == 1) {
         if (c == '{') {
             char name[33] = {};
-            Size name_len = reader.Read(1, &name[0]);
+            Size name_len = reader->Read(1, &name[0]);
             RG_ASSERT(name_len >= 0);
 
             if (IsAsciiAlpha(name[0]) || name[0] == '_') {
                 do {
-                    Size read_len = reader.Read(1, &name[name_len]);
+                    Size read_len = reader->Read(1, &name[name_len]);
                     RG_ASSERT(read_len >= 0);
 
                     if (name[name_len] == '}') {
                         name[name_len] = 0;
-                        func(name, &writer);
+
+                        Span<const char> key = MakeSpan(name, name_len);
+                        func(key, writer);
 
                         break;
                     } else if (!IsAsciiAlphaOrDigit(name[name_len]) && name[name_len] != '_') {
-                        writer.Write('{');
-                        writer.Write(name, name_len + 1);
+                        writer->Write('{');
+                        writer->Write(name, name_len + 1);
 
                         break;
                     }
                 } while (++name_len < RG_SIZE(name));
             } else {
-                writer.Write('{');
-                writer.Write(name[0]);
+                writer->Write('{');
+                writer->Write(name[0]);
             }
         } else {
-            writer.Write(c);
+            writer->Write(c);
         }
     }
-    RG_ASSERT(reader.IsValid());
+
+    if (!reader->IsValid())
+        return false;
+    if (!writer->IsValid())
+        return false;
+
+    return true;
+}
+
+bool PatchFile(Span<const uint8_t> data, StreamWriter *writer,
+               FunctionRef<void(Span<const char>, StreamWriter *)> func)
+{
+    StreamReader reader(data, nullptr);
+
+    if (!PatchFile(&reader, writer, func)) {
+        RG_ASSERT(reader.IsValid());
+        return false;
+    }
+
+    return true;
+}
+
+bool PatchFile(const AssetInfo &asset, StreamWriter *writer,
+               FunctionRef<void(Span<const char>, StreamWriter *)> func)
+{
+    StreamReader reader(asset.data, nullptr, asset.compression_type);
+
+    if (!PatchFile(&reader, writer, func)) {
+        RG_ASSERT(reader.IsValid());
+        return false;
+    }
+
+    return true;
+}
+
+Span<const uint8_t> PatchFile(Span<const uint8_t> data, Allocator *alloc,
+                              FunctionRef<void(Span<const char>, StreamWriter *)> func)
+{
+    RG_ASSERT(alloc);
+
+    HeapArray<uint8_t> buf(alloc);
+    StreamWriter writer(&buf, nullptr);
+
+    PatchFile(data, &writer, func);
+
+    bool success = writer.Close();
+    RG_ASSERT(success);
+
+    return buf.Leak();
+}
+
+Span<const uint8_t> PatchFile(const AssetInfo &asset, Allocator *alloc,
+                              FunctionRef<void(Span<const char>, StreamWriter *)> func)
+{
+    RG_ASSERT(alloc);
+
+    HeapArray<uint8_t> buf(alloc);
+    StreamWriter writer(&buf, nullptr, asset.compression_type);
+
+    PatchFile(asset, &writer, func);
 
     bool success = writer.Close();
     RG_ASSERT(success);

package/src/core/libcc/libcc.hh

@@ -1,15 +1,23 @@
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
+// Copyright 2023 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 
+// 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,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
@@ -4602,8 +4610,17 @@ static inline const AssetInfo *FindPackedAsset(const char *name)
 
 #endif
 
-Span<const uint8_t> PatchAsset(const AssetInfo &asset, Allocator *alloc,
-                               FunctionRef<void(const char *, StreamWriter *)> func);
+// These functions won't win any beauty or speed contest but whatever
+bool PatchFile(StreamReader *reader, StreamWriter *writer,
+               FunctionRef<void(Span<const char>, StreamWriter *)> func);
+bool PatchFile(Span<const uint8_t> data, StreamWriter *writer,
+               FunctionRef<void(Span<const char>, StreamWriter *)> func);
+bool PatchFile(const AssetInfo &asset, StreamWriter *writer,
+               FunctionRef<void(Span<const char>, StreamWriter *)> func);
+Span<const uint8_t> PatchFile(Span<const uint8_t> data, Allocator *alloc,
+                              FunctionRef<void(Span<const char> key, StreamWriter *)> func);
+Span<const uint8_t> PatchFile(const AssetInfo &asset, Allocator *alloc,
+                              FunctionRef<void(Span<const char> key, StreamWriter *)> func);
 
 // ------------------------------------------------------------------------
 // Options

package/src/{koffi/src/index.d.ts → index.d.ts}

@@ -1,22 +1,30 @@
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// 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 
+// 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,
+// subject to the following conditions:
 //
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see https://www.gnu.org/licenses/.
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 declare module 'koffi' {
     export function load(path: string): IKoffiLib;
 
-    interface IKoffiCType { __brand: 'IKoffiCType' }
-    interface IKoffiPointerCast { __brand: 'IKoffiPointerCast' }
-    interface IKoffiRegisteredCallback { __brand: 'IKoffiRegisteredCallback' }
+    interface IKoffiCType { __brand: 'IKoffiCType' };
+    interface IKoffiPointerCast { __brand: 'IKoffiPointerCast' };
+    interface IKoffiRegisteredCallback { __brand: 'IKoffiRegisteredCallback' };
 
     type PrimitiveKind = 'Void' | 'Bool' | 'Int8' | 'UInt8' | 'Int16' | 'Int16S' | 'UInt16' | 'UInt16S' |
                          'Int32' | 'Int32S' | 'UInt32' | 'UInt32S' | 'Int64' | 'Int64S' | 'UInt64' | 'UInt64S' |
@@ -71,7 +79,7 @@ declare module 'koffi' {
 
         thiscall(definition: string): KoffiFunction;
         thiscall(name: string, result: TypeSpec, arguments: TypeSpec[]): KoffiFunction;
-    }
+    };
 
     export function struct(name: string, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
     export function struct(def: Record<string, TypeSpecWithAlignment>): IKoffiCType;

package/src/index.js

@@ -0,0 +1,50 @@
+// Copyright 2023 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 
+// 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,
+// subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+const cnoke = require('./cnoke/src/index.js');
+const util = require('util');
+const fs = require('fs');
+const pkg = require('../package.json');
+
+if (process.versions.napi == null || process.versions.napi < pkg.cnoke.napi) {
+    let major = parseInt(process.versions.node, 10);
+    let required = cnoke.get_napi_version(pkg.cnoke.napi, major);
+
+    if (required != null) {
+        throw new Error(`Project ${pkg.name} requires Node >= ${required} in the Node ${major}.x branch (N-API >= ${pkg.cnoke.napi})`);
+    } else {
+        throw new Error(`Project ${pkg.name} does not support the Node ${major}.x branch (N-API < ${pkg.cnoke.napi})`);
+    }
+}
+
+let arch = cnoke.determine_arch();
+let filename = __dirname + `/../build/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`;
+
+let native = require(filename);
+
+module.exports = {
+    ...native,
+
+    // Deprecated functions
+    handle: util.deprecate(native.opaque, 'The koffi.handle() function was deprecated in Koffi 2.1, use koffi.opaque() instead', 'KOFFI001')
+};

package/src/koffi/CMakeLists.txt

@@ -1,15 +1,23 @@
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# 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 
+# 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,
+# subject to the following conditions:
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see https://www.gnu.org/licenses/.
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
 
 cmake_minimum_required(VERSION 3.6)
 project(koffi C CXX ASM)
@@ -61,8 +69,8 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 
             message(STATUS "Using ARMASM64 compiler: ${asm_compiler}")
 
-            file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/abi_arm64_fwd.asm" asm_source)
-            file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/abi_arm64_fwd.obj" asm_object)
+            file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/abi_arm64_asm.asm" asm_source)
+            file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/abi_arm64_asm.obj" asm_object)
 
             add_custom_command(
                 OUTPUT "${asm_object}"
@@ -74,25 +82,25 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 
             list(APPEND KOFFI_SRC src/abi_arm64.cc "${asm_object}")
         else()
-            list(APPEND KOFFI_SRC src/abi_arm64.cc src/abi_arm64_fwd.S)
+            list(APPEND KOFFI_SRC src/abi_arm64.cc src/abi_arm64_asm.S)
         endif()
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv")
-        list(APPEND KOFFI_SRC src/abi_riscv64.cc src/abi_riscv64_fwd.S)
+        list(APPEND KOFFI_SRC src/abi_riscv64.cc src/abi_riscv64_asm.S)
     else()
         if(WIN32)
-            list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_fwd.asm)
+            list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_asm.asm)
         else()
-            list(APPEND KOFFI_SRC src/abi_x64_sysv.cc src/abi_x64_sysv_fwd.S)
+            list(APPEND KOFFI_SRC src/abi_x64_sysv.cc src/abi_x64_sysv_asm.S)
         endif()
     endif()
 elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
-        list(APPEND KOFFI_SRC src/abi_arm32.cc src/abi_arm32_fwd.S)
+        list(APPEND KOFFI_SRC src/abi_arm32.cc src/abi_arm32_asm.S)
     else()
         if(WIN32)
-            list(APPEND KOFFI_SRC src/abi_x86.cc src/abi_x86_fwd.asm)
+            list(APPEND KOFFI_SRC src/abi_x86.cc src/abi_x86_asm.asm)
         else()
-            list(APPEND KOFFI_SRC src/abi_x86.cc src/abi_x86_fwd.S)
+            list(APPEND KOFFI_SRC src/abi_x86.cc src/abi_x86_asm.S)
         endif()
     endif()
 endif()

package/src/koffi/src/abi_arm32.cc

@@ -1,15 +1,23 @@
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// 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 
+// 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,
+// subject to the following conditions:
 //
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see https://www.gnu.org/licenses/.
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 #if defined(__arm__) || (defined(__M_ARM) && !defined(_M_ARM64))
 
@@ -52,7 +60,7 @@ extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_va
                                       uint8_t *old_sp, Span<uint8_t> *new_stack,
                                       napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
 
-#include "abi_trampolines.inc"
+#include "trampolines/prototypes.inc"
 
 static int IsHFA(const TypeInfo *type)
 {