koffi 1.1.0 → 1.1.3

package/CMakeLists.txt

@@ -23,6 +23,9 @@ if(MSVC)
 else()
     add_compile_options(-Wall -Wextra -Wno-missing-field-initializers
                         -Wno-unused-parameter -Wno-class-memaccess)
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        add_compile_options(-Wno-unknown-warning-option)
+    endif()
 endif()
 
 # ---- Koffi ----
@@ -40,20 +43,20 @@ set(KOFFI_SRC
     vendor/libcc/libcc.cc
 )
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    if(WIN32)
-        list(APPEND KOFFI_SRC src/abi_x64_win_fwd.asm)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch|arm")
         list(APPEND KOFFI_SRC src/abi_arm64_fwd.S)
+    elseif(WIN32)
+        list(APPEND KOFFI_SRC src/abi_x64_win_fwd.asm)
     else()
         list(APPEND KOFFI_SRC src/abi_x64_sysv_fwd.S)
     endif()
 elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    if(WIN32)
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+        list(APPEND KOFFI_SRC src/abi_arm32_fwd.S)
+    elseif(WIN32)
         list(APPEND KOFFI_SRC src/abi_x86_fwd.asm)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86|x86|AMD64")
+    else()
         list(APPEND KOFFI_SRC src/abi_x86_fwd.S)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv[678]l")
-        list(APPEND KOFFI_SRC src/abi_arm32_fwd.S)
     endif()
 endif()
 

package/README.md

@@ -13,7 +13,7 @@
   * [Raylib results](#raylib-results)
 - [Tests](#tests)
 - [Compilation](#compilation)
-  * [Windows](#windows)
+  * [Windows](#windows-1)
   * [Other platforms](#other-platforms)
 
 # Introduction
@@ -23,33 +23,23 @@ Koffi is a fast and easy-to-use FFI module for Node.js, with support for primiti
 The following features are planned in the near future:
 
 * 1.2: C to JS callbacks
-* 1.3: Type parser
-
-The following platforms __are officially supported and tested__ at the moment:
-
-Platform  | Architecture                     | Sync calls | Async calls | Callbacks | Pre-built binary
---------- | -------------------------------- | ---------- | ----------- | --------- | ----------------
-Windows   | x86 (cdecl, stdcall, fastcall)   | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-Windows   | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-Linux     | x86                              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-Linux     | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-Linux     | ARM32+VFP Little Endian          | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-Linux     | ARM64 Little Endian              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-FreeBSD   | x86                              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-FreeBSD   | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-FreeBSD   | ARM64 Little Endian              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-macOS     | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
-macOS     | ARM64 (M1) Little Endian         | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟥 No
-OpenBSD   | x86_64                           | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
-OpenBSD   | x86                              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
-OpenBSD   | ARM64 Little Endian              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
-NetBSD    | x86_64                           | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
-NetBSD    | x86                              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
-NetBSD    | ARM64 Little Endian              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
-
-🟩 Tested, fully operational
-🟧 May work, but not actively tested
-🟥 Does not work yet
+* 1.3: RISC-V support (32 and 64 bit)
+* 1.4: Type parser
+
+The following combinations of OS and architectures __are officially supported and tested__ at the moment:
+
+ISA / OS           | Windows  | Linux    | macOS       | FreeBSD  | OpenBSD
+------------------ | -------- | -------- | ----------- | -------- | --------
+x86 (IA32) [^1]    | 🟩 Yes   | 🟩 Yes   | ⬜️ N/A      | 🟩 Yes   | 🟧 Maybe
+x86_64 (AMD64)     | 🟩 Yes   | 🟩 Yes   | 🟩 Yes      | 🟩 Yes   | 🟩 Yes
+ARM32 VFP LE       | ⬜️ N/A   | 🟩 Yes   | ⬜️ N/A      | 🟧 Maybe | 🟧 Maybe
+ARM32 (no VFP) LE  | ⬜️ N/A   | 🟧 Maybe | ⬜️ N/A      | 🟧 Maybe | 🟧 Maybe
+ARM64 (AArch64) LE | 🟧 Maybe | 🟩 Yes   | 🟩 Yes [^2] | 🟩 Yes   | 🟧 Maybe
+RISC-V 32          | ⬜️ N/A   | 🟥 No    | ⬜️ N/A      | 🟥 No    | 🟥 No
+RISC-V 64          | ⬜️ N/A   | 🟥 No    | ⬜️ N/A      | 🟥 No    | 🟥 No
+
+[^1]: The following call conventions are supported: cdecl, stdcall, MS fastcall, thiscall
+[^2]: However, we don't provide prebuilt binaries for macOS on Apple M1
 
 This is still in development, bugs are to be expected. More tests will come in the near future.
 
@@ -231,6 +221,8 @@ Koffi exposes three functions to explore type information:
 Fixed-size arrays are declared with `koffi.array(type, length)`. Just like in C, they cannot be passed
 as functions parameters (they degenerate to pointers), or returned by value. You can however embed them in struct types.
 
+### JS typed arrays
+
 Special rules apply for arrays of primitive integer and float types (uint32_t, double, etc...):
 - When converting from JS to C, Koffi can take a normal Array (e.g. `[1, 2]`) or a TypedArray of the correct type (e.g. `Uint8Array` for an array of `uint8_t` numbers)
 - When converting from C to JS (for return value or output parameters), Koffi will by default use a TypedArray. But you can change this behavior when you create the array type with the optional hint argument: `koffi.array('uint8_t', 64, 'array')`
@@ -258,6 +250,14 @@ console.log(ReturnFoo1({ i: 5, a16: [6, 8] })) // Prints { i: 5, a16: Int16Array
 console.log(ReturnFoo2({ i: 5, a16: [6, 8] })) // Prints { i: 5, a16: [6, 8] }
 ```
 
+### C strings
+
+Koffi can also convert JS strings to fixed-sized arrays in the following cases:
+- char (or int8_t) arrays are filled with the UTF-8 encoded string, truncated if needed. The buffer is always NUL-terminated.
+- char16 (or int16_t) arrays are filled with the UTF-16 encoded string, truncated if needed. The buffer is always NUL-terminated.
+
+The reverse case is also true, Koffi can convert a C fixed-size buffer to a JS string. Use the `string` array hint to do this (e.g. `koffi.array('char', 8, 'string')`).
+
 ## Variadic functions
 
 Variadic functions are declared with an ellipsis as the last argument.
@@ -267,6 +267,7 @@ In order to call a variadic function, you must provide two Javascript arguments
 ```js
 const printf = lib.func('printf', 'int', ['string', '...']);
 
+// The variadic arguments are: 6 (int), 8.5 (double), 'THE END' (const char *) 
 printf('Integer %d, double %g, string %s', 'int', 6, 'double', 8.5, 'string', 'THE END');
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",
@@ -24,7 +24,7 @@
   },
   "license": "AGPL-3.0",
   "dependencies": {
-    "cnoke": "^1.0.7"
+    "cnoke": "^1.0.9"
   },
   "devDependencies": {
     "chalk": "^4.1.2",

package/qemu/qemu.js

@@ -395,7 +395,7 @@ async function pack() {
             }));
 
             let status = copied ? chalk.bold.green('[ok]') : chalk.bold.red('[error]');
-            log(machine, 'Download', status);
+            log(machine, 'Pack', status);
         }));
     }
 

package/qemu/registry/machines.json

@@ -253,7 +253,7 @@
         },
 
         "info": {
-            "version": 1,
+            "version": 2,
             "platform": "freebsd",
             "arch": "x64",
 
@@ -298,7 +298,7 @@
         },
 
         "info": {
-            "version": 1,
+            "version": 2,
             "platform": "freebsd",
             "arch": "ia32",
 
@@ -343,7 +343,7 @@
         },
 
         "info": {
-            "version": 1,
+            "version": 2,
             "platform": "freebsd",
             "arch": "arm64",
 
@@ -421,5 +421,49 @@
                 }
             }
         }
+    },
+
+    "openbsd_x64": {
+        "name": "OpenBSD x64",
+
+        "qemu": {
+            "binary": "qemu-system-x86_64",
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22210-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:20"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "openbsd",
+            "arch": "x64",
+
+            "ssh_port": 22210,
+            "vnc_port": 5920,
+
+            "username": "openbsd",
+            "password": "openbsd",
+
+            "shutdown": "sudo shutdown -p now"
+        },
+
+        "builds": {
+            "OpenBSD x64": {
+                "directory": "/home/openbsd/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "OpenBSD x64": {
+                "directory": "/home/openbsd/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
     }
 }

package/qemu/registry/sha256sum.txt

@@ -22,20 +22,20 @@ ed05b84b7759ec945bb5422305a3a3c5b61d89e231844656ea31e07d89451a20 *qemu/debian_i3
 292a61c415a99a9c63a9337f1e074bea6c5df594e16bc40ded76141963c67ea4 *qemu/debian_i386/install.sh
 8dc1360e1c23ea21931f5eb94461d15fac6bcec00cf42bf1e590b7fb937e80c1 *qemu/debian_i386/initrd.img-5.10.0-12-686-pae
 338602d969f953cd88c2df736b9f8f7ee53029d233c83c7398258ae5bcb4e286 *qemu/debian_i386/disk.qcow2
-6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_arm64/VERSION
-5daea533330eb8d2f8df946561680e09f8dacc467fbf03d28caa2115d94386b5 *qemu/freebsd_arm64/QEMU_EFI.img
-a083e4e1f58f477e4a9e8ae30f75660e82275b88f77b5e2c7f5d6ee1deb43b41 *qemu/freebsd_arm64/varstore.img
+e5d9d3e1e4a5c980fce4ef3aab5e29b9607b8e5da6e9fe58c3f396009e283cff *qemu/freebsd_arm64/disk.qcow2
 53a4dc48317e1c9de4a088cd45ba39a1810f0bafad75c7f810e18d4e3eb340e3 *qemu/freebsd_arm64/install.sh
-a19ad06aec7972f3b95a56fb9bb8ac8a6afcd61b586f398691d58c704e8c466e *qemu/freebsd_arm64/disk.qcow2
-10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_arm64/xvfb-run.sh
-6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_x64/VERSION
-06eef544fe9c61d3905b0e588c306d1dedac7ee7d4c01df154ff6ed64e25ef77 *qemu/freebsd_x64/install.sh
-060b66901313ddfcd434c20a7b13052b3e5126e43c4e44884b85191560bd99eb *qemu/freebsd_x64/disk.qcow2
-10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_x64/xvfb-run.sh
-6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_i386/VERSION
+5daea533330eb8d2f8df946561680e09f8dacc467fbf03d28caa2115d94386b5 *qemu/freebsd_arm64/QEMU_EFI.img
+8ac20d46117a5a15761bf3070e365141b96ee3283250824f113029e106c62a50 *qemu/freebsd_arm64/varstore.img
+d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35 *qemu/freebsd_arm64/VERSION
+73837b3991eae13f6c346955ea4aa419c8c168cadf70e0a38446db60cf47b0e9 *qemu/freebsd_arm64/xvfb-run.sh
+fd0e51c43d7848564a81ddcb3eecf49103251bffcf25315ef87db01350ad4ac5 *qemu/freebsd_i386/disk.qcow2
 bdeac2cca1d22d70c2d388a50709d5cba3069bbd4bd1bcb102955b0ee12ca3e9 *qemu/freebsd_i386/install.sh
-8191cea63d738cdca6df0b2d2d6953675e1dd33cac4d98fff88ba4367b182b64 *qemu/freebsd_i386/disk.qcow2
-10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_i386/xvfb-run.sh
+d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35 *qemu/freebsd_i386/VERSION
+73837b3991eae13f6c346955ea4aa419c8c168cadf70e0a38446db60cf47b0e9 *qemu/freebsd_i386/xvfb-run.sh
+41649d2f5959388e1c5d8ee89bb084795470a8b9e68d87861b4e95e4102b62cf *qemu/freebsd_x64/disk.qcow2
+06eef544fe9c61d3905b0e588c306d1dedac7ee7d4c01df154ff6ed64e25ef77 *qemu/freebsd_x64/install.sh
+d4735e3a265e16eee03f59718b9b5d03019c07d8b6c51f90da3a666eec13ab35 *qemu/freebsd_x64/VERSION
+73837b3991eae13f6c346955ea4aa419c8c168cadf70e0a38446db60cf47b0e9 *qemu/freebsd_x64/xvfb-run.sh
 16a4f09b3e70b97f5cfb1cf9b913d67d0ec45c4342d202cc9a2b2cfee852a8de *qemu/macos_x64/ESP.qcow2
 5d2ac383371b408398accee7ec27c8c09ea5b74a0de0ceea6513388b15be5d1e *qemu/macos_x64/OVMF_VARS.fd
 d79538ac489f1948b04b65f12c5618c28e4a5de0be062f5cf1d73e422a091a37 *qemu/macos_x64/install.txt
@@ -43,3 +43,7 @@ d79538ac489f1948b04b65f12c5618c28e4a5de0be062f5cf1d73e422a091a37 *qemu/macos_x64
 5cc2d42949c7e4e763db0abeb88299972bafef991d87dbf744a5108ef9190f6f *qemu/macos_x64/OVMF_VARS-1024x768.fd
 53c234e5e8472b6ac51c1ae1cab3fe06fad053beb8ebfd8977b010655bfdd3c3 *qemu/macos_x64/VERSION
 2a247500e8ad9aa479994097ba5976bd881fde4de1516abd14491f3dba9fe060 *qemu/macos_x64/OVMF_CODE.fd
+3a3395f70240d8e3137dfe06ef7dd76255dc597626e087d33abdcc65710f3dff *qemu/openbsd_x64/disk.qcow2
+9dcdabfc12ad2ba2da1b9c3d95dc46311a12d6e3190f1bfd0c9b184ac1577c94 *qemu/openbsd_x64/install.sh
+6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/openbsd_x64/VERSION
+7b66bdf8b77fd1c6256ffdab623e37ce099797ad657dcd25af5df0486fadce37 *qemu/openbsd_x64/xvfb-run.sh

package/src/abi_arm32.cc

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#if defined(__arm__)
+#if defined(__arm__) || (defined(__M_ARM) && !defined(_M_ARM64))
 
 #include "vendor/libcc/libcc.hh"
 #include "ffi.hh"
@@ -19,6 +19,8 @@
 #include "util.hh"
 
 #include <napi.h>
+#include <signal.h>
+#include <setjmp.h>
 
 namespace RG {
 
@@ -37,9 +39,46 @@ extern "C" uint64_t ForwardCallXGG(const void *func, uint8_t *sp);
 extern "C" float ForwardCallXF(const void *func, uint8_t *sp);
 extern "C" HfaRet ForwardCallXDDDD(const void *func, uint8_t *sp);
 
+static bool DetectVFP()
+{
+    // If anything fails, assume VFP is available (true for most Linux platforms)
+    static volatile bool vfp = true;
+    static jmp_buf env;
+
+    struct sigaction prev;
+    SetSignalHandler(SIGILL, [](int) {
+        vfp = false;
+        longjmp(env, 1);
+    }, &prev);
+
+    if (!setjmp(env)) {
+        __asm__ volatile("vmov.f64 d0, #1.0" ::: "d0");
+    }
+
+    return vfp;
+}
+
+static inline bool HasVFP()
+{
+    static bool init = false;
+    static bool vfp;
+
+    if (!init) {
+        vfp = DetectVFP();
+        init = true;
+    }
+
+    return vfp;
+}
+
+static inline bool IsHFA(const TypeInfo *type)
+{
+    return HasVFP() && IsHFA(type, 1, 4);
+}
+
 bool AnalyseFunction(InstanceData *, FunctionInfo *func)
 {
-    if (IsHFA(func->ret.type, 1, 4)) {
+    if (IsHFA(func->ret.type)) {
         func->ret.vec_count = func->ret.type->members.len *
                               (func->ret.type->members[0].type->size / 4);
     } else if (func->ret.type->primitive != PrimitiveKind::Record ||
@@ -84,7 +123,7 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
                 }
             } break;
             case PrimitiveKind::Record: {
-                if (IsHFA(param.type, 1, 4)) {
+                if (IsHFA(param.type)) {
                     int vec_count = (int)(param.type->members.len *
                                           param.type->members[0].type->size / 4);
 
@@ -112,8 +151,8 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
             case PrimitiveKind::Array: { RG_UNREACHABLE(); } break;
             case PrimitiveKind::Float32:
             case PrimitiveKind::Float64: {
+                bool vfp = HasVFP() && !param.variadic;
                 Size need = param.type->size / 4;
-                bool vfp = !param.variadic;
 
                 if (vfp) {
                     if (need <= vec_avail) {

package/src/abi_arm64.cc

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) || defined(_M_ARM64)
 
 #include "vendor/libcc/libcc.hh"
 #include "ffi.hh"
@@ -41,9 +41,14 @@ extern "C" X0X1Ret ForwardCallXGG(const void *func, uint8_t *sp);
 extern "C" float ForwardCallXF(const void *func, uint8_t *sp);
 extern "C" HfaRet ForwardCallXDDDD(const void *func, uint8_t *sp);
 
+static inline bool IsHFA(const TypeInfo *type)
+{
+    return IsHFA(type, 1, 4);
+}
+
 bool AnalyseFunction(InstanceData *, FunctionInfo *func)
 {
-    if (IsHFA(func->ret.type, 1, 4)) {
+    if (IsHFA(func->ret.type)) {
         func->ret.vec_count = func->ret.type->members.len;
     } else if (func->ret.type->size <= 16) {
         func->ret.gpr_count = (func->ret.type->size + 7) / 8;
@@ -81,14 +86,18 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
                 }
             } break;
             case PrimitiveKind::Record: {
-#ifdef __APPLE__
+                bool hfa = IsHFA(param.type);
+
+#if defined(_WIN32)
+                hfa &= !param.variadic;
+#elif defined(__APPLE__)
                 if (param.variadic) {
                     param.use_memory = (param.type->size > 16);
                     break;
                 }
 #endif
 
-                if (IsHFA(param.type, 1, 4)) {
+                if (hfa) {
                     int vec_count = (int)param.type->members.len;
 
                     if (vec_count <= vec_avail) {
@@ -118,7 +127,15 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
             case PrimitiveKind::Array: { RG_UNREACHABLE(); } break;
             case PrimitiveKind::Float32:
             case PrimitiveKind::Float64: {
-#ifdef __APPLE__
+#if defined(_WIN32)
+                if (param.variadic) {
+                    if (gpr_avail) {
+                        param.gpr_count = 1;
+                        gpr_avail--;
+                    }
+                    break;
+                }
+#elif defined(__APPLE__)
                 if (param.variadic)
                     break;
 #endif

package/src/abi_x64_sysv.cc

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#if defined(__x86_64__) && !defined(_WIN64)
+#if defined(__x86_64__) && !defined(_WIN32)
 
 #include "vendor/libcc/libcc.hh"
 #include "ffi.hh"

package/src/abi_x64_win.cc

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#ifdef _WIN64
+#if defined(_WIN32) && (defined(__x86_64__) || defined(_M_AMD64))
 
 #include "vendor/libcc/libcc.hh"
 #include "ffi.hh"

package/src/abi_x86.cc

@@ -37,7 +37,9 @@ static inline bool IsRegular(Size size)
 
 bool AnalyseFunction(InstanceData *instance, FunctionInfo *func)
 {
-    int fast = (func->convention == CallConvention::Fastcall) ? 2 : 0;
+    int fast = (func->convention == CallConvention::Fastcall) ? 2 :
+               (func->convention == CallConvention::Thiscall) ? 1 : 0;
+    func->fast = fast;
 
     if (func->ret.type->primitive != PrimitiveKind::Record) {
         func->ret.trivial = true;
@@ -77,6 +79,10 @@ bool AnalyseFunction(InstanceData *instance, FunctionInfo *func)
             func->decorated_name = Fmt(&instance->str_alloc, "@%1@%2", func->name, params_size).ptr;
             func->args_size += 16;
         } break;
+        case CallConvention::Thiscall: {
+            RG_ASSERT(!func->variadic);
+            func->args_size += 16;
+        } break;
     }
 
     return true;
@@ -90,7 +96,7 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
     // Pass return value in register or through memory
     if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
         return false;
-    if (func->convention == CallConvention::Fastcall) {
+    if (func->fast) {
         fast_ptr = args_ptr;
         args_ptr += 4;
     }
@@ -259,8 +265,8 @@ void CallData::Execute()
 {
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->convention == CallConvention::Fastcall ? ForwardCallR ## Suffix(func->func, stack.ptr) \
-                                                                     : ForwardCall ## Suffix(func->func, stack.ptr)); \
+            auto ret = (func->fast ? ForwardCallR ## Suffix(func->func, stack.ptr) \
+                                   : ForwardCall ## Suffix(func->func, stack.ptr)); \
             return ret; \
         })()