koffi 2.1.0-beta.1 → 2.1.0-beta.2

package/src/abi_x86.cc

@@ -229,6 +229,17 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 int32_t v = CopyNumber<int32_t>(value);
                 *(int32_t *)((param.fast ? fast_ptr : args_ptr)++) = v;
             } break;
+            case PrimitiveKind::Int16S:
+            case PrimitiveKind::UInt16S:
+            case PrimitiveKind::Int32S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
+                    return false;
+                }
+
+                int32_t v = CopyNumber<int32_t>(value);
+                *(int32_t *)((param.fast ? fast_ptr : args_ptr)++) = ReverseBytes(v);
+            } break;
             case PrimitiveKind::UInt32: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
@@ -238,6 +249,15 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 uint32_t v = CopyNumber<uint32_t>(value);
                 *((param.fast ? fast_ptr : args_ptr)++) = v;
             } break;
+            case PrimitiveKind::UInt32S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
+                    return false;
+                }
+
+                uint32_t v = CopyNumber<uint32_t>(value);
+                *((param.fast ? fast_ptr : args_ptr)++) = ReverseBytes(v);
+            } break;
             case PrimitiveKind::Int64: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
@@ -248,6 +268,16 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 *(int64_t *)args_ptr = v;
                 args_ptr += 2;
             } break;
+            case PrimitiveKind::Int64S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
+                    return false;
+                }
+
+                int64_t v = CopyNumber<int64_t>(value);
+                *(int64_t *)args_ptr = ReverseBytes(v);
+                args_ptr += 2;
+            } break;
             case PrimitiveKind::UInt64: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
@@ -258,6 +288,16 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 *(uint64_t *)args_ptr = v;
                 args_ptr += 2;
             } break;
+            case PrimitiveKind::UInt64S: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
+                    return false;
+                }
+
+                uint64_t v = CopyNumber<uint64_t>(value);
+                *(uint64_t *)args_ptr = ReverseBytes(v);
+                args_ptr += 2;
+            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -382,11 +422,17 @@ void CallData::Execute()
         case PrimitiveKind::Int8:
         case PrimitiveKind::UInt8:
         case PrimitiveKind::Int16:
+        case PrimitiveKind::Int16S:
         case PrimitiveKind::UInt16:
+        case PrimitiveKind::UInt16S:
         case PrimitiveKind::Int32:
+        case PrimitiveKind::Int32S:
         case PrimitiveKind::UInt32:
+        case PrimitiveKind::UInt32S:
         case PrimitiveKind::Int64:
+        case PrimitiveKind::Int64S:
         case PrimitiveKind::UInt64:
+        case PrimitiveKind::UInt64S:
         case PrimitiveKind::String:
         case PrimitiveKind::String16:
         case PrimitiveKind::Pointer:
@@ -418,11 +464,17 @@ Napi::Value CallData::Complete()
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);
+        case PrimitiveKind::Int16S: return Napi::Number::New(env, (double)ReverseBytes(result.i16));
         case PrimitiveKind::UInt16: return Napi::Number::New(env, (double)result.u16);
+        case PrimitiveKind::UInt16S: return Napi::Number::New(env, (double)ReverseBytes(result.u16));
         case PrimitiveKind::Int32: return Napi::Number::New(env, (double)result.i32);
+        case PrimitiveKind::Int32S: return Napi::Number::New(env, (double)ReverseBytes(result.i32));
         case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)result.u32);
+        case PrimitiveKind::UInt32S: return Napi::Number::New(env, (double)ReverseBytes(result.u32));
         case PrimitiveKind::Int64: return NewBigInt(env, result.i64);
+        case PrimitiveKind::Int64S: return NewBigInt(env, ReverseBytes(result.i64));
         case PrimitiveKind::UInt64: return NewBigInt(env, result.u64);
+        case PrimitiveKind::UInt64S: return NewBigInt(env, ReverseBytes(result.u64));
         case PrimitiveKind::String: return result.ptr ? Napi::String::New(env, (const char *)result.ptr) : env.Null();
         case PrimitiveKind::String16: return result.ptr ? Napi::String::New(env, (const char16_t *)result.ptr) : env.Null();
         case PrimitiveKind::Pointer:
@@ -524,24 +576,52 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int16S: {
+                int16_t v = *(int16_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt16: {
                 double d = (double)*(uint16_t *)(args_ptr++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt16S: {
+                uint16_t v = *(uint16_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int32: {
                 double d = (double)*(int32_t *)(args_ptr++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int32S: {
+                int32_t v = *(int32_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt32: {
                 double d = (double)*(uint32_t *)(args_ptr++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt32S: {
+                uint32_t v = *(uint32_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int64: {
                 int64_t v = *(int64_t *)args_ptr;
                 args_ptr += 2;
@@ -549,6 +629,13 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int64S: {
+                int64_t v = *(int64_t *)args_ptr;
+                args_ptr += 2;
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt64: {
                 uint64_t v = *(uint64_t *)args_ptr;
                 args_ptr += 2;
@@ -556,6 +643,13 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt64S: {
+                uint64_t v = *(uint64_t *)args_ptr;
+                args_ptr += 2;
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::String: {
                 const char *str = *(const char **)(args_ptr++);
 
@@ -647,8 +741,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::UInt8:
         case PrimitiveKind::Int16:
         case PrimitiveKind::UInt16:
-        case PrimitiveKind::Int32:
-        case PrimitiveKind::UInt32: {
+        case PrimitiveKind::Int32: {
             if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
                 return;
@@ -657,8 +750,36 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             int32_t v = CopyNumber<int32_t>(value);
             out_reg->eax = (uint32_t)v;
         } break;
-        case PrimitiveKind::Int64:
-        case PrimitiveKind::UInt64: {
+        case PrimitiveKind::Int16S:
+        case PrimitiveKind::UInt16S:
+        case PrimitiveKind::Int32S: {
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                return;
+            }
+
+            int32_t v = CopyNumber<int32_t>(value);
+            out_reg->eax = (uint32_t)ReverseBytes(v);
+        } break;
+        case PrimitiveKind::UInt32: {
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                return;
+            }
+
+            uint32_t v = CopyNumber<uint32_t>(value);
+            out_reg->eax = v;
+        } break;
+        case PrimitiveKind::UInt32S: {
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                return;
+            }
+
+            uint32_t v = CopyNumber<uint32_t>(value);
+            out_reg->eax = ReverseBytes(v);
+        } break;
+        case PrimitiveKind::Int64: {
             if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
                 return;
@@ -668,6 +789,36 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
             out_reg->edx = (uint32_t)(v << 32);
         } break;
+        case PrimitiveKind::Int64S: {
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                return;
+            }
+
+            int64_t v = ReverseBytes(CopyNumber<int64_t>(value));
+            out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
+            out_reg->edx = (uint32_t)(v << 32);
+        } break;
+        case PrimitiveKind::UInt64: {
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                return;
+            }
+
+            uint64_t v = CopyNumber<uint64_t>(value);
+            out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
+            out_reg->edx = (uint32_t)(v << 32);
+        } break;
+        case PrimitiveKind::UInt64S: {
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                return;
+            }
+
+            uint64_t v = ReverseBytes(CopyNumber<uint64_t>(value));
+            out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
+            out_reg->edx = (uint32_t)(v << 32);
+        } break;
         case PrimitiveKind::String: {
             const char *str;
             if (RG_LIKELY(value.IsString())) {

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)) {
@@ -819,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());
@@ -939,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;
@@ -952,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;
@@ -1024,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
 }
@@ -1054,6 +1201,26 @@ void CallData::PopTypedArray(Napi::TypedArray array, const uint8_t *origin, cons
     } 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)
@@ -1094,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;
@@ -1131,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;
@@ -1191,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