koffi 0.9.22 → 0.9.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "0.9.22",
+  "version": "0.9.23",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",

package/src/call_arm64.cc

@@ -123,7 +123,7 @@ Napi::Function::Callback AnalyseFunction(InstanceData *, FunctionInfo *func)
                     } else {
                         gpr_avail = 0;
                     }
-                } else if (gpr_avail) {
+                } else {
                     // Big types (more than 16 bytes) are replaced by a pointer
                     if (gpr_avail) {
                         param.gpr_count = 1;
@@ -400,9 +400,7 @@ static Napi::Value TranslateCall(const Napi::CallbackInfo &info)
                             return env.Null();
                         gpr_ptr += param.gpr_count;
                     } else if (param.type->size) {
-                        int16_t align = (param.type->align <= 4) ? 4 : 8;
-
-                        args_ptr = AlignUp(args_ptr, align);
+                        args_ptr = AlignUp(args_ptr, 8);
                         if (!call.PushObject(obj, param.type, args_ptr))
                             return env.Null();
                         args_ptr += AlignLen(param.type->size, 8);

package/src/ffi.cc

@@ -461,7 +461,8 @@ void LibraryHolder::Unref()
     }
 }
 
-static void RegisterPrimitiveType(InstanceData *instance, const char *name, PrimitiveKind primitive, int16_t size)
+static void RegisterPrimitiveType(InstanceData *instance, const char *name, PrimitiveKind primitive,
+                                  int16_t size, int16_t align)
 {
     TypeInfo *type = instance->types.AppendDefault();
 
@@ -469,7 +470,7 @@ static void RegisterPrimitiveType(InstanceData *instance, const char *name, Prim
 
     type->primitive = primitive;
     type->size = size;
-    type->align = size;
+    type->align = align;
 
     RG_ASSERT(!instance->types_map.Find(name));
     instance->types_map.Set(type);
@@ -481,53 +482,47 @@ static Napi::Object InitBaseTypes(Napi::Env env)
 
     RG_ASSERT(!instance->types.len);
 
-    RegisterPrimitiveType(instance, "void", PrimitiveKind::Void, 0);
-    RegisterPrimitiveType(instance, "void *", PrimitiveKind::Pointer, RG_SIZE(void *));
-    RegisterPrimitiveType(instance, "bool", PrimitiveKind::Bool, 1);
-    RegisterPrimitiveType(instance, "int8", PrimitiveKind::Int8, 1);
-    RegisterPrimitiveType(instance, "int8_t", PrimitiveKind::Int8, 1);
-    RegisterPrimitiveType(instance, "uint8", PrimitiveKind::UInt8, 1);
-    RegisterPrimitiveType(instance, "uint8_t", PrimitiveKind::UInt8, 1);
-    RegisterPrimitiveType(instance, "char", PrimitiveKind::Int8, 1);
-    RegisterPrimitiveType(instance, "uchar", PrimitiveKind::UInt8, 1);
-    RegisterPrimitiveType(instance, "unsigned char", PrimitiveKind::UInt8, 1);
-    RegisterPrimitiveType(instance, "int16", PrimitiveKind::Int16, 2);
-    RegisterPrimitiveType(instance, "int16_t", PrimitiveKind::Int16, 2);
-    RegisterPrimitiveType(instance, "uint16", PrimitiveKind::UInt16, 2);
-    RegisterPrimitiveType(instance, "uint16_t", PrimitiveKind::UInt16, 2);
-    RegisterPrimitiveType(instance, "short", PrimitiveKind::Int16, 2);
-    RegisterPrimitiveType(instance, "ushort", PrimitiveKind::UInt16, 2);
-    RegisterPrimitiveType(instance, "unsigned short", PrimitiveKind::UInt16, 2);
-    RegisterPrimitiveType(instance, "int32", PrimitiveKind::Int32, 4);
-    RegisterPrimitiveType(instance, "int32_t", PrimitiveKind::Int32, 4);
-    RegisterPrimitiveType(instance, "uint32", PrimitiveKind::UInt32, 4);
-    RegisterPrimitiveType(instance, "uint32_t", PrimitiveKind::UInt32, 4);
-    RegisterPrimitiveType(instance, "int", PrimitiveKind::Int32, 4);
-    RegisterPrimitiveType(instance, "uint", PrimitiveKind::UInt32, 4);
-    RegisterPrimitiveType(instance, "unsigned int", PrimitiveKind::UInt32, 4);
-    RegisterPrimitiveType(instance, "int64", PrimitiveKind::Int64, 8);
-    RegisterPrimitiveType(instance, "int64_t", PrimitiveKind::Int64, 8);
-    RegisterPrimitiveType(instance, "uint64", PrimitiveKind::UInt64, 8);
-    RegisterPrimitiveType(instance, "uint64_t", PrimitiveKind::UInt64, 8);
-#if ULONG_MAX == UINT64_MAX
-    RegisterPrimitiveType(instance, "long", PrimitiveKind::Int64, 8);
-    RegisterPrimitiveType(instance, "ulong", PrimitiveKind::UInt64, 8);
-    RegisterPrimitiveType(instance, "unsigned long", PrimitiveKind::UInt64, 8);
-#else
-    RegisterPrimitiveType(instance, "long", PrimitiveKind::Int32, 4);
-    RegisterPrimitiveType(instance, "ulong", PrimitiveKind::UInt32, 4);
-    RegisterPrimitiveType(instance, "unsigned long", PrimitiveKind::UInt64, 4);
-#endif
-    RegisterPrimitiveType(instance, "longlong", PrimitiveKind::Int64, 8);
-    RegisterPrimitiveType(instance, "long long", PrimitiveKind::Int64, 8);
-    RegisterPrimitiveType(instance, "ulonglong", PrimitiveKind::UInt64, 8);
-    RegisterPrimitiveType(instance, "unsigned long long", PrimitiveKind::UInt64, 8);
-    RegisterPrimitiveType(instance, "float32", PrimitiveKind::Float32, 4);
-    RegisterPrimitiveType(instance, "float64", PrimitiveKind::Float64, 8);
-    RegisterPrimitiveType(instance, "float", PrimitiveKind::Float32, 4);
-    RegisterPrimitiveType(instance, "double", PrimitiveKind::Float64, 8);
-    RegisterPrimitiveType(instance, "string", PrimitiveKind::String, RG_SIZE(void *));
-    RegisterPrimitiveType(instance, "str", PrimitiveKind::String, RG_SIZE(void *));
+    RegisterPrimitiveType(instance, "void", PrimitiveKind::Void, 0, 0);
+    RegisterPrimitiveType(instance, "void *", PrimitiveKind::Pointer, RG_SIZE(void *), alignof(void *));
+    RegisterPrimitiveType(instance, "bool", PrimitiveKind::Bool, RG_SIZE(bool), alignof(bool));
+    RegisterPrimitiveType(instance, "int8", PrimitiveKind::Int8, 1, 1);
+    RegisterPrimitiveType(instance, "int8_t", PrimitiveKind::Int8, 1, 1);
+    RegisterPrimitiveType(instance, "uint8", PrimitiveKind::UInt8, 1, 1);
+    RegisterPrimitiveType(instance, "uint8_t", PrimitiveKind::UInt8, 1, 1);
+    RegisterPrimitiveType(instance, "char", PrimitiveKind::Int8, 1, 1);
+    RegisterPrimitiveType(instance, "uchar", PrimitiveKind::UInt8, 1, 1);
+    RegisterPrimitiveType(instance, "unsigned char", PrimitiveKind::UInt8, 1, 1);
+    RegisterPrimitiveType(instance, "int16", PrimitiveKind::Int16, 2, 2);
+    RegisterPrimitiveType(instance, "int16_t", PrimitiveKind::Int16, 2, 2);
+    RegisterPrimitiveType(instance, "uint16", PrimitiveKind::UInt16, 2, 2);
+    RegisterPrimitiveType(instance, "uint16_t", PrimitiveKind::UInt16, 2, 2);
+    RegisterPrimitiveType(instance, "short", PrimitiveKind::Int16, 2, 2);
+    RegisterPrimitiveType(instance, "ushort", PrimitiveKind::UInt16, 2, 2);
+    RegisterPrimitiveType(instance, "unsigned short", PrimitiveKind::UInt16, 2, 2);
+    RegisterPrimitiveType(instance, "int32", PrimitiveKind::Int32, 4, 4);
+    RegisterPrimitiveType(instance, "int32_t", PrimitiveKind::Int32, 4, 4);
+    RegisterPrimitiveType(instance, "uint32", PrimitiveKind::UInt32, 4, 4);
+    RegisterPrimitiveType(instance, "uint32_t", PrimitiveKind::UInt32, 4, 4);
+    RegisterPrimitiveType(instance, "int", PrimitiveKind::Int32, 4, 4);
+    RegisterPrimitiveType(instance, "uint", PrimitiveKind::UInt32, 4, 4);
+    RegisterPrimitiveType(instance, "unsigned int", PrimitiveKind::UInt32, 4, 4);
+    RegisterPrimitiveType(instance, "int64", PrimitiveKind::Int64, 8, alignof(int64_t));
+    RegisterPrimitiveType(instance, "int64_t", PrimitiveKind::Int64, 8, alignof(int64_t));
+    RegisterPrimitiveType(instance, "uint64", PrimitiveKind::UInt64, 8, alignof(int64_t));
+    RegisterPrimitiveType(instance, "uint64_t", PrimitiveKind::UInt64, 8, alignof(int64_t));
+    RegisterPrimitiveType(instance, "long", PrimitiveKind::Int64, RG_SIZE(long), alignof(long));
+    RegisterPrimitiveType(instance, "ulong", PrimitiveKind::UInt64, RG_SIZE(long), alignof(long));
+    RegisterPrimitiveType(instance, "unsigned long", PrimitiveKind::UInt64, RG_SIZE(long), alignof(long));
+    RegisterPrimitiveType(instance, "longlong", PrimitiveKind::Int64, RG_SIZE(long long), alignof(long long));
+    RegisterPrimitiveType(instance, "long long", PrimitiveKind::Int64, RG_SIZE(long long), alignof(long long));
+    RegisterPrimitiveType(instance, "ulonglong", PrimitiveKind::UInt64, RG_SIZE(long long), alignof(long long));
+    RegisterPrimitiveType(instance, "unsigned long long", PrimitiveKind::UInt64, RG_SIZE(long long), alignof(long long));
+    RegisterPrimitiveType(instance, "float32", PrimitiveKind::Float32, 4, alignof(float));
+    RegisterPrimitiveType(instance, "float64", PrimitiveKind::Float64, 8, alignof(double));
+    RegisterPrimitiveType(instance, "float", PrimitiveKind::Float32, 4, alignof(float));
+    RegisterPrimitiveType(instance, "double", PrimitiveKind::Float64, 8, alignof(double));
+    RegisterPrimitiveType(instance, "string", PrimitiveKind::String, RG_SIZE(void *), alignof(void *));
+    RegisterPrimitiveType(instance, "str", PrimitiveKind::String, RG_SIZE(void *), alignof(void *));
 
     Napi::Object types = Napi::Object::New(env);
     for (TypeInfo &type: instance->types) {

package/src/util.cc

@@ -215,8 +215,6 @@ void PopObject(Napi::Object obj, const uint8_t *ptr, const TypeInfo *type)
 
     RG_ASSERT(type->primitive == PrimitiveKind::Record);
 
-    ptr = AlignUp(ptr, type->align);
-
     for (const RecordMember &member: type->members) {
         ptr = AlignUp(ptr, member.type->align);
 

package/test/test.js

@@ -353,7 +353,7 @@ async function test() {
 
                     success = false;
 
-                    if (name == 'Build')
+                    if (name in test.build)
                         break;
                 }
             }

package/test/tests/misc.c

@@ -12,7 +12,7 @@
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
 #include <stdio.h>
-#include <stdint.h>
+#include <inttypes.h>
 
 #ifdef _WIN32
     #define EXPORT __declspec(dllexport)
@@ -22,11 +22,14 @@
 #if defined(_M_IX86) || defined(__i386__)
     #ifdef _MSC_VER
         #define FASTCALL __fastcall
+        #define STDCALL __stdcall
     #else
         #define FASTCALL __attribute__((fastcall))
+        #define STDCALL __attribute__((stdcall))
     #endif
 #else
     #define FASTCALL
+    #define STDCALL
 #endif
 
 typedef struct Pack3 {
@@ -35,6 +38,22 @@ typedef struct Pack3 {
     int c;
 } Pack3;
 
+typedef struct IJK1 { int8_t i; int8_t j; int8_t k; } IJK1;
+typedef struct IJK4 { int32_t i; int32_t j; int32_t k; } IJK4;
+typedef struct IJK8 { int64_t i; int64_t j; int64_t k; } IJK8;
+
+typedef struct BFG {
+    int8_t a;
+    int64_t b;
+    signed char c;
+    const char *d;
+    short e;
+    struct {
+        float f;
+        double g;
+    } inner;
+} BFG;
+
 EXPORT void FillPack3(int a, int b, int c, Pack3 *p)
 {
     p->a = a;
@@ -78,3 +97,44 @@ EXPORT int64_t ConcatenateToInt8(int64_t a, int64_t b, int64_t c, int64_t d, int
                   100ull * j + 10ull * k + 1ull * l;
     return ret;
 }
+
+EXPORT const char *ConcatenateToStr1(int8_t a, int8_t b, int8_t c, int8_t d, int8_t e, int8_t f,
+                                     int8_t g, int8_t h, IJK1 ijk, int8_t l)
+{
+    static char buf[128];
+    snprintf(buf, sizeof(buf), "%d%d%d%d%d%d%d%d%d%d%d%d", a, b, c, d, e, f, g, h, ijk.i, ijk.j, ijk.k, l);
+    return buf;
+}
+
+EXPORT const char *ConcatenateToStr4(int32_t a, int32_t b, int32_t c, int32_t d, int32_t e, int32_t f,
+                                     int32_t g, int32_t h, IJK4 *ijk, int32_t l)
+{
+    static char buf[128];
+    snprintf(buf, sizeof(buf), "%d%d%d%d%d%d%d%d%d%d%d%d", a, b, c, d, e, f, g, h, ijk->i, ijk->j, ijk->k, l);
+    return buf;
+}
+
+EXPORT const char *ConcatenateToStr8(int64_t a, int64_t b, int64_t c, int64_t d, int64_t e, int64_t f,
+                                     int64_t g, int64_t h, IJK8 ijk, int64_t l)
+{
+    static char buf[128];
+    snprintf(buf, sizeof(buf), "%" PRIi64 "%" PRIi64 "%" PRIi64 "%" PRIi64 "%" PRIi64 "%" PRIi64
+                               "%" PRIi64 "%" PRIi64 "%" PRIi64 "%" PRIi64 "%" PRIi64 "%" PRIi64,
+             a, b, c, d, e, f, g, h, ijk.i, ijk.j, ijk.k, l);
+    return buf;
+}
+
+EXPORT BFG STDCALL MakeBFG(int x, double y)
+{
+    BFG bfg;
+
+    bfg.a = x;
+    bfg.b = x * 2;
+    bfg.c = x - 27;
+    bfg.d = "Hello";
+    bfg.e = x * 27;
+    bfg.inner.f = (float)y * x;
+    bfg.inner.g = (double)y - x;
+
+    return bfg;
+}

package/test/tests/misc.js

@@ -23,6 +23,18 @@ const Pack3 = koffi.struct('Pack3', {
     c: 'int'
 });
 
+const BFG = koffi.struct('BFG', {
+    a: 'int8_t',
+    b: 'int64_t',
+    c: 'char',
+    d: 'string',
+    e: 'short',
+    inner: koffi.struct('BFG.inner', {
+        f: 'float',
+        g: 'double'
+    })
+});
+
 main();
 
 async function main() {
@@ -44,6 +56,10 @@ async function test() {
     const ConcatenateToInt1 = lib.cdecl('ConcatenateToInt1', 'int64_t', Array(12).fill('int8_t'));
     const ConcatenateToInt4 = lib.cdecl('ConcatenateToInt4', 'int64_t', Array(12).fill('int32_t'));
     const ConcatenateToInt8 = lib.cdecl('ConcatenateToInt8', 'int64_t', Array(12).fill('int64_t'));
+    const ConcatenateToStr1 = lib.cdecl('ConcatenateToStr1', 'string', [...Array(8).fill('int8_t'), koffi.struct('IJK1', {i: 'int8_t', j: 'int8_t', k: 'int8_t'}), 'int8_t']);
+    const ConcatenateToStr4 = lib.cdecl('ConcatenateToStr4', 'string', [...Array(8).fill('int32_t'), koffi.pointer(koffi.struct('IJK4', {i: 'int32_t', j: 'int32_t', k: 'int32_t'})), 'int32_t']);
+    const ConcatenateToStr8 = lib.cdecl('ConcatenateToStr8', 'string', [...Array(8).fill('int64_t'), koffi.struct('IJK8', {i: 'int64_t', j: 'int64_t', k: 'int64_t'}), 'int64_t']);
+    const MakeBFG = lib.stdcall('MakeBFG', BFG, ['int', 'double']);
 
     let p = {};
 
@@ -53,7 +69,13 @@ async function test() {
     AddPack3(6, 9, -12, p);
     assert.deepEqual(p, { a: 7, b: 11, c: -9 });
 
-    assert.equal(ConcatenateToInt1(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687);
-    assert.equal(ConcatenateToInt4(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687);
-    assert.equal(ConcatenateToInt8(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687);
+    assert.equal(ConcatenateToInt1(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
+    assert.equal(ConcatenateToInt4(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
+    assert.equal(ConcatenateToInt8(5, 6, 1, 2, 3, 9, 4, 4, 0, 6, 8, 7), 561239440687n);
+    assert.equal(ConcatenateToStr1(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
+    assert.equal(ConcatenateToStr4(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
+    assert.equal(ConcatenateToStr8(5, 6, 1, 2, 3, 9, 4, 4, {i: 0, j: 6, k: 8}, 7), '561239440687');
+
+    let bfg = MakeBFG(2, 7);
+    assert.deepEqual(bfg, { a: 2, b: 4, c: -25, d: 'Hello', e: 54, inner: { f: 14, g: 5 } });
 }