koffi 1.3.2 → 1.3.3

package/src/call.cc

@@ -801,11 +801,11 @@ void CallData::PopObject(Napi::Object obj, const uint8_t *origin, const TypeInfo
             } break;
             case PrimitiveKind::Int64: {
                 int64_t v = *(int64_t *)src;
-                obj.Set(member.name, Napi::BigInt::New(env, v));
+                obj.Set(member.name, NewBigInt(env, v));
             } break;
             case PrimitiveKind::UInt64: {
                 uint64_t v = *(uint64_t *)src;
-                obj.Set(member.name, Napi::BigInt::New(env, v));
+                obj.Set(member.name, NewBigInt(env, v));
             } break;
             case PrimitiveKind::String: {
                 const char *str = *(const char **)src;
@@ -914,13 +914,13 @@ void CallData::PopNormalArray(Napi::Array array, const uint8_t *origin, const Ty
         case PrimitiveKind::Int64: {
             POP_ARRAY({
                 int64_t v = *(int64_t *)src;
-                array.Set(i, Napi::BigInt::New(env, v));
+                array.Set(i, NewBigInt(env, v));
             });
         } break;
         case PrimitiveKind::UInt64: {
             POP_ARRAY({
                 uint64_t v = *(uint64_t *)src;
-                array.Set(i, Napi::BigInt::New(env, v));
+                array.Set(i, NewBigInt(env, v));
             });
         } break;
         case PrimitiveKind::String: {
@@ -1078,13 +1078,13 @@ Napi::Value CallData::PopArray(const uint8_t *origin, const TypeInfo *type, int1
         case PrimitiveKind::Int64: {
             POP_ARRAY({
                 int64_t v = *(int64_t *)src;
-                array.Set(i, Napi::BigInt::New(env, v));
+                array.Set(i, NewBigInt(env, v));
             });
         } break;
         case PrimitiveKind::UInt64: {
             POP_ARRAY({
                 uint64_t v = *(uint64_t *)src;
-                array.Set(i, Napi::BigInt::New(env, v));
+                array.Set(i, NewBigInt(env, v));
             });
         } break;
         case PrimitiveKind::String: {

package/src/call.hh

@@ -50,7 +50,13 @@ class alignas(8) CallData {
     uint8_t *old_sp;
 
     union {
+        int8_t i8;
+        uint8_t u8;
+        int16_t i16;
+        uint16_t u16;
+        int32_t i32;
         uint32_t u32;
+        int64_t i64;
         uint64_t u64;
         float f;
         double d;

package/src/ffi.cc

@@ -636,6 +636,8 @@ static InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, S
 #endif
     RG_CRITICAL(mem->heap.ptr, "Failed to allocate %1 of memory", mem->heap.len);
 
+    mem->depth = 0;
+
     if (instance->memories.len <= instance->resident_async_pools) {
         instance->memories.Append(mem);
     } else {

package/src/parser.cc

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

package/src/util.hh

@@ -89,7 +89,7 @@ static inline bool IsObject(Napi::Value value)
 int GetTypedArrayType(const TypeInfo *type);
 
 template <typename T>
-T CopyNumber(const Napi::Value &value)
+T CopyNumber(Napi::Value value)
 {
     RG_ASSERT(value.IsNumber() || value.IsBigInt());
 
@@ -105,6 +105,26 @@ T CopyNumber(const Napi::Value &value)
     RG_UNREACHABLE();
 }
 
+static inline Napi::Value NewBigInt(Napi::Env env, int64_t value)
+{
+    if (value <= 9007199254740992ll && value >= -9007199254740992ll) {
+        double d = (double)value;
+        return Napi::Number::New(env, d);
+    } else {
+        return Napi::BigInt::New(env, value);
+    }
+}
+
+static inline Napi::Value NewBigInt(Napi::Env env, uint64_t value)
+{
+    if (value <= 9007199254740992ull) {
+        double d = (double)value;
+        return Napi::Number::New(env, d);
+    } else {
+        return Napi::BigInt::New(env, value);
+    }
+}
+
 int AnalyseFlat(const TypeInfo *type, FunctionRef<void(const TypeInfo *type, int offset, int count)> func);
 
 int IsHFA(const TypeInfo *type, int min, int max);

package/test/misc.c

@@ -129,6 +129,26 @@ typedef struct IntContainer {
     int len;
 } IntContainer;
 
+EXPORT int8_t GetMinusOne1(void)
+{
+    return -1;
+}
+
+EXPORT int16_t GetMinusOne2(void)
+{
+    return -1;
+}
+
+EXPORT int32_t GetMinusOne4(void)
+{
+    return -1;
+}
+
+EXPORT int64_t GetMinusOne8(void)
+{
+    return -1;
+}
+
 EXPORT void FillPack1(int a, Pack1 *p)
 {
     p->a = a;

package/test/sync.js

@@ -122,6 +122,10 @@ async function test() {
     let lib_filename = path.dirname(__filename) + '/build/misc' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
+    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 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))]);
@@ -172,6 +176,12 @@ async function test() {
     const FillRange = lib.func('void FillRange(int init, int step, _Out_ int *out, int len)');
     const MultiplyIntegers = lib.func('void MultiplyIntegers(int multiplier, _Inout_ int *values, int len)');
 
+    // Simple signed value returns
+    assert.equal(GetMinusOne1(), -1);
+    assert.equal(GetMinusOne2(), -1);
+    assert.equal(GetMinusOne4(), -1);
+    assert.equal(GetMinusOne8(), -1);
+
     // Simple tests with Pack1
     {
         let p = {};
@@ -250,9 +260,9 @@ async function test() {
 
     // Many parameters
     {
-        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(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(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');

package/vendor/libcc/libcc.hh

@@ -3049,7 +3049,7 @@ public:
 
     int repeat = 1;
     int pad_len = 0;
-    char pad_char;
+    char pad_char = 0;
 
     FmtArg() = default;
     FmtArg(std::nullptr_t) : type(FmtType::Str1) { u.str1 = "(null)"; }