koffi 2.0.1 → 2.1.0-beta.3

package/src/call.cc

@@ -178,6 +178,15 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                 int16_t v = CopyNumber<int16_t>(value);
                 *(int16_t *)dest = v;
             } break;
+            case PrimitiveKind::Int16S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
+                    return false;
+                }
+
+                int16_t v = CopyNumber<int16_t>(value);
+                *(int16_t *)dest = ReverseBytes(v);
+            } break;
             case PrimitiveKind::UInt16: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
@@ -187,6 +196,15 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                 uint16_t v = CopyNumber<uint16_t>(value);
                 *(uint16_t *)dest = v;
             } break;
+            case PrimitiveKind::UInt16S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
+                    return false;
+                }
+
+                uint16_t v = CopyNumber<uint16_t>(value);
+                *(uint16_t *)dest = ReverseBytes(v);
+            } break;
             case PrimitiveKind::Int32: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
@@ -196,6 +214,15 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                 int32_t v = CopyNumber<int32_t>(value);
                 *(int32_t *)dest = v;
             } break;
+            case PrimitiveKind::Int32S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
+                    return false;
+                }
+
+                int32_t v = CopyNumber<int32_t>(value);
+                *(int32_t *)dest = ReverseBytes(v);
+            } break;
             case PrimitiveKind::UInt32: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
@@ -205,6 +232,15 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                 uint32_t v = CopyNumber<uint32_t>(value);
                 *(uint32_t *)dest = v;
             } break;
+            case PrimitiveKind::UInt32S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
+                    return false;
+                }
+
+                uint32_t v = CopyNumber<uint32_t>(value);
+                *(uint32_t *)dest = ReverseBytes(v);
+            } break;
             case PrimitiveKind::Int64: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
@@ -214,6 +250,15 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                 int64_t v = CopyNumber<int64_t>(value);
                 *(int64_t *)dest = v;
             } break;
+            case PrimitiveKind::Int64S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
+                    return false;
+                }
+
+                int64_t v = CopyNumber<int64_t>(value);
+                *(int64_t *)dest = ReverseBytes(v);
+            } break;
             case PrimitiveKind::UInt64: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
@@ -223,6 +268,15 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                 uint64_t v = CopyNumber<uint64_t>(value);
                 *(uint64_t *)dest = v;
             } break;
+            case PrimitiveKind::UInt64S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected number", GetValueType(instance, value), member.name);
+                    return false;
+                }
+
+                uint64_t v = CopyNumber<uint64_t>(value);
+                *(uint64_t *)dest = ReverseBytes(v);
+            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -402,36 +456,72 @@ bool CallData::PushNormalArray(Napi::Array array, Size len, const TypeInfo *ref,
                 *(int16_t *)dest = v;
             });
         } break;
+        case PrimitiveKind::Int16S: {
+            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
+                int16_t v = CopyNumber<int16_t>(value);
+                *(int16_t *)dest = ReverseBytes(v);
+            });
+        } break;
         case PrimitiveKind::UInt16: {
             PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
                 uint16_t v = CopyNumber<uint16_t>(value);
                 *(uint16_t *)dest = v;
             });
         } break;
+        case PrimitiveKind::UInt16S: {
+            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
+                uint16_t v = CopyNumber<uint16_t>(value);
+                *(uint16_t *)dest = ReverseBytes(v);
+            });
+        } break;
         case PrimitiveKind::Int32: {
             PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
                 int32_t v = CopyNumber<int32_t>(value);
                 *(int32_t *)dest = v;
             });
         } break;
+        case PrimitiveKind::Int32S: {
+            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
+                int32_t v = CopyNumber<int32_t>(value);
+                *(int32_t *)dest = ReverseBytes(v);
+            });
+        } break;
         case PrimitiveKind::UInt32: {
             PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
                 uint32_t v = CopyNumber<uint32_t>(value);
                 *(uint32_t *)dest = v;
             });
         } break;
+        case PrimitiveKind::UInt32S: {
+            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
+                uint32_t v = CopyNumber<uint32_t>(value);
+                *(uint32_t *)dest = ReverseBytes(v);
+            });
+        } break;
         case PrimitiveKind::Int64: {
             PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
                 int64_t v = CopyNumber<int64_t>(value);
                 *(int64_t *)dest = v;
             });
         } break;
+        case PrimitiveKind::Int64S: {
+            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
+                int64_t v = CopyNumber<int64_t>(value);
+                *(int64_t *)dest = ReverseBytes(v);
+            });
+        } break;
         case PrimitiveKind::UInt64: {
             PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
                 uint64_t v = CopyNumber<uint64_t>(value);
                 *(uint64_t *)dest = v;
             });
         } break;
+        case PrimitiveKind::UInt64S: {
+            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
+                uint64_t v = CopyNumber<uint64_t>(value);
+                *(uint64_t *)dest = ReverseBytes(v);
+            });
+        } break;
         case PrimitiveKind::String: {
             PUSH_ARRAY(value.IsString() || IsNullOrUndefined(value), "string", {
                 if (!IsNullOrUndefined(value)) {
@@ -567,24 +657,26 @@ bool CallData::PushTypedArray(Napi::TypedArray array, Size len, const TypeInfo *
         return false;
     }
 
-    Size offset = 0;
     const uint8_t *buf = (const uint8_t *)array.ArrayBuffer().Data();
 
-    if (RG_UNLIKELY(array.TypedArrayType() != GetTypedArrayType(ref))) {
+    if (RG_UNLIKELY(array.TypedArrayType() != GetTypedArrayType(ref) &&
+                    ref != instance->void_type)) {
         ThrowError<Napi::TypeError>(env, "Cannot use %1 value for %2 array", GetValueType(instance, array), ref->name);
         return false;
     }
 
     if (realign) {
+        Size offset = 0;
+        Size size = (Size)array.ElementSize();
+
         for (uint32_t i = 0; i < len; i++) {
-            int16_t align = std::max(ref->align, realign);
-            offset = AlignLen(offset, align);
+            offset = AlignLen(offset, realign);
 
             uint8_t *dest = origin + offset;
+            const uint8_t *src = buf + i * size;
 
-            memcpy(dest, buf + i * ref->size, ref->size);
-
-            offset += ref->size;
+            memcpy(dest, src, size);
+            offset += size;
         }
     } else {
         memcpy_safe(origin, buf, (size_t)array.ByteLength());
@@ -625,6 +717,16 @@ bool CallData::PushStringArray(Napi::Value obj, const TypeInfo *type, uint8_t *o
 
 bool CallData::PushPointer(Napi::Value value, const ParameterInfo &param, void **out_ptr)
 {
+    const TypeInfo *type = param.type;
+
+    if (CheckValueTag(instance, value, &CastMarker)) {
+        Napi::External<ValueCast> external = value.As<Napi::External<ValueCast>>();
+        ValueCast *cast = external.Data();
+
+        value = cast->ref.Value();
+        type = cast->type;
+    }
+
     switch (value.Type()) {
         case napi_undefined:
         case napi_null: {
@@ -633,9 +735,11 @@ bool CallData::PushPointer(Napi::Value value, const ParameterInfo &param, void *
         } break;
 
         case napi_external: {
-            RG_ASSERT(param.type->primitive == PrimitiveKind::Pointer);
+            RG_ASSERT(type->primitive == PrimitiveKind::Pointer);
 
-            if (RG_UNLIKELY(!CheckValueTag(instance, value, param.type->ref.marker)))
+            if (RG_UNLIKELY(!CheckValueTag(instance, value, type->ref.marker) &&
+                            !CheckValueTag(instance, value, instance->void_type) &&
+                            type->ref.type != instance->void_type))
                 goto unexpected;
 
             *out_ptr = value.As<Napi::External<uint8_t>>().Data();
@@ -649,12 +753,12 @@ bool CallData::PushPointer(Napi::Value value, const ParameterInfo &param, void *
                 Napi::Array array = value.As<Napi::Array>();
 
                 Size len = (Size)array.Length();
-                Size size = len * param.type->ref.type->size;
+                Size size = len * type->ref.type->size;
 
                 ptr = AllocHeap(size, 16);
 
                 if (param.directions & 1) {
-                    if (!PushNormalArray(array, len, param.type->ref.type, ptr))
+                    if (!PushNormalArray(array, len, type->ref.type, ptr))
                         return false;
                 } else {
                     memset(ptr, 0, size);
@@ -668,27 +772,28 @@ bool CallData::PushPointer(Napi::Value value, const ParameterInfo &param, void *
                 ptr = AllocHeap(size, 16);
 
                 if (param.directions & 1) {
-                    if (!PushTypedArray(array, len, param.type->ref.type, ptr))
+                    if (!PushTypedArray(array, len, type->ref.type, ptr))
                         return false;
                 } else {
-                    if (RG_UNLIKELY(array.TypedArrayType() != GetTypedArrayType(param.type->ref.type))) {
-                        ThrowError<Napi::TypeError>(env, "Cannot use %1 value for %2 array", GetValueType(instance, array), param.type->ref.type->name);
+                    if (RG_UNLIKELY(array.TypedArrayType() != GetTypedArrayType(type->ref.type) &&
+                                    type->ref.type != instance->void_type)) {
+                        ThrowError<Napi::TypeError>(env, "Cannot use %1 value for %2 array", GetValueType(instance, array), type->ref.type->name);
                         return false;
                     }
 
                     memset(ptr, 0, size);
                 }
-            } else if (RG_LIKELY(param.type->ref.type->primitive == PrimitiveKind::Record)) {
+            } else if (RG_LIKELY(type->ref.type->primitive == PrimitiveKind::Record)) {
                 Napi::Object obj = value.As<Napi::Object>();
                 RG_ASSERT(IsObject(value));
 
-                ptr = AllocHeap(param.type->ref.type->size, 16);
+                ptr = AllocHeap(type->ref.type->size, 16);
 
                 if (param.directions & 1) {
-                    if (!PushObject(obj, param.type->ref.type, ptr))
+                    if (!PushObject(obj, type->ref.type, ptr))
                         return false;
                 } else {
-                    memset(ptr, 0, param.type->size);
+                    memset(ptr, 0, type->size);
                 }
             } else {
                 goto unexpected;
@@ -701,7 +806,7 @@ bool CallData::PushPointer(Napi::Value value, const ParameterInfo &param, void *
                 RG_ASSERT(status == napi_ok);
 
                 out->ptr = ptr;
-                out->type = param.type->ref.type;
+                out->type = type->ref.type;
             }
 
             *out_ptr = ptr;
@@ -712,7 +817,7 @@ bool CallData::PushPointer(Napi::Value value, const ParameterInfo &param, void *
     }
 
 unexpected:
-    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected %3", GetValueType(instance, value), param.offset + 1, param.type->name);
+    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected %3", GetValueType(instance, value), param.offset + 1, type->name);
     return false;
 }
 
@@ -804,26 +909,58 @@ void CallData::PopObject(Napi::Object obj, const uint8_t *origin, const TypeInfo
                 double d = (double)*(int16_t *)src;
                 obj.Set(member.name, Napi::Number::New(env, d));
             } break;
+            case PrimitiveKind::Int16S: {
+                int16_t v = *(int16_t *)src;
+                double d = (double)ReverseBytes(v);
+
+                obj.Set(member.name, Napi::Number::New(env, d));
+            } break;
             case PrimitiveKind::UInt16: {
                 double d = (double)*(uint16_t *)src;
                 obj.Set(member.name, Napi::Number::New(env, d));
             } break;
+            case PrimitiveKind::UInt16S: {
+                uint16_t v = *(uint16_t *)src;
+                double d = (double)ReverseBytes(v);
+
+                obj.Set(member.name, Napi::Number::New(env, d));
+            } break;
             case PrimitiveKind::Int32: {
                 double d = (double)*(int32_t *)src;
                 obj.Set(member.name, Napi::Number::New(env, d));
             } break;
+            case PrimitiveKind::Int32S: {
+                int32_t v = *(int32_t *)src;
+                double d = (double)ReverseBytes(v);
+
+                obj.Set(member.name, Napi::Number::New(env, d));
+            } break;
             case PrimitiveKind::UInt32: {
                 double d = (double)*(uint32_t *)src;
                 obj.Set(member.name, Napi::Number::New(env, d));
             } break;
+            case PrimitiveKind::UInt32S: {
+                uint32_t v = *(uint32_t *)src;
+                double d = (double)ReverseBytes(v);
+
+                obj.Set(member.name, Napi::Number::New(env, d));
+            } break;
             case PrimitiveKind::Int64: {
                 int64_t v = *(int64_t *)src;
                 obj.Set(member.name, NewBigInt(env, v));
             } break;
+            case PrimitiveKind::Int64S: {
+                int64_t v = ReverseBytes(*(int64_t *)src);
+                obj.Set(member.name, NewBigInt(env, v));
+            } break;
             case PrimitiveKind::UInt64: {
                 uint64_t v = *(uint64_t *)src;
                 obj.Set(member.name, NewBigInt(env, v));
             } break;
+            case PrimitiveKind::UInt64S: {
+                uint64_t v = ReverseBytes(*(uint64_t *)src);
+                obj.Set(member.name, NewBigInt(env, v));
+            } break;
             case PrimitiveKind::String: {
                 const char *str = *(const char **)src;
                 obj.Set(member.name, str ? Napi::String::New(env, str) : env.Null());
@@ -924,6 +1061,14 @@ void CallData::PopNormalArray(Napi::Array array, const uint8_t *origin, const Ty
                 array.Set(i, Napi::Number::New(env, d)); \
             }); \
         } while (false)
+#define POP_NUMBER_ARRAY_SWAP(CType) \
+        do { \
+            POP_ARRAY({ \
+                CType v = *(CType *)src; \
+                double d = (double)ReverseBytes(v); \
+                array.Set(i, Napi::Number::New(env, d)); \
+            }); \
+        } while (false)
 
     switch (ref->primitive) {
         case PrimitiveKind::Void: { RG_UNREACHABLE(); } break;
@@ -937,21 +1082,37 @@ void CallData::PopNormalArray(Napi::Array array, const uint8_t *origin, const Ty
         case PrimitiveKind::Int8: { POP_NUMBER_ARRAY(int8_t); } break;
         case PrimitiveKind::UInt8: { POP_NUMBER_ARRAY(uint8_t); } break;
         case PrimitiveKind::Int16: { POP_NUMBER_ARRAY(int16_t); } break;
+        case PrimitiveKind::Int16S: { POP_NUMBER_ARRAY_SWAP(int16_t); } break;
         case PrimitiveKind::UInt16: { POP_NUMBER_ARRAY(uint16_t); } break;
+        case PrimitiveKind::UInt16S: { POP_NUMBER_ARRAY_SWAP(uint16_t); } break;
         case PrimitiveKind::Int32: { POP_NUMBER_ARRAY(int32_t); } break;
+        case PrimitiveKind::Int32S: { POP_NUMBER_ARRAY_SWAP(int32_t); } break;
         case PrimitiveKind::UInt32: { POP_NUMBER_ARRAY(uint32_t); } break;
+        case PrimitiveKind::UInt32S: { POP_NUMBER_ARRAY_SWAP(uint32_t); } break;
         case PrimitiveKind::Int64: {
             POP_ARRAY({
                 int64_t v = *(int64_t *)src;
                 array.Set(i, NewBigInt(env, v));
             });
         } break;
+        case PrimitiveKind::Int64S: {
+            POP_ARRAY({
+                int64_t v = ReverseBytes(*(int64_t *)src);
+                array.Set(i, NewBigInt(env, v));
+            });
+        } break;
         case PrimitiveKind::UInt64: {
             POP_ARRAY({
                 uint64_t v = *(uint64_t *)src;
                 array.Set(i, NewBigInt(env, v));
             });
         } break;
+        case PrimitiveKind::UInt64S: {
+            POP_ARRAY({
+                uint64_t v = ReverseBytes(*(uint64_t *)src);
+                array.Set(i, NewBigInt(env, v));
+            });
+        } break;
         case PrimitiveKind::String: {
             POP_ARRAY({
                 const char *str = *(const char **)src;
@@ -1009,6 +1170,7 @@ void CallData::PopNormalArray(Napi::Array array, const uint8_t *origin, const Ty
         case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
 
+#undef POP_NUMBER_ARRAY_SWAP
 #undef POP_NUMBER_ARRAY
 #undef POP_ARRAY
 }
@@ -1016,28 +1178,49 @@ void CallData::PopNormalArray(Napi::Array array, const uint8_t *origin, const Ty
 void CallData::PopTypedArray(Napi::TypedArray array, const uint8_t *origin, const TypeInfo *ref, int16_t realign)
 {
     RG_ASSERT(array.IsTypedArray());
-    RG_ASSERT(GetTypedArrayType(ref) == array.TypedArrayType());
+    RG_ASSERT(GetTypedArrayType(ref) == array.TypedArrayType() ||
+              ref == instance->void_type);
 
     uint8_t *buf = (uint8_t *)array.ArrayBuffer().Data();
 
     if (realign) {
         Size offset = 0;
         Size len = (Size)array.ElementLength();
+        Size size = (Size)array.ElementSize();
 
         for (Size i = 0; i < len; i++) {
-            int16_t align = std::max(ref->align, realign);
-            offset = AlignLen(offset, align);
+            offset = AlignLen(offset, realign);
 
-            uint8_t *dest = buf + i * ref->size;
+            uint8_t *dest = buf + i * size;
             const uint8_t *src = origin + offset;
 
-            memcpy(dest, src, ref->size);
+            memcpy(dest, src, size);
 
-            offset += ref->size;
+            offset += size;
         }
     } else {
         memcpy_safe(buf, origin, (size_t)array.ByteLength());
     }
+
+#define SWAP(CType) \
+        do { \
+            CType *data = (CType *)buf; \
+            Size len = (Size)array.ElementLength(); \
+             \
+            for (Size i = 0; i < len; i++) { \
+                data[i] = ReverseBytes(data[i]); \
+            } \
+        } while (false)
+
+    if (ref->primitive == PrimitiveKind::Int16S || ref->primitive == PrimitiveKind::UInt16S) {
+        SWAP(uint16_t);
+    } else if (ref->primitive == PrimitiveKind::Int32S || ref->primitive == PrimitiveKind::UInt32S) {
+        SWAP(uint32_t);
+    } else if (ref->primitive == PrimitiveKind::Int64S || ref->primitive == PrimitiveKind::UInt64S) {
+        SWAP(uint64_t);
+    }
+
+#undef SWAP
 }
 
 Napi::Value CallData::PopArray(const uint8_t *origin, const TypeInfo *type, int16_t realign)
@@ -1078,6 +1261,21 @@ Napi::Value CallData::PopArray(const uint8_t *origin, const TypeInfo *type, int1
                 return array; \
             } \
         } while (false)
+#define POP_NUMBER_ARRAY_SWAP(TypedArrayType, CType) \
+        do { \
+            if (type->hint == TypeInfo::ArrayHint::Array) { \
+                POP_ARRAY({ \
+                    CType v = *(CType *)src; \
+                    double d = (double)ReverseBytes(v); \
+                    array.Set(i, Napi::Number::New(env, d)); \
+                }); \
+            } else { \
+                Napi::TypedArrayType array = Napi::TypedArrayType::New(env, len); \
+                PopTypedArray(array, origin, type->ref.type, realign); \
+                 \
+                return array; \
+            } \
+        } while (false)
 
     switch (type->ref.type->primitive) {
         case PrimitiveKind::Void: { RG_UNREACHABLE(); } break;
@@ -1115,21 +1313,37 @@ Napi::Value CallData::PopArray(const uint8_t *origin, const TypeInfo *type, int1
 
             POP_NUMBER_ARRAY(Int16Array, int16_t);
         } break;
+        case PrimitiveKind::Int16S: { POP_NUMBER_ARRAY_SWAP(Int16Array, int16_t); } break;
         case PrimitiveKind::UInt16: { POP_NUMBER_ARRAY(Uint16Array, uint16_t); } break;
+        case PrimitiveKind::UInt16S: { POP_NUMBER_ARRAY_SWAP(Uint16Array, uint16_t); } break;
         case PrimitiveKind::Int32: { POP_NUMBER_ARRAY(Int32Array, int32_t); } break;
+        case PrimitiveKind::Int32S: { POP_NUMBER_ARRAY_SWAP(Int32Array, int32_t); } break;
         case PrimitiveKind::UInt32: { POP_NUMBER_ARRAY(Uint32Array, uint32_t); } break;
+        case PrimitiveKind::UInt32S: { POP_NUMBER_ARRAY_SWAP(Uint32Array, uint32_t); } break;
         case PrimitiveKind::Int64: {
             POP_ARRAY({
                 int64_t v = *(int64_t *)src;
                 array.Set(i, NewBigInt(env, v));
             });
         } break;
+        case PrimitiveKind::Int64S: {
+            POP_ARRAY({
+                int64_t v = ReverseBytes(*(int64_t *)src);
+                array.Set(i, NewBigInt(env, v));
+            });
+        } break;
         case PrimitiveKind::UInt64: {
             POP_ARRAY({
                 uint64_t v = *(uint64_t *)src;
                 array.Set(i, NewBigInt(env, v));
             });
         } break;
+        case PrimitiveKind::UInt64S: {
+            POP_ARRAY({
+                uint64_t v = ReverseBytes(*(uint64_t *)src);
+                array.Set(i, NewBigInt(env, v));
+            });
+        } break;
         case PrimitiveKind::String: {
             POP_ARRAY({
                 const char *str = *(const char **)src;
@@ -1175,6 +1389,7 @@ Napi::Value CallData::PopArray(const uint8_t *origin, const TypeInfo *type, int1
         case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
 
+#undef POP_NUMBER_ARRAY_SWAP
 #undef POP_NUMBER_ARRAY
 #undef POP_ARRAY
 

package/src/call.hh

@@ -71,9 +71,21 @@ public:
     CallData(Napi::Env env, InstanceData *instance, const FunctionInfo *func, InstanceMemory *mem);
     ~CallData();
 
-    bool Prepare(const Napi::CallbackInfo &info);
-    void Execute();
-    Napi::Value Complete();
+#ifdef UNITY_BUILD
+    #ifdef _MSC_VER
+        #define INLINE_IF_UNITY __forceinline
+    #else
+        #define INLINE_IF_UNITY __attribute__((always_inline)) inline
+    #endif
+#else
+    #define INLINE_IF_UNITY
+#endif
+
+    INLINE_IF_UNITY bool Prepare(const Napi::CallbackInfo &info);
+    INLINE_IF_UNITY void Execute();
+    INLINE_IF_UNITY Napi::Value Complete();
+
+#undef INLINE_IF_UNITY
 
     void Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegisters *out_reg);