koffi 1.3.9 → 1.3.12

package/doc/pyproject.toml

@@ -0,0 +1,18 @@
+[tool.poetry]
+name = "koffi"
+version = "0.1.0"
+description = ""
+authors = ["Niels Martignène <niels.martignene@protonmail.com>"]
+
+[tool.poetry.dependencies]
+python = "^3.7"
+Sphinx = "^5.0.2"
+linkify-it-py = "^2.0.0"
+myst-parser = "^0.18.0"
+furo = "^2022.6.21"
+
+[tool.poetry.dev-dependencies]
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

package/doc/types.md

@@ -63,7 +63,7 @@ Primitive types can be specified by name (in a string) or through `koffi.types`:
 
 ```js
 // These two lines do the same:
-let struct1 = koffi.struct({ dummy: 'int' });
+let struct1 = koffi.struct({ dummy: 'long' });
 let struct2 = koffi.struct({ dummy: koffi.types.long });
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "1.3.9",
+  "version": "1.3.12",
   "description": "Fast and simple C FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",
@@ -19,13 +19,13 @@
   "author": "Niels Martignène <niels.martignene@protonmail.com>",
   "main": "src/index.js",
   "scripts": {
-    "install": "cnoke --prebuild build/qemu/{{version}}/koffi_{{platform}}_{{arch}}.tar.gz --require ./build/koffi.node",
+    "install": "cnoke --prebuild",
     "test": "node qemu/qemu.js test",
     "prepublishOnly": "node qemu/qemu.js pack"
   },
   "license": "AGPL-3.0",
   "dependencies": {
-    "cnoke": "^3.0.0"
+    "cnoke": "^3.1.4"
   },
   "devDependencies": {
     "chalk": "^4.1.2",
@@ -37,6 +37,11 @@
     "ref-struct-di": "^1.1.1",
     "tar": "^6.1.11"
   },
+  "cnoke": {
+    "prebuild": "build/qemu/{{version}}/koffi_{{platform}}_{{arch}}.tar.gz",
+    "require": "./build/koffi.node",
+    "napi": 8
+  },
   "files": [
     "src",
     "doc",
@@ -59,8 +64,5 @@
     "ChangeLog.md",
     "CMakeLists.txt",
     "build/qemu/*/*.tar.gz"
-  ],
-  "engines": {
-    "napi": 8
-  }
+  ]
 }

package/qemu/qemu.js

@@ -249,11 +249,11 @@ async function start(detach = true) {
             let filename = dirname + '/VERSION';
             let version = fs.existsSync(filename) ? parseInt(fs.readFileSync(filename).toString(), 10) : 0;
 
-            if (version != machine.qemu.version) {
+            if (version < machine.qemu.version) {
                 log(machine, 'Machine version mismatch', chalk.bold.gray('[ignore]'));
 
                 ignore.add(machine);
-                missing++;
+                success = false;
 
                 return;
             }
@@ -272,7 +272,7 @@ async function start(detach = true) {
             log(machine, 'Start', chalk.bold.red('[error]'));
 
             ignore.add(machine);
-            missing++;
+            success = false;
         }
     }));
 

package/src/abi_arm32.cc

@@ -545,8 +545,8 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
     const FunctionInfo *proto = trampoline.proto;
     Napi::Function func = trampoline.func.Value();
 
-    uint64_t *vec_ptr = (uint64_t *)own_sp;
-    uint32_t *gpr_ptr = (uint32_t *)(vec_ptr + 8);
+    uint32_t *vec_ptr = (uint32_t *)own_sp;
+    uint32_t *gpr_ptr = vec_ptr + 16;
     uint32_t *args_ptr = (uint32_t *)caller_sp;
 
     uint8_t *return_ptr = proto->ret.use_memory ? (uint8_t *)gpr_ptr[0] : nullptr;
@@ -599,7 +599,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32: {
-                double d = (double)*(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                double d = (double)*(uint32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);

package/src/abi_riscv64.cc

@@ -540,7 +540,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32: {
-                double d = (double)*(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                double d = (double)*(uint32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);

package/src/abi_x64_sysv.cc

@@ -591,7 +591,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32: {
-                double d = (double)*(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                double d = (double)*(uint32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);

package/src/abi_x64_win.cc

@@ -406,7 +406,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32: {
-                double d = (double)*(int32_t *)(j < 4 ? gpr_ptr + j : args_ptr);
+                double d = (double)*(uint32_t *)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
 
                 Napi::Value arg = Napi::Number::New(env, d);

package/src/abi_x64_win_fwd.asm

@@ -161,7 +161,7 @@ trampoline macro ID
     mov qword ptr [rsp+56], r9
     mov rcx, ID
     lea rdx, qword ptr [rsp+32]
-    lea r8, qword ptr [rsp+128]
+    lea r8, qword ptr [rsp+160]
     lea r9, qword ptr [rsp+96]
     call RelayCallback
     mov rax, qword ptr [rsp+96]
@@ -185,7 +185,7 @@ trampoline_xmm macro ID
     movsd qword ptr [rsp+88], xmm3
     mov rcx, ID
     lea rdx, qword ptr [rsp+32]
-    lea r8, qword ptr [rsp+128]
+    lea r8, qword ptr [rsp+160]
     lea r9, qword ptr [rsp+96]
     call RelayCallback
     mov rax, qword ptr [rsp+96]

package/src/abi_x86.cc

@@ -428,12 +428,12 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
 
     if (proto->convention == CallConvention::Stdcall) {
         out_reg->ret_pop = (int)proto->args_size;
-#ifndef _WIN32
-    } else if (return_ptr) {
-        out_reg->ret_pop = 4;
-#endif
     } else {
+#ifdef _WIN32
         out_reg->ret_pop = 0;
+#else
+        out_reg->ret_pop = return_ptr ? 4 : 0;
+#endif
     }
 
     LocalArray<napi_value, MaxParameters> arguments;
@@ -483,7 +483,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32: {
-                double d = (double)*(int32_t *)(args_ptr++);
+                double d = (double)*(uint32_t *)(args_ptr++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);

package/src/parser.cc

@@ -44,7 +44,8 @@ bool PrototypeParser::Parse(const char *str, FunctionInfo *out_func)
     out_func->name = ParseIdentifier();
 
     Consume("(");
-    if (offset < tokens.len && tokens[offset] != ")" && !Match("void")) {
+    offset += (offset + 1 < tokens.len && tokens[offset] == "void" && tokens[offset + 1] == ")");
+    if (offset < tokens.len && tokens[offset] != ")") {
         for (;;) {
             ParameterInfo param = {};
 

package/test/misc.c

@@ -158,7 +158,7 @@ EXPORT int32_t GetMinusOne4(void)
     return -1;
 }
 
-EXPORT int64_t GetMinusOne8(void)
+EXPORT int64_t GetMinusOne8(void *dummy)
 {
     return -1;
 }

package/test/sync.js

@@ -130,7 +130,7 @@ async function test() {
     const GetMinusOne1 = lib.func('int8_t GetMinusOne1(void)');
     const GetMinusOne2 = lib.func('int16_t GetMinusOne2(void)');
     const GetMinusOne4 = lib.func('int32_t GetMinusOne4(void)');
-    const GetMinusOne8 = lib.func('int64_t GetMinusOne8(void)');
+    const GetMinusOne8 = lib.func('int64_t GetMinusOne8(void *dummy)');
     const FillPack1 = lib.func('FillPack1', 'void', ['int', koffi.out(koffi.pointer(Pack1))]);
     const RetPack1 = lib.func('RetPack1', Pack1, ['int']);
     const AddPack1 = lib.fastcall('AddPack1', 'void', ['int', koffi.inout(koffi.pointer(Pack1))]);
@@ -187,7 +187,7 @@ async function test() {
     assert.equal(GetMinusOne1(), -1);
     assert.equal(GetMinusOne2(), -1);
     assert.equal(GetMinusOne4(), -1);
-    assert.equal(GetMinusOne8(), -1);
+    assert.equal(GetMinusOne8(null), -1);
 
     // Simple tests with Pack1
     {