koffi 2.1.0-beta.1 → 2.1.0

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:
@@ -259,6 +265,64 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         gpr_ptr[8] = (uint64_t)return_ptr;
     }
 
+#ifdef __APPLE__
+    #define PUSH_INTEGER(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+             \
+            if (RG_LIKELY(param.gpr_count)) { \
+                *(gpr_ptr++) = (uint64_t)v; \
+            } else { \
+                args_ptr = AlignUp(args_ptr, param.type->align); \
+                *args_ptr = (uint64_t)v; \
+                args_ptr = (uint64_t *)((uint8_t *)args_ptr + param.type->size); \
+            } \
+        } while (false)
+    #define PUSH_INTEGER_SWAP(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+             \
+            if (RG_LIKELY(param.gpr_count)) { \
+                *(gpr_ptr++) = (uint64_t)ReverseBytes(v); \
+            } else { \
+                args_ptr = AlignUp(args_ptr, param.type->align); \
+                *args_ptr = (uint64_t)ReverseBytes(v); \
+                args_ptr = (uint64_t *)((uint8_t *)args_ptr + param.type->size); \
+            } \
+        } while (false)
+#else
+    #define PUSH_INTEGER(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint64_t)v; \
+        } while (false)
+    #define PUSH_INTEGER_SWAP(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint64_t)ReverseBytes(v); \
+        } while (false)
+#endif
+
     // Push arguments
     for (Size i = 0; i < func->parameters.len; i++) {
         const ParameterInfo &param = func->parameters[i];
@@ -271,7 +335,7 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
 
             case PrimitiveKind::Bool: {
                 if (RG_UNLIKELY(!value.IsBoolean())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected boolean", GetValueType(instance, value), param.offset + 1);
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
                     return false;
                 }
 
@@ -288,57 +352,24 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint64_t)b;
 #endif
             } break;
-            case PrimitiveKind::Int8:
-            case PrimitiveKind::UInt8:
-            case PrimitiveKind::Int16:
-            case PrimitiveKind::UInt16:
-            case PrimitiveKind::Int32:
-            case PrimitiveKind::UInt32:
-            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);
-                    return false;
-                }
-
-                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::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);
-                    return false;
-                }
-
-                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::Int8: { PUSH_INTEGER(int8_t); } break;
+            case PrimitiveKind::UInt8: { PUSH_INTEGER(uint8_t); } break;
+            case PrimitiveKind::Int16: { PUSH_INTEGER(int16_t); } break;
+            case PrimitiveKind::Int16S: { PUSH_INTEGER_SWAP(int16_t); } break;
+            case PrimitiveKind::UInt16: { PUSH_INTEGER(uint16_t); } break;
+            case PrimitiveKind::UInt16S: { PUSH_INTEGER_SWAP(uint16_t); } break;
+            case PrimitiveKind::Int32: { PUSH_INTEGER(int32_t); } break;
+            case PrimitiveKind::Int32S: { PUSH_INTEGER_SWAP(int32_t); } break;
+            case PrimitiveKind::UInt32: { PUSH_INTEGER(uint32_t); } break;
+            case PrimitiveKind::UInt32S: { PUSH_INTEGER_SWAP(uint32_t); } break;
+            case PrimitiveKind::Int64: { PUSH_INTEGER(int64_t); } break;
+            case PrimitiveKind::Int64S: { PUSH_INTEGER_SWAP(int64_t); } break;
+            case PrimitiveKind::UInt64: { PUSH_INTEGER(uint64_t); } break;
+            case PrimitiveKind::UInt64S: { PUSH_INTEGER_SWAP(uint64_t); } break;
             case PrimitiveKind::String: {
                 const char *str;
-                if (RG_LIKELY(value.IsString())) {
-                    str = PushString(value);
-                    if (RG_UNLIKELY(!str))
-                        return false;
-                } else if (IsNullOrUndefined(value)) {
-                    str = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected string", GetValueType(instance, value), param.offset + 1);
+                if (RG_UNLIKELY(!PushString(value, &str)))
                     return false;
-                }
 
 #ifdef __APPLE__
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
@@ -347,16 +378,8 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::String16: {
                 const char16_t *str16;
-                if (RG_LIKELY(value.IsString())) {
-                    str16 = PushString16(value);
-                    if (RG_UNLIKELY(!str16))
-                        return false;
-                } else if (IsNullOrUndefined(value)) {
-                    str16 = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected string", GetValueType(instance, value), param.offset + 1);
+                if (RG_UNLIKELY(!PushString16(value, &str16)))
                     return false;
-                }
 
 #ifdef __APPLE__
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
@@ -365,7 +388,7 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Pointer: {
                 void *ptr;
-                if (RG_UNLIKELY(!PushPointer(value, param, &ptr)))
+                if (RG_UNLIKELY(!PushPointer(value, param.type, param.directions, &ptr)))
                     return false;
 
 #ifdef __APPLE__
@@ -375,7 +398,7 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Record: {
                 if (RG_UNLIKELY(!IsObject(value))) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected object", GetValueType(instance, value), param.offset + 1);
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
                     return false;
                 }
 
@@ -422,7 +445,7 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
             case PrimitiveKind::Array: { RG_UNREACHABLE(); } break;
             case PrimitiveKind::Float32: {
                 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);
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                     return false;
                 }
 
@@ -449,7 +472,7 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Float64: {
                 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);
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                     return false;
                 }
 
@@ -482,7 +505,7 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
                 } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected %3", GetValueType(instance, value), param.offset + 1, param.type->name);
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
                     return false;
                 }
 
@@ -496,6 +519,9 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+#undef PUSH_INTEGER_SWAP
+#undef PUSH_INTEGER
+
     new_sp = mem->stack.end();
 
     return true;
@@ -519,11 +545,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:
@@ -565,11 +597,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:
@@ -703,6 +741,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 +780,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 +819,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 +858,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 +890,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 +910,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);
@@ -912,61 +1058,64 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
     if (RG_UNLIKELY(env.IsExceptionPending()))
         return;
 
+#define RETURN_INTEGER(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            out_reg->x0 = (uint64_t)v; \
+        } while (false)
+#define RETURN_INTEGER_SWAP(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            out_reg->x0 = (uint64_t)ReverseBytes(v); \
+        } while (false)
+
     // Convert the result
     switch (type->primitive) {
         case PrimitiveKind::Void: {} break;
         case PrimitiveKind::Bool: {
             if (RG_UNLIKELY(!value.IsBoolean())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected boolean", GetValueType(instance, value));
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
                 return;
             }
 
             bool b = value.As<Napi::Boolean>();
             out_reg->x0 = (uint64_t)b;
         } break;
-        case PrimitiveKind::Int8:
-        case PrimitiveKind::UInt8:
-        case PrimitiveKind::Int16:
-        case PrimitiveKind::UInt16:
-        case PrimitiveKind::Int32:
-        case PrimitiveKind::UInt32:
-        case PrimitiveKind::Int64:
-        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;
-            }
-
-            int64_t v = CopyNumber<int64_t>(value);
-            out_reg->x0 = (uint64_t)v;
-        } break;
+        case PrimitiveKind::Int8: { RETURN_INTEGER(int8_t); } break;
+        case PrimitiveKind::UInt8: { RETURN_INTEGER(uint8_t); } break;
+        case PrimitiveKind::Int16: { RETURN_INTEGER(int16_t); } break;
+        case PrimitiveKind::Int16S: { RETURN_INTEGER_SWAP(int16_t); } break;
+        case PrimitiveKind::UInt16: { RETURN_INTEGER(uint16_t); } break;
+        case PrimitiveKind::UInt16S: { RETURN_INTEGER_SWAP(uint16_t); } break;
+        case PrimitiveKind::Int32: { RETURN_INTEGER(int32_t); } break;
+        case PrimitiveKind::Int32S: { RETURN_INTEGER_SWAP(int32_t); } break;
+        case PrimitiveKind::UInt32: { RETURN_INTEGER(uint32_t); } break;
+        case PrimitiveKind::UInt32S: { RETURN_INTEGER_SWAP(uint32_t); } break;
+        case PrimitiveKind::Int64: { RETURN_INTEGER(int64_t); } break;
+        case PrimitiveKind::Int64S: { RETURN_INTEGER_SWAP(int64_t); } break;
+        case PrimitiveKind::UInt64: { RETURN_INTEGER(uint64_t); } break;
+        case PrimitiveKind::UInt64S: { RETURN_INTEGER_SWAP(uint64_t); } break;
         case PrimitiveKind::String: {
             const char *str;
-            if (RG_LIKELY(value.IsString())) {
-                str = PushString(value);
-                if (RG_UNLIKELY(!str))
-                    return;
-            } else if (IsNullOrUndefined(value)) {
-                str = nullptr;
-            } else {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected string", GetValueType(instance, value));
+            if (RG_UNLIKELY(!PushString(value, &str)))
                 return;
-            }
 
             out_reg->x0 = (uint64_t)str;
         } break;
         case PrimitiveKind::String16: {
             const char16_t *str16;
-            if (RG_LIKELY(value.IsString())) {
-                str16 = PushString16(value);
-                if (RG_UNLIKELY(!str16))
-                    return;
-            } else if (IsNullOrUndefined(value)) {
-                str16 = nullptr;
-            } else {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected string", GetValueType(instance, value));
+            if (RG_UNLIKELY(!PushString16(value, &str16)))
                 return;
-            }
 
             out_reg->x0 = (uint64_t)str16;
         } break;
@@ -985,7 +1134,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             } else if (IsNullOrUndefined(value)) {
                 ptr = nullptr;
             } else {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected %2", GetValueType(instance, value), type->name);
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);
                 return;
             }
 
@@ -993,7 +1142,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         } break;
         case PrimitiveKind::Record: {
             if (RG_UNLIKELY(!IsObject(value))) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected object", GetValueType(instance, value));
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
                 return;
             }
 
@@ -1012,7 +1161,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::Array: { RG_UNREACHABLE(); } break;
         case PrimitiveKind::Float32: {
             if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                 return;
             }
 
@@ -1023,7 +1172,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         } break;
         case PrimitiveKind::Float64: {
             if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                 return;
             }
 
@@ -1044,7 +1193,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             } else if (IsNullOrUndefined(value)) {
                 ptr = nullptr;
             } else {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected %2", GetValueType(instance, value), type->name);
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);
                 return;
             }
 
@@ -1054,6 +1203,9 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
 
+#undef RETURN_INTEGER_SWAP
+#undef RETURN_INTEGER
+
     err_guard.Disable();
 }