koffi 2.0.0 → 2.1.0-beta.2

package/src/abi_arm32.cc

@@ -155,9 +155,13 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
             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::String:
             case PrimitiveKind::String16:
             case PrimitiveKind::Pointer:
@@ -170,7 +174,9 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
                 }
             } break;
             case PrimitiveKind::Int64:
-            case PrimitiveKind::UInt64: {
+            case PrimitiveKind::Int64S:
+            case PrimitiveKind::UInt64:
+            case PrimitiveKind::UInt64S: {
                 bool realign = gpr_avail % 2;
                 int need = 2 + realign;
 
@@ -301,6 +307,17 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 int32_t v = CopyNumber<int32_t>(value);
                 *(int32_t *)((param.gpr_count ? gpr_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 = ReverseBytes(CopyNumber<int32_t>(value));
+                *(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++) = 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);
@@ -310,6 +327,15 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 uint32_t v = CopyNumber<uint32_t>(value);
                 *((param.gpr_count ? gpr_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 = ReverseBytes(CopyNumber<uint32_t>(value));
+                *((param.gpr_count ? gpr_ptr : args_ptr)++) = 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);
@@ -328,6 +354,24 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                     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 = ReverseBytes(CopyNumber<int64_t>(value));
+
+                if (RG_LIKELY(param.gpr_count)) {
+                    gpr_ptr = AlignUp(gpr_ptr, 8);
+                    *(int64_t *)gpr_ptr = v;
+                    gpr_ptr += param.gpr_count;
+                } else {
+                    args_ptr = AlignUp(args_ptr, 8);
+                    *(int64_t *)args_ptr = 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);
@@ -346,6 +390,24 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                     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 = ReverseBytes(CopyNumber<uint64_t>(value));
+
+                if (RG_LIKELY(param.gpr_count)) {
+                    gpr_ptr = AlignUp(gpr_ptr, 8);
+                    *(uint64_t *)gpr_ptr = v;
+                    gpr_ptr += param.gpr_count;
+                } else {
+                    args_ptr = AlignUp(args_ptr, 8);
+                    *(uint64_t *)args_ptr = v;
+                    args_ptr += 2;
+                }
+            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -498,14 +560,20 @@ void CallData::Execute()
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void:
         case PrimitiveKind::Bool:
-        case PrimitiveKind::Int8: 
+        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:
@@ -539,16 +607,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:
@@ -637,24 +711,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 *)((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: {
                 gpr_ptr = AlignUp(gpr_ptr, 8);
 
@@ -664,6 +766,15 @@ 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: {
+                gpr_ptr = AlignUp(gpr_ptr, 8);
+
+                int64_t v = *(int64_t *)(param.gpr_count ? gpr_ptr : args_ptr);
+                (param.gpr_count ? gpr_ptr : args_ptr) += 2;
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt64: {
                 gpr_ptr = AlignUp(gpr_ptr, 8);
 
@@ -673,6 +784,15 @@ 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: {
+                gpr_ptr = AlignUp(gpr_ptr, 8);
+
+                uint64_t v = *(uint64_t *)(param.gpr_count ? gpr_ptr : args_ptr);
+                (param.gpr_count ? gpr_ptr : args_ptr) += 2;
+
+                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)++);
 
@@ -824,6 +944,17 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             int32_t v = CopyNumber<int32_t>(value);
             out_reg->r0 = (uint32_t)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 return value, expected number", GetValueType(instance, value));
+                return;
+            }
+
+            int32_t v = CopyNumber<int32_t>(value);
+            out_reg->r0 = (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));
@@ -833,6 +964,15 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             uint32_t v = CopyNumber<uint32_t>(value);
             out_reg->r0 = 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->r0 = 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));
@@ -840,6 +980,18 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             }
 
             int64_t v = CopyNumber<int64_t>(value);
+
+            out_reg->r0 = (uint32_t)(v >> 32);
+            out_reg->r1 = (uint32_t)((uint64_t)v & 0xFFFFFFFFu);
+        } 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->r0 = (uint32_t)(v >> 32);
             out_reg->r1 = (uint32_t)((uint64_t)v & 0xFFFFFFFFu);
         } break;
@@ -850,6 +1002,18 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             }
 
             uint64_t v = CopyNumber<uint64_t>(value);
+
+            out_reg->r0 = (uint32_t)(v >> 32);
+            out_reg->r1 = (uint32_t)((uint64_t)v & 0xFFFFFFFFu);
+        } 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->r0 = (uint32_t)(v >> 32);
             out_reg->r1 = (uint32_t)((uint64_t)v & 0xFFFFFFFFu);
         } break;

package/src/abi_arm64.cc

@@ -151,11 +151,17 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
             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:
@@ -302,6 +308,30 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
 
                 int64_t v = CopyNumber<int64_t>(value);
 
+#ifdef __APPLE__
+                if (RG_LIKELY(param.gpr_count)) {
+                    *(int64_t *)(gpr_ptr++) = v;
+                } else {
+                    args_ptr = AlignUp(args_ptr, param.type->align);
+                    *(int64_t *)args_ptr = v;
+                    args_ptr = (uint64_t *)((uint8_t *)args_ptr + param.type->size);
+                }
+#else
+                *(int64_t *)((param.gpr_count ? gpr_ptr : args_ptr)++) = v;
+#endif
+            } 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 = ReverseBytes(CopyNumber<int64_t>(value));
+
 #ifdef __APPLE__
                 if (RG_LIKELY(param.gpr_count)) {
                     *(int64_t *)(gpr_ptr++) = v;
@@ -322,6 +352,19 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
 
                 uint64_t v = CopyNumber<uint64_t>(value);
 
+#ifdef __APPLE__
+                args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
+#endif
+                *((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 = ReverseBytes(CopyNumber<uint64_t>(value));
+
 #ifdef __APPLE__
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
@@ -519,11 +562,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:
@@ -560,16 +609,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:
@@ -703,6 +758,28 @@ 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: {
+#ifdef __APPLE__
+                double d;
+                if (param.gpr_count) {
+                    int16_t v = *(int16_t *)(gpr_ptr++);
+                    d = (double)ReverseBytes(v);
+                } else {
+                    args_ptr = AlignUp(args_ptr, 2);
+
+                    int16_t v = *(int16_t *)args_ptr;
+                    d = (double)ReverseBytes(v);
+
+                    args_ptr = (uint64_t *)((uint8_t *)args_ptr + 2);
+                }
+#else
+                int16_t v = *(int16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                double d = (double)ReverseBytes(v);
+#endif
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt16: {
 #ifdef __APPLE__
                 double d;
@@ -720,6 +797,28 @@ 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: {
+#ifdef __APPLE__
+                double d;
+                if (param.gpr_count) {
+                    uint16_t v = *(uint16_t *)(gpr_ptr++);
+                    d = (double)ReverseBytes(v);
+                } else {
+                    args_ptr = AlignUp(args_ptr, 2);
+
+                    uint16_t v = *(uint16_t *)args_ptr;
+                    d = (double)ReverseBytes(v);
+
+                    args_ptr = (uint64_t *)((uint8_t *)args_ptr + 2);
+                }
+#else
+                uint16_t v = *(uint16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                double d = (double)ReverseBytes(v);
+#endif
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int32: {
 #ifdef __APPLE__
                 double d;
@@ -737,6 +836,28 @@ 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: {
+#ifdef __APPLE__
+                double d;
+                if (param.gpr_count) {
+                    int32_t v = *(int32_t *)(gpr_ptr++);
+                    d = (double)ReverseBytes(v);
+                } else {
+                    args_ptr = AlignUp(args_ptr, 4);
+
+                    int32_t v = *(int32_t *)args_ptr;
+                    d = (double)ReverseBytes(v);
+
+                    args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
+                }
+#else
+                int32_t v = *(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                double d = (double)ReverseBytes(v);
+#endif
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt32: {
 #ifdef __APPLE__
                 double d;
@@ -754,6 +875,28 @@ 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: {
+#ifdef __APPLE__
+                double d;
+                if (param.gpr_count) {
+                    uint32_t v = *(uint32_t *)(gpr_ptr++);
+                    d = (double)ReverseBytes(v);
+                } else {
+                    args_ptr = AlignUp(args_ptr, 4);
+
+                    uint32_t v = *(uint32_t *)args_ptr;
+                    d = (double)ReverseBytes(v);
+
+                    args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
+                }
+#else
+                uint32_t v = *(uint32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                double d = (double)ReverseBytes(v);
+#endif
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int64: {
 #ifdef __APPLE__
                 args_ptr = AlignUp(args_ptr, 8);
@@ -764,6 +907,16 @@ 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: {
+#ifdef __APPLE__
+                args_ptr = AlignUp(args_ptr, 8);
+#endif
+
+                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: {
 #ifdef __APPLE__
                 args_ptr = AlignUp(args_ptr, 8);
@@ -774,6 +927,16 @@ 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: {
+#ifdef __APPLE__
+                args_ptr = AlignUp(args_ptr, 8);
+#endif
+
+                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: {
 #ifdef __APPLE__
                 args_ptr = AlignUp(args_ptr, 8);
@@ -930,8 +1093,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;
@@ -940,6 +1102,37 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             int64_t v = CopyNumber<int64_t>(value);
             out_reg->x0 = (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->x0 = (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->x0 = 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->x0 = ReverseBytes(v);
+        } break;
         case PrimitiveKind::String: {
             const char *str;
             if (RG_LIKELY(value.IsString())) {