koffi 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Fast and simple C FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",
@@ -25,7 +25,7 @@
   },
   "license": "AGPL-3.0",
   "dependencies": {
-    "cnoke": "^2.0.2"
+    "cnoke": "^2.0.3"
   },
   "devDependencies": {
     "chalk": "^4.1.2",
@@ -56,6 +56,7 @@
     "vendor",
     "LICENSE.txt",
     "README.md",
+    "ChangeLog.md",
     "CMakeLists.txt",
     "build/qemu/*/*.tar.gz"
   ]

package/qemu/qemu.js

@@ -249,7 +249,7 @@ async function start(detach = true) {
             let version = fs.existsSync(filename) ? parseInt(fs.readFileSync(filename).toString(), 10) : 0;
 
             if (version != machine.qemu.version) {
-                log(machine, 'Download newer machine', chalk.bold.gray('[ignore]'));
+                log(machine, 'Machine version mismatch', chalk.bold.gray('[ignore]'));
 
                 ignore.add(machine);
                 missing++;

package/src/abi_x64_sysv_fwd.S

@@ -35,13 +35,15 @@
 .global SYMBOL(ForwardCallXGD)
 .global SYMBOL(ForwardCallXDD)
 
+#define ENDBR64 .byte 0xf3, 0x0f, 0x1e, 0xfa
+
 # Copy function pointer to R11, in order to save it through argument forwarding.
 # Also make a copy of the SP to CallData::old_sp because the callback system might need it.
 # Save RSP in RBX (non-volatile), and use carefully assembled stack provided by caller.
 .macro prologue
     .cfi_startproc
     .cfi_def_cfa rsp, 8
-    endbr64
+    ENDBR64
     movq %rdi, %r11
     pushq %rbx
     .cfi_def_cfa rsp, 16
@@ -196,7 +198,7 @@ SYMBOL(ForwardCallXDD):
 .macro trampoline id
     .cfi_startproc
     .cfi_def_cfa rsp, 8
-    endbr64
+    ENDBR64
     subq $152, %rsp
     .cfi_def_cfa rsp, 160
     movq %rdi, 0(%rsp)
@@ -209,7 +211,11 @@ SYMBOL(ForwardCallXDD):
     movq %rsp, %rsi
     leaq 160(%rsp), %rdx
     leaq 112(%rsp), %rcx
+#ifdef __linux__
+    call *RelayCallback@GOTPCREL(%rip)
+#else
     call SYMBOL(RelayCallback)
+#endif
     movq 112(%rsp), %rax
     movq 120(%rsp), %rdx
     addq $152, %rsp
@@ -222,7 +228,7 @@ SYMBOL(ForwardCallXDD):
 .macro trampoline_xmm id
     .cfi_startproc
     .cfi_def_cfa rsp, 8
-    endbr64
+    ENDBR64
     subq $152, %rsp
     .cfi_def_cfa rsp, 160
     movq %rdi, 0(%rsp)
@@ -243,7 +249,11 @@ SYMBOL(ForwardCallXDD):
     movq %rsp, %rsi
     leaq 160(%rsp), %rdx
     leaq 112(%rsp), %rcx
+#ifdef __linux__
+    call *RelayCallback@GOTPCREL(%rip)
+#else
     call SYMBOL(RelayCallback)
+#endif
     movq 112(%rsp), %rax
     movq 120(%rsp), %rdx
     movsd 128(%rsp), %xmm0
@@ -328,7 +338,7 @@ SYMBOL(TrampolineX15):
 SYMBOL(CallSwitchStack):
     .cfi_startproc
     .cfi_def_cfa rsp, 8
-    endbr64
+    ENDBR64
     push %rbx
     .cfi_def_cfa rsp, 16
     movq %rsp, %rbx

package/src/abi_x86_fwd.S

@@ -18,13 +18,15 @@
 .global ForwardCallRF
 .global ForwardCallRD
 
+#define ENDBR32 .byte 0xf3, 0x0f, 0x1e, 0xfb
+
 # Copy function pointer to EAX, in order to save it through argument forwarding.
 # Also make a copy of the SP to CallData::old_sp because the callback system might need it.
 # Save ESP in EBX (non-volatile), and use carefully assembled stack provided by caller.
 .macro prologue
     .cfi_startproc
     .cfi_def_cfa esp, 4
-    endbr32
+    ENDBR32
     push %ebx
     .cfi_def_cfa esp, 8
     movl %esp, %ebx
@@ -125,7 +127,7 @@ ForwardCallRD:
 .macro trampoline id
     .cfi_startproc
     .cfi_def_cfa esp, 4
-    endbr32
+    ENDBR32
     sub $44, %esp
     .cfi_def_cfa esp, 48
     movl $\id, 0(%esp)
@@ -153,7 +155,7 @@ ForwardCallRD:
 .macro trampoline_x87 id
     .cfi_startproc
     .cfi_def_cfa esp, 4
-    endbr32
+    ENDBR32
     sub $44, %esp
     .cfi_def_cfa esp, 48
     movl $\id, 0(%esp)
@@ -260,7 +262,7 @@ TrampolineX15:
 CallSwitchStack:
     .cfi_startproc
     .cfi_def_cfa esp, 4
-    endbr32
+    ENDBR32
     push %ebx
     .cfi_def_cfa esp, 8
     movl %esp, %ebx

package/src/call.cc

@@ -248,7 +248,7 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
             } break;
             case PrimitiveKind::Pointer: {
                 if (CheckValueTag(instance, value, member.type)) {
-                    Napi::External external = value.As<Napi::External<void>>();
+                    Napi::External<void> external = value.As<Napi::External<void>>();
                     void *ptr = external.Data();
                     *(void **)dest = ptr;
                 } else if (IsNullOrUndefined(value)) {
@@ -317,7 +317,7 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                     if (RG_UNLIKELY(!ptr))
                         return false;
                 } else if (CheckValueTag(instance, value, member.type)) {
-                    Napi::External external = value.As<Napi::External<void>>();
+                    Napi::External<void> external = value.As<Napi::External<void>>();
                     ptr = external.Data();
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
@@ -452,7 +452,7 @@ bool CallData::PushNormalArray(Napi::Array array, Size len, const TypeInfo *ref,
         case PrimitiveKind::Pointer: {
             PUSH_ARRAY(CheckValueTag(instance, value, ref) || IsNullOrUndefined(value), ref->name, {
                 if (!IsNullOrUndefined(value)) {
-                    Napi::External external = value.As<Napi::External<void>>();
+                    Napi::External<void> external = value.As<Napi::External<void>>();
                     *(void **)dest = external.Data();
                 } else {
                     *(void **)dest = nullptr;
@@ -528,7 +528,7 @@ bool CallData::PushNormalArray(Napi::Array array, Size len, const TypeInfo *ref,
                     if (RG_UNLIKELY(!ptr))
                         return false;
                 } else if (CheckValueTag(instance, value, ref)) {
-                    Napi::External external = value.As<Napi::External<void>>();
+                    Napi::External<void> external = value.As<Napi::External<void>>();
                     ptr = external.Data();
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;

package/test/CMakeLists.txt

@@ -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/.
 
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.6)
 project(koffi_test C CXX)
 
 if(NOT TARGET koffi)

package/vendor/libcc/libcc.cc

@@ -20,7 +20,7 @@
     #include "vendor/brotli/c/include/brotli/decode.h"
     #include "vendor/brotli/c/include/brotli/encode.h"
 #endif
-#if __has_include("vendor/dragonbox/include/dragonbox/dragonbox.h")
+#if __has_include("vendor/dragonbox/include/dragonbox/dragonbox.h") && __cplusplus >= 201703L
     #include "vendor/dragonbox/include/dragonbox/dragonbox.h"
 #endif
 
@@ -81,6 +81,9 @@
 
     extern char **environ;
 #endif
+#ifdef __linux__
+    #include <sys/syscall.h>
+#endif
 #ifdef __APPLE__
     #include <sys/random.h>
     #include <mach-o/dyld.h>
@@ -3741,8 +3744,8 @@ bool ExecuteCommandLine(const char *cmd_line, FunctionRef<Span<const uint8_t>()>
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 static const pthread_t main_thread = pthread_self();
 #endif
-static std::atomic_bool flag_interrupt = false;
-static std::atomic_bool explicit_interrupt = false;
+static std::atomic_bool flag_interrupt {false};
+static std::atomic_bool explicit_interrupt {false};
 static int interrupt_pfd[2] = {-1, -1};
 
 void SetSignalHandler(int signal, void (*func)(int), struct sigaction *prev)
@@ -4165,7 +4168,7 @@ void WaitDelay(int64_t delay)
 
 WaitForResult WaitForInterrupt(int64_t timeout)
 {
-    static std::atomic_bool message = false;
+    static std::atomic_bool message {false};
 
     flag_interrupt = true;
     SetSignalHandler(SIGUSR1, [](int) { message = true; });
@@ -4755,8 +4758,17 @@ void FillRandomSafe(void *out_buf, Size len)
         struct { uint32_t key[8]; uint32_t iv[2]; } buf;
 
         memset(rnd_state, 0, RG_SIZE(rnd_state));
-#ifdef _WIN32
+#if defined(_WIN32)
         RG_CRITICAL(RtlGenRandom(&buf, RG_SIZE(buf)), "RtlGenRandom() failed: %s", GetWin32ErrorString());
+#elif defined(__linux__)
+        {
+restart:
+            int ret = syscall(SYS_getrandom, &buf, RG_SIZE(buf), 0);
+            RG_CRITICAL(ret >= 0, "getentropy() failed: %s", strerror(errno));
+
+            if (ret < RG_SIZE(buf))
+                goto restart;
+        }
 #else
         RG_CRITICAL(getentropy(&buf, RG_SIZE(buf)) == 0, "getentropy() failed: %s", strerror(errno));
 #endif

package/vendor/libcc/libcc.hh

@@ -1204,7 +1204,11 @@ public:
     {
         RemoveFrom(0);
         Grow(other.capacity);
+#if __cplusplus >= 201703L
         if constexpr(!std::is_trivial<T>::value) {
+#else
+        if (true) {
+#endif
             for (Size i = 0; i < other.len; i++) {
                 ptr[i] = other.ptr[i];
             }
@@ -1308,7 +1312,11 @@ public:
         Grow(count);
 
         T *first = ptr + len;
+#if __cplusplus >= 201703L
         if constexpr(!std::is_trivial<T>::value) {
+#else
+        if (true) {
+#endif
             for (Size i = 0; i < count; i++) {
                 new (ptr + len) T();
                 len++;
@@ -1325,7 +1333,11 @@ public:
         Grow();
 
         T *first = ptr + len;
+#if __cplusplus >= 201703L
         if constexpr(!std::is_trivial<T>::value) {
+#else
+        if (true) {
+#endif
             new (ptr + len) T;
         }
         ptr[len++] = value;
@@ -1337,7 +1349,11 @@ public:
 
         T *first = ptr + len;
         for (const T &value: values) {
+#if __cplusplus >= 201703L
             if constexpr(!std::is_trivial<T>::value) {
+#else
+            if (true) {
+#endif
                 new (ptr + len) T;
             }
             ptr[len++] = value;
@@ -1349,7 +1365,11 @@ public:
     {
         RG_ASSERT(first >= 0 && first <= len);
 
+#if __cplusplus >= 201703L
         if constexpr(!std::is_trivial<T>::value) {
+#else
+        if (true) {
+#endif
             for (Size i = first; i < len; i++) {
                 ptr[i].~T();
             }
@@ -1655,7 +1675,11 @@ private:
     void DeleteValues([[maybe_unused]] iterator_type begin,
                       [[maybe_unused]] iterator_type end)
     {
+#if __cplusplus >= 201703L
         if constexpr(!std::is_trivial<T>::value) {
+#else
+        if (true) {
+#endif
             for (iterator_type it = begin; it != end; ++it) {
                 it->~T();
             }
@@ -1932,7 +1956,11 @@ public:
     }
     ~HashTable()
     {
+#if __cplusplus >= 201703L
         if constexpr(std::is_trivial<ValueType>::value) {
+#else
+        if (false) {
+#endif
             count = 0;
             Rehash(0);
         } else {
@@ -2102,7 +2130,11 @@ private:
         { return (ValueType *)((const HashTable *)this)->Find(idx, key); }
     const ValueType *Find(Size *idx, const KeyType &key) const
     {
+#if __cplusplus >= 201703L
         if constexpr(std::is_pointer<ValueType>::value) {
+#else
+        if (false) {
+#endif
             while (data[*idx]) {
                 const KeyType &it_key = Handler::GetKey(data[*idx]);
                 if (Handler::TestKeys(it_key, key))