koffi 2.1.0-beta.1 → 2.1.0

package/src/abi_x86.cc

@@ -197,6 +197,51 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         *((func->ret.fast ? fast_ptr : args_ptr)++) = (uint32_t)return_ptr;
     }
 
+#define PUSH_INTEGER_32(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.fast ? fast_ptr : args_ptr)++) = (uint32_t)v; \
+        } while (false)
+#define PUSH_INTEGER_32_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.fast ? fast_ptr : args_ptr)++) = (uint32_t)ReverseBytes(v); \
+        } while (false)
+#define PUSH_INTEGER_64(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); \
+             \
+            *(uint64_t *)args_ptr = (uint64_t)v; \
+            args_ptr += 2; \
+        } while (false)
+#define PUSH_INTEGER_64_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); \
+             \
+            *(uint64_t *)args_ptr = (uint64_t)ReverseBytes(v); \
+            args_ptr += 2; \
+        } while (false)
+
     // Push arguments
     for (Size i = 0; i < func->parameters.len; i++) {
         const ParameterInfo &param = func->parameters[i];
@@ -209,95 +254,51 @@ 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;
                 }
 
                 bool b = value.As<Napi::Boolean>();
                 *(bool *)((param.fast ? fast_ptr : args_ptr)++) = b;
             } break;
-            case PrimitiveKind::Int8:
-            case PrimitiveKind::UInt8:
-            case PrimitiveKind::Int16:
-            case PrimitiveKind::UInt16:
-            case PrimitiveKind::Int32: {
-                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)++) = 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);
-                    return false;
-                }
-
-                uint32_t v = CopyNumber<uint32_t>(value);
-                *((param.fast ? fast_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);
-                    return false;
-                }
-
-                int64_t v = CopyNumber<int64_t>(value);
-                *(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);
-                    return false;
-                }
-
-                uint64_t v = CopyNumber<uint64_t>(value);
-                *(uint64_t *)args_ptr = v;
-                args_ptr += 2;
-            } break;
+            case PrimitiveKind::Int8: { PUSH_INTEGER_32(int8_t); } break;
+            case PrimitiveKind::UInt8: { PUSH_INTEGER_32(uint8_t); } break;
+            case PrimitiveKind::Int16: { PUSH_INTEGER_32(int16_t); } break;
+            case PrimitiveKind::Int16S: { PUSH_INTEGER_32_SWAP(int16_t); } break;
+            case PrimitiveKind::UInt16: { PUSH_INTEGER_32(uint16_t); } break;
+            case PrimitiveKind::UInt16S: { PUSH_INTEGER_32_SWAP(uint16_t); } break;
+            case PrimitiveKind::Int32: { PUSH_INTEGER_32(int32_t); } break;
+            case PrimitiveKind::Int32S: { PUSH_INTEGER_32_SWAP(int32_t); } break;
+            case PrimitiveKind::UInt32: { PUSH_INTEGER_32(uint32_t); } break;
+            case PrimitiveKind::UInt32S: { PUSH_INTEGER_32_SWAP(uint32_t); } break;
+            case PrimitiveKind::Int64: { PUSH_INTEGER_64(int64_t); } break;
+            case PrimitiveKind::Int64S: { PUSH_INTEGER_64_SWAP(int64_t); } break;
+            case PrimitiveKind::UInt64: { PUSH_INTEGER_64(uint64_t); } break;
+            case PrimitiveKind::UInt64S: { PUSH_INTEGER_64_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;
-                }
 
                 *(const char **)((param.fast ? fast_ptr : args_ptr)++) = str;
             } 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;
-                }
 
                 *(const char16_t **)((param.fast ? fast_ptr : args_ptr)++) = str16;
             } 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;
 
                 *(void **)((param.fast ? fast_ptr : args_ptr)++) = ptr;
             } 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;
                 }
 
@@ -317,7 +318,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;
                 }
 
@@ -326,7 +327,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;
                 }
 
@@ -348,7 +349,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;
                 }
 
@@ -359,6 +360,11 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+#undef PUSH_INTEGER_64_SWAP
+#undef PUSH_INTEGER_64
+#undef PUSH_INTEGER_32_SWAP
+#undef PUSH_INTEGER_32
+
     new_sp = mem->stack.end();
 
     return true;
@@ -382,11 +388,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 +430,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 +542,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 +595,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 +609,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++);
 
@@ -632,69 +692,87 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
     if (RG_UNLIKELY(env.IsExceptionPending()))
         return;
 
+#define RETURN_INTEGER_32(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->eax = (uint32_t)v; \
+        } while (false)
+#define RETURN_INTEGER_32_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->eax = (uint32_t)ReverseBytes(v); \
+        } while (false)
+#define RETURN_INTEGER_64(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->eax = (uint32_t)((uint64_t)v >> 32); \
+            out_reg->edx = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
+        } while (false)
+#define RETURN_INTEGER_64_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 = ReverseBytes(CopyNumber<CType>(value)); \
+             \
+            out_reg->eax = (uint32_t)((uint64_t)v >> 32); \
+            out_reg->edx = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
+        } while (false)
+
     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->eax = (uint32_t)b;
         } break;
-        case PrimitiveKind::Int8:
-        case PrimitiveKind::UInt8:
-        case PrimitiveKind::Int16:
-        case PrimitiveKind::UInt16:
-        case PrimitiveKind::Int32:
-        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;
-            }
-
-            int32_t v = CopyNumber<int32_t>(value);
-            out_reg->eax = (uint32_t)v;
-        } break;
-        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->eax = (uint32_t)(v & 0xFFFFFFFFul);
-            out_reg->edx = (uint32_t)(v << 32);
-        } break;
+        case PrimitiveKind::Int8: { RETURN_INTEGER_32(int8_t); } break;
+        case PrimitiveKind::UInt8: { RETURN_INTEGER_32(uint8_t); } break;
+        case PrimitiveKind::Int16: { RETURN_INTEGER_32(int16_t); } break;
+        case PrimitiveKind::Int16S: { RETURN_INTEGER_32_SWAP(int16_t); } break;
+        case PrimitiveKind::UInt16: { RETURN_INTEGER_32(uint16_t); } break;
+        case PrimitiveKind::UInt16S: { RETURN_INTEGER_32_SWAP(uint16_t); } break;
+        case PrimitiveKind::Int32: { RETURN_INTEGER_32(int32_t); } break;
+        case PrimitiveKind::Int32S: { RETURN_INTEGER_32_SWAP(int32_t); } break;
+        case PrimitiveKind::UInt32: { RETURN_INTEGER_32(uint32_t); } break;
+        case PrimitiveKind::UInt32S: { RETURN_INTEGER_32_SWAP(uint32_t); } break;
+        case PrimitiveKind::Int64: { RETURN_INTEGER_64(int64_t); } break;
+        case PrimitiveKind::Int64S: { RETURN_INTEGER_64_SWAP(int64_t); } break;
+        case PrimitiveKind::UInt64: { RETURN_INTEGER_64(uint64_t); } break;
+        case PrimitiveKind::UInt64S: { RETURN_INTEGER_64_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->eax = (uint32_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->eax = (uint32_t)str16;
         } break;
@@ -713,7 +791,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;
             }
 
@@ -721,7 +799,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;
             }
 
@@ -738,7 +816,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;
             }
 
@@ -747,7 +825,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;
             }
 
@@ -768,7 +846,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;
             }
 
@@ -778,6 +856,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
 
+#undef RETURN_INTEGER_64_SWAP
+#undef RETURN_INTEGER_64
+#undef RETURN_INTEGER_32_SWAP
+#undef RETURN_INTEGER_32
+
     err_guard.Disable();
 }