koffi 2.0.0 → 2.1.0-beta.2

package/src/abi_riscv64.cc

@@ -247,6 +247,17 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 int64_t v = CopyNumber<int64_t>(value);
                 *(int64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++) = v;
             } break;
+            case PrimitiveKind::Int16S:
+            case PrimitiveKind::Int32S:
+            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 *)((param.gpr_count ? gpr_ptr : args_ptr)++) = ReverseBytes(v);
+            } break;
             case PrimitiveKind::UInt8:
             case PrimitiveKind::UInt16:
             case PrimitiveKind::UInt32:
@@ -259,6 +270,17 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 uint64_t v = CopyNumber<uint64_t>(value);
                 *((param.gpr_count ? gpr_ptr : args_ptr)++) = v;
             } break;
+            case PrimitiveKind::UInt16S:
+            case PrimitiveKind::UInt32S:
+            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);
+                *((param.gpr_count ? gpr_ptr : args_ptr)++) = ReverseBytes(v);
+            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -428,11 +450,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:
@@ -473,16 +501,22 @@ Napi::Value CallData::Complete()
     };
 
     switch (func->ret.type->primitive) {
-        case PrimitiveKind::Void: return env.Null();
+        case PrimitiveKind::Void: return env.Undefined();
         case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
         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:
@@ -576,36 +610,76 @@ 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 *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt16S: {
+                uint16_t v = *(uint16_t *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int32S: {
+                int32_t v = *(int32_t *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt32S: {
+                uint32_t v = *(uint32_t *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int64S: {
+                int64_t v = *(int64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt64: {
                 uint64_t v = *(uint64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt64S: {
+                uint64_t v = *(uint64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::String: {
                 const char *str = *(const char **)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
@@ -734,8 +808,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::UInt16:
         case PrimitiveKind::Int32:
         case PrimitiveKind::UInt32:
-        case PrimitiveKind::Int64:
-        case PrimitiveKind::UInt64: {
+        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;
@@ -744,6 +817,37 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             int64_t v = CopyNumber<int64_t>(value);
             out_reg->a0 = (uint64_t)v;
         } break;
+        case PrimitiveKind::Int16S:
+        case PrimitiveKind::UInt16S:
+        case PrimitiveKind::Int32S:
+        case PrimitiveKind::UInt32S:
+        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 = CopyNumber<int64_t>(value);
+            out_reg->a0 = (uint64_t)ReverseBytes(v);
+        } 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->a0 = v;
+        } 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 = CopyNumber<uint64_t>(value);
+            out_reg->a0 = ReverseBytes(v);
+        } break;
         case PrimitiveKind::String: {
             const char *str;
             if (RG_LIKELY(value.IsString())) {

package/src/abi_x64_sysv.cc

@@ -169,11 +169,17 @@ static Size ClassifyType(const TypeInfo *type, Size offset, Span<RegisterClass>
         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:
@@ -332,6 +338,19 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 int64_t v = CopyNumber<int64_t>(value);
                 *(int64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++) = v;
             } break;
+            case PrimitiveKind::Int16S:
+            case PrimitiveKind::UInt16S:
+            case PrimitiveKind::Int32S:
+            case PrimitiveKind::UInt32S:
+            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 *)((param.gpr_count ? gpr_ptr : args_ptr)++) = ReverseBytes(v);
+            } 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);
@@ -341,6 +360,15 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 uint64_t v = CopyNumber<uint64_t>(value);
                 *((param.gpr_count ? gpr_ptr : args_ptr)++) = v;
             } 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);
+                *((param.gpr_count ? gpr_ptr : args_ptr)++) = ReverseBytes(v);
+            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -486,11 +514,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::Int64: 
+        case PrimitiveKind::UInt32S:
+        case PrimitiveKind::Int64:
+        case PrimitiveKind::Int64S:
         case PrimitiveKind::UInt64:
+        case PrimitiveKind::UInt64S:
         case PrimitiveKind::String:
         case PrimitiveKind::String16:
         case PrimitiveKind::Pointer:
@@ -531,16 +565,22 @@ Napi::Value CallData::Complete()
     };
 
     switch (func->ret.type->primitive) {
-        case PrimitiveKind::Void: return env.Null();
+        case PrimitiveKind::Void: return env.Undefined();
         case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
         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:
@@ -629,36 +669,76 @@ 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 *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt16S: {
+                uint16_t v = *(uint16_t *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int32S: {
+                int32_t v = *(int32_t *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt32S: {
+                uint32_t v = *(uint32_t *)((param.gpr_count ? gpr_ptr : 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 *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int64S: {
+                int64_t v = *(int64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt64: {
                 uint64_t v = *(uint64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt64S: {
+                uint64_t v = *(uint64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::String: {
                 const char *str = *(const char **)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
@@ -776,8 +856,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::UInt16:
         case PrimitiveKind::Int32:
         case PrimitiveKind::UInt32:
-        case PrimitiveKind::Int64:
-        case PrimitiveKind::UInt64: {
+        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;
@@ -786,6 +865,37 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             int64_t v = CopyNumber<int64_t>(value);
             out_reg->rax = (uint64_t)v;
         } break;
+        case PrimitiveKind::Int16S:
+        case PrimitiveKind::UInt16S:
+        case PrimitiveKind::Int32S:
+        case PrimitiveKind::UInt32S:
+        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 = CopyNumber<int64_t>(value);
+            out_reg->rax = (uint64_t)ReverseBytes(v);
+        } 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->rax = v;
+        } 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 = CopyNumber<uint64_t>(value);
+            out_reg->rax = ReverseBytes(v);
+        } break;
         case PrimitiveKind::String: {
             const char *str;
             if (RG_LIKELY(value.IsString())) {

package/src/abi_x64_win.cc

@@ -176,6 +176,19 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 int64_t v = CopyNumber<int64_t>(value);
                 *(int64_t *)(args_ptr++) = v;
             } break;
+            case PrimitiveKind::Int16S:
+            case PrimitiveKind::UInt16S:
+            case PrimitiveKind::Int32S:
+            case PrimitiveKind::UInt32S:
+            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);
+            } 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);
@@ -185,6 +198,15 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 uint64_t v = CopyNumber<uint64_t>(value);
                 *(args_ptr++) = v;
             } 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);
+                *(args_ptr++) = ReverseBytes(v);
+            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -308,11 +330,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:
@@ -339,16 +367,22 @@ Napi::Value CallData::Complete()
     };
 
     switch (func->ret.type->primitive) {
-        case PrimitiveKind::Void: return env.Null();
+        case PrimitiveKind::Void: return env.Undefined();
         case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
         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:
@@ -440,6 +474,14 @@ 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 *)(j < 4 ? gpr_ptr + j : args_ptr);
+                double d = (double)ReverseBytes(v);
+                args_ptr += (j >= 4);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt16: {
                 double d = (double)*(uint16_t *)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
@@ -447,6 +489,14 @@ 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::UInt16S: {
+                uint16_t v = *(uint16_t *)(j < 4 ? gpr_ptr + j : args_ptr);
+                double d = (double)ReverseBytes(v);
+                args_ptr += (j >= 4);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int32: {
                 double d = (double)*(int32_t *)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
@@ -454,6 +504,14 @@ 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::Int32S: {
+                int32_t v = *(int32_t *)(j < 4 ? gpr_ptr + j : args_ptr);
+                double d = (double)ReverseBytes(v);
+                args_ptr += (j >= 4);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt32: {
                 double d = (double)*(uint32_t *)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
@@ -461,6 +519,14 @@ 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::UInt32S: {
+                uint32_t v = *(uint32_t *)(j < 4 ? gpr_ptr + j : args_ptr);
+                double d = (double)ReverseBytes(v);
+                args_ptr += (j >= 4);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int64: {
                 int64_t v = *(int64_t *)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
@@ -468,6 +534,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 *)(j < 4 ? gpr_ptr + j : args_ptr);
+                args_ptr += (j >= 4);
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt64: {
                 uint64_t v = *(uint64_t *)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
@@ -475,6 +548,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 *)(j < 4 ? gpr_ptr + j : args_ptr);
+                args_ptr += (j >= 4);
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::String: {
                 const char *str = *(const char **)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
@@ -574,8 +654,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::UInt16:
         case PrimitiveKind::Int32:
         case PrimitiveKind::UInt32:
-        case PrimitiveKind::Int64:
-        case PrimitiveKind::UInt64: {
+        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;
@@ -584,6 +663,37 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             int64_t v = CopyNumber<int64_t>(value);
             out_reg->rax = (uint64_t)v;
         } break;
+        case PrimitiveKind::Int16S:
+        case PrimitiveKind::UInt16S:
+        case PrimitiveKind::Int32S:
+        case PrimitiveKind::UInt32S:
+        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 = CopyNumber<int64_t>(value);
+            out_reg->rax = (uint64_t)ReverseBytes(v);
+        } 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->rax = v;
+        } 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 = CopyNumber<uint64_t>(value);
+            out_reg->rax = ReverseBytes(v);
+        } break;
         case PrimitiveKind::String: {
             const char *str;
             if (RG_LIKELY(value.IsString())) {