koffi 2.15.1 → 2.16.0-beta.1

package/src/koffi/src/abi_x86.cc

@@ -22,7 +22,7 @@ struct BackRegisters {
         double d;
         float f;
     } x87;
-    bool x87_double;
+    int ret_type;
     int ret_pop;
 };
 
@@ -37,8 +37,6 @@ extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_va
                                       uint8_t *old_sp, Span<uint8_t> *new_stack,
                                       napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
 
-#include "trampolines/prototypes.inc"
-
 bool AnalyseFunction(Napi::Env env, InstanceData *instance, FunctionInfo *func)
 {
     if (!func->lib && func->convention != CallConvention::Cdecl &&
@@ -113,11 +111,10 @@ bool AnalyseFunction(Napi::Env env, InstanceData *instance, FunctionInfo *func)
 
 bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 {
-    uint32_t *args_ptr = nullptr;
+    uint32_t *args_ptr = AllocStack<uint32_t>(func->args_size);
     uint32_t *fast_ptr = nullptr;
 
-    // Pass return value in register or through memory
-    if (!AllocStack(func->args_size, 16, &args_ptr)) [[unlikely]]
+    if (!args_ptr) [[unlikely]]
         return false;
     if (func->fast) {
         fast_ptr = args_ptr;
@@ -128,162 +125,224 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
         *((func->ret.fast ? fast_ptr : args_ptr)++) = (uint32_t)return_ptr;
     }
 
+    Size i = -1;
+
+#if defined(__GNUC__) || defined(__clang__)
+    static const void *const DispatchTable[] = {
+        #define PRIMITIVE(Name) && Name,
+        #include "primitives.inc"
+    };
+
+    #define LOOP
+    #define CASE(Primitive) \
+        do { \
+            PrimitiveKind next = func->primitives[++i]; \
+            goto *DispatchTable[(int)next]; \
+        } while (false); \
+        Primitive:
+    #define OR(Primitive) \
+        Primitive:
+#else
+    #define LOOP \
+        while (++i < func->parameters.len) \
+            switch (func->primitives[i])
+    #define CASE(Primitive) \
+        break; \
+        case PrimitiveKind::Primitive:
+    #define OR(Primitive) \
+        case PrimitiveKind::Primitive:
+#endif
+
 #define PUSH_INTEGER_32(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            const ParameterInfo &param = func->parameters[i]; \
+            Napi::Value value = info[param.offset]; \
+             \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return false; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
             *((param.fast ? fast_ptr : args_ptr)++) = (uint32_t)v; \
         } while (false)
 #define PUSH_INTEGER_32_SWAP(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            const ParameterInfo &param = func->parameters[i]; \
+            Napi::Value value = info[param.offset]; \
+             \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return false; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
             *((param.fast ? fast_ptr : args_ptr)++) = (uint32_t)ReverseBytes(v); \
         } while (false)
 #define PUSH_INTEGER_64(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            const ParameterInfo &param = func->parameters[i]; \
+            Napi::Value value = info[param.offset]; \
+             \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return false; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
-             \
             *(uint64_t *)args_ptr = (uint64_t)v; \
             args_ptr += 2; \
         } while (false)
 #define PUSH_INTEGER_64_SWAP(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            const ParameterInfo &param = func->parameters[i]; \
+            Napi::Value value = info[param.offset]; \
+             \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return false; \
             } \
              \
-            CType v = GetNumber<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];
-        K_ASSERT(param.directions >= 1 && param.directions <= 3);
+    LOOP {
+        CASE(Void) { K_UNREACHABLE(); };
 
-        Napi::Value value = info[param.offset];
+        CASE(Bool) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-        switch (param.type->primitive) {
-            case PrimitiveKind::Void: { K_UNREACHABLE(); } break;
+            bool b;
+            if (napi_get_value_bool(env, value, &b) != napi_ok) [[unlikely]] {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
+                return false;
+            }
 
-            case PrimitiveKind::Bool: {
-                if (!value.IsBoolean()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
-                    return false;
-                }
+            *(bool *)((param.fast ? fast_ptr : args_ptr)++) = b;
+        };
+
+        CASE(Int8) { PUSH_INTEGER_32(int8_t); };
+        CASE(UInt8) { PUSH_INTEGER_32(uint8_t); };
+        CASE(Int16) { PUSH_INTEGER_32(int16_t); };
+        CASE(Int16S) { PUSH_INTEGER_32_SWAP(int16_t); };
+        CASE(UInt16) { PUSH_INTEGER_32(uint16_t); };
+        CASE(UInt16S) { PUSH_INTEGER_32_SWAP(uint16_t); };
+        CASE(Int32) { PUSH_INTEGER_32(int32_t); };
+        CASE(Int32S) { PUSH_INTEGER_32_SWAP(int32_t); };
+        CASE(UInt32) { PUSH_INTEGER_32(uint32_t); };
+        CASE(UInt32S) { PUSH_INTEGER_32_SWAP(uint32_t); };
+        CASE(Int64) { PUSH_INTEGER_64(int64_t); };
+        CASE(Int64S) { PUSH_INTEGER_64_SWAP(int64_t); };
+        CASE(UInt64) { PUSH_INTEGER_64(uint64_t); };
+        CASE(UInt64S) { PUSH_INTEGER_64_SWAP(uint64_t); };
+
+        CASE(String) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-                bool b = value.As<Napi::Boolean>();
-                *(bool *)((param.fast ? fast_ptr : args_ptr)++) = b;
-            } 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 (!PushString(value, param.directions, &str)) [[unlikely]]
-                    return false;
+            const char *str;
+            if (!PushString(value, param.directions, &str)) [[unlikely]]
+                return false;
 
-                *(const char **)((param.fast ? fast_ptr : args_ptr)++) = str;
-            } break;
-            case PrimitiveKind::String16: {
-                const char16_t *str16;
-                if (!PushString16(value, param.directions, &str16)) [[unlikely]]
-                    return false;
+            *(const char **)((param.fast ? fast_ptr : args_ptr)++) = str;
+        };
+        CASE(String16) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-                *(const char16_t **)((param.fast ? fast_ptr : args_ptr)++) = str16;
-            } break;
-            case PrimitiveKind::String32: {
-                const char32_t *str32;
-                if (!PushString32(value, param.directions, &str32)) [[unlikely]]
-                    return false;
+            const char16_t *str16;
+            if (!PushString16(value, param.directions, &str16)) [[unlikely]]
+                return false;
 
-                *(const char32_t **)((param.fast ? fast_ptr : args_ptr)++) = str32;
-            } break;
-            case PrimitiveKind::Pointer: {
-                void *ptr;
-                if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
-                    return false;
+            *(const char16_t **)((param.fast ? fast_ptr : args_ptr)++) = str16;
+        };
+        CASE(String32) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-                *(void **)((param.fast ? fast_ptr : args_ptr)++) = ptr;
-            } break;
-            case PrimitiveKind::Record:
-            case PrimitiveKind::Union: {
-                if (!IsObject(value)) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
-                    return false;
-                }
+            const char32_t *str32;
+            if (!PushString32(value, param.directions, &str32)) [[unlikely]]
+                return false;
 
-                Napi::Object obj = value.As<Napi::Object>();
-
-                if (param.fast) {
-                    uint8_t *ptr = (uint8_t *)(fast_ptr++);
-                    if (!PushObject(obj, param.type, ptr))
-                        return false;
-                } else {
-                    uint8_t *ptr = (uint8_t *)args_ptr;
-                    if (!PushObject(obj, param.type, ptr))
-                        return false;
-                    args_ptr = (uint32_t *)AlignUp(ptr + param.type->size, 4);
-                }
-            } break;
-            case PrimitiveKind::Array: { K_UNREACHABLE(); } break;
-            case PrimitiveKind::Float32: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
+            *(const char32_t **)((param.fast ? fast_ptr : args_ptr)++) = str32;
+        };
 
-                float f = GetNumber<float>(value);
-                *(float *)((param.fast ? fast_ptr : args_ptr)++) = f;
-            } break;
-            case PrimitiveKind::Float64: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
+        CASE(Pointer) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-                double d = GetNumber<double>(value);
-                *(double *)args_ptr = d;
-                args_ptr += 2;
-            } break;
-            case PrimitiveKind::Callback: {
-                void *ptr;
-                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
+            void *ptr;
+            if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
+                return false;
+
+            *(void **)((param.fast ? fast_ptr : args_ptr)++) = ptr;
+        };
+
+        CASE(Record) OR(Union) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
+
+            if (!IsObject(value)) [[unlikely]] {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
+                return false;
+            }
+
+            Napi::Object obj = value.As<Napi::Object>();
+
+            if (param.fast) {
+                uint8_t *ptr = (uint8_t *)(fast_ptr++);
+                if (!PushObject(obj, param.type, ptr))
                     return false;
+            } else {
+                uint8_t *ptr = (uint8_t *)args_ptr;
+                if (!PushObject(obj, param.type, ptr))
+                    return false;
+                args_ptr = (uint32_t *)AlignUp(ptr + param.type->size, 4);
+            }
+        };
+        CASE(Array) { K_UNREACHABLE(); };
 
-                *(void **)((param.fast ? fast_ptr : args_ptr)++) = ptr;
-            } break;
+        CASE(Float32) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-            case PrimitiveKind::Prototype: { K_UNREACHABLE(); } break;
-        }
+            float f;
+            if (!TryNumber(value, &f)) [[unlikely]] {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
+                return false;
+            }
+
+            *(float *)((param.fast ? fast_ptr : args_ptr)++) = f;
+        };
+        CASE(Float64) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
+
+            double d;
+            if (!TryNumber(value, &d)) [[unlikely]] {
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
+                return false;
+            }
+
+            *(double *)args_ptr = d;
+            args_ptr += 2;
+        };
+
+        CASE(Callback) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
+
+            void *ptr;
+            if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
+                return false;
+
+            *(void **)((param.fast ? fast_ptr : args_ptr)++) = ptr;
+        };
+
+        CASE(Prototype) { /* End loop */ };
     }
 
 #undef PUSH_INTEGER_64_SWAP
@@ -291,6 +350,10 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 #undef PUSH_INTEGER_32_SWAP
 #undef PUSH_INTEGER_32
 
+#undef OR
+#undef CASE
+#undef LOOP
+
     new_sp = mem->stack.end();
 
     return true;
@@ -416,17 +479,8 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
         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::String32: return result.ptr ? MakeStringFromUTF32(env, (const char32_t *)result.ptr) : env.Null();
-        case PrimitiveKind::Pointer:
-        case PrimitiveKind::Callback: {
-            if (result.ptr) {
-                Napi::External<void> external = Napi::External<void>::New(env, result.ptr);
-                SetValueTag(external, func->ret.type->ref.marker);
-
-                return external;
-            } else {
-                return env.Null();
-            }
-        } break;
+        case PrimitiveKind::Pointer: return result.ptr ? WrapPointer(env, func->ret.type->ref.type, result.ptr) : env.Null();
+        case PrimitiveKind::Callback: return result.ptr ? WrapCallback(env, func->ret.type->ref.type, result.ptr) : env.Null();
         case PrimitiveKind::Record:
         case PrimitiveKind::Union: {
             const uint8_t *ptr = return_ptr ? (const uint8_t *)return_ptr
@@ -491,7 +545,7 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
     K_DEFER_N(err_guard) {
         int pop = out_reg->ret_pop;
         memset(out_reg, 0, K_SIZE(*out_reg));
-        out_reg->x87_double = true;
+        out_reg->ret_type = 0;
         out_reg->ret_pop = pop;
     };
 
@@ -636,18 +690,21 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
                 Napi::Value arg = str32 ? MakeStringFromUTF32(env, str32) : env.Null();
                 arguments.Append(arg);
             } break;
-            case PrimitiveKind::Pointer:
-            case PrimitiveKind::Callback: {
+            case PrimitiveKind::Pointer: {
                 void *ptr2 = *(void **)(args_ptr++);
 
-                if (ptr2) {
-                    Napi::External<void> external = Napi::External<void>::New(env, ptr2);
-                    SetValueTag(external, param.type->ref.marker);
+                Napi::Value p = ptr2 ? WrapPointer(env, param.type->ref.type, ptr2) : env.Null();
+                arguments.Append(p);
 
-                    arguments.Append(external);
-                } else {
-                    arguments.Append(env.Null());
+                if (param.type->dispose) {
+                    param.type->dispose(env, param.type, ptr2);
                 }
+            } break;
+            case PrimitiveKind::Callback: {
+                void *ptr2 = *(void **)(args_ptr++);
+
+                Napi::Value p = ptr2 ? WrapCallback(env, param.type->ref.type, ptr2) : env.Null();
+                arguments.Append(p);
 
                 if (param.type->dispose) {
                     param.type->dispose(env, param.type, ptr2);
@@ -700,59 +757,62 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
 
 #define RETURN_INTEGER_32(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
             out_reg->eax = (uint32_t)v; \
+            out_reg->ret_type = 0; \
         } while (false)
 #define RETURN_INTEGER_32_SWAP(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
             out_reg->eax = (uint32_t)ReverseBytes(v); \
+            out_reg->ret_type = 0; \
         } while (false)
 #define RETURN_INTEGER_64(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
-             \
             out_reg->eax = (uint32_t)((uint64_t)v >> 32); \
             out_reg->edx = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
+            out_reg->ret_type = 0; \
         } while (false)
 #define RETURN_INTEGER_64_SWAP(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = ReverseBytes(GetNumber<CType>(value)); \
-             \
             out_reg->eax = (uint32_t)((uint64_t)v >> 32); \
             out_reg->edx = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
+            out_reg->ret_type = 0; \
         } while (false)
 
     switch (type->primitive) {
-        case PrimitiveKind::Void: {} break;
+        case PrimitiveKind::Void: { out_reg->ret_type = 0; } break;
         case PrimitiveKind::Bool: {
-            if (!value.IsBoolean()) [[unlikely]] {
+            bool b;
+            if (napi_get_value_bool(env, value, &b) != napi_ok) [[unlikely]] {
                 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;
+            out_reg->ret_type = 0;
         } break;
         case PrimitiveKind::Int8: { RETURN_INTEGER_32(int8_t); } break;
         case PrimitiveKind::UInt8: { RETURN_INTEGER_32(uint8_t); } break;
@@ -774,6 +834,7 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
                 return;
 
             out_reg->eax = (uint32_t)str;
+            out_reg->ret_type = 0;
         } break;
         case PrimitiveKind::String16: {
             const char16_t *str16;
@@ -781,6 +842,7 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
                 return;
 
             out_reg->eax = (uint32_t)str16;
+            out_reg->ret_type = 0;
         } break;
         case PrimitiveKind::String32: {
             const char32_t *str32;
@@ -788,28 +850,15 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
                 return;
 
             out_reg->eax = (uint32_t)str32;
+            out_reg->ret_type = 0;
         } break;
         case PrimitiveKind::Pointer: {
-            uint8_t *ptr;
-
-            if (CheckValueTag(value, type->ref.marker)) {
-                ptr = value.As<Napi::External<uint8_t>>().Data();
-            } else if (IsObject(value) && (type->ref.type->primitive == PrimitiveKind::Record ||
-                                           type->ref.type->primitive == PrimitiveKind::Union)) {
-                Napi::Object obj = value.As<Napi::Object>();
-
-                ptr = AllocHeap(type->ref.type->size, 16);
-
-                if (!PushObject(obj, type->ref.type, ptr))
-                    return;
-            } else if (IsNullOrUndefined(value)) {
-                ptr = nullptr;
-            } else {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);
+            void *ptr;
+            if (!PushPointer(value, type, 1, &ptr)) [[unlikely]]
                 return;
-            }
 
             out_reg->eax = (uint32_t)ptr;
+            out_reg->ret_type = 0;
         } break;
         case PrimitiveKind::Record:
         case PrimitiveKind::Union: {
@@ -827,45 +876,37 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
             } else {
                 PushObject(obj, type, (uint8_t *)&out_reg->eax);
             }
+
+            out_reg->ret_type = 0;
         } break;
         case PrimitiveKind::Array: { K_UNREACHABLE(); } break;
         case PrimitiveKind::Float32: {
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
+            float f;
+            if (!TryNumber(value, &f)) [[unlikely]] {
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                 return;
             }
 
-            out_reg->x87.f = GetNumber<float>(value);
-            out_reg->x87_double = false;
+            out_reg->x87.f = f;
+            out_reg->ret_type = 1;
         } break;
         case PrimitiveKind::Float64: {
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
+            double d;
+            if (!TryNumber(value, &d)) [[unlikely]] {
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                 return;
             }
 
-            out_reg->x87.d = GetNumber<double>(value);
-            out_reg->x87_double = true;
+            out_reg->x87.d = d;
+            out_reg->ret_type = 2;
         } break;
         case PrimitiveKind::Callback: {
             void *ptr;
-
-            if (value.IsFunction()) {
-                Napi::Function func2 = value.As<Napi::Function>();
-
-                ptr = ReserveTrampoline(type->ref.proto, func2);
-                if (!ptr) [[unlikely]]
-                    return;
-            } else if (CheckValueTag(value, type->ref.marker)) {
-                ptr = value.As<Napi::External<void>>().Data();
-            } else if (IsNullOrUndefined(value)) {
-                ptr = nullptr;
-            } else {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);
+            if (!PushCallback(value, type, &ptr)) [[unlikely]]
                 return;
-            }
 
             out_reg->eax = (uint32_t)ptr;
+            out_reg->ret_type = 0;
         } break;
 
         case PrimitiveKind::Prototype: { K_UNREACHABLE(); } break;
@@ -879,12 +920,6 @@ void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool switch_stack,
     err_guard.Disable();
 }
 
-void *GetTrampoline(int16_t idx, const FunctionInfo *proto)
-{
-    bool x87 = IsFloat(proto->ret.type);
-    return Trampolines[idx][x87];
-}
-
 }
 
 #endif

package/src/koffi/src/abi_x86_asm.S

@@ -90,6 +90,7 @@ ForwardCallRD:
 # Depending on ABI, call convention and return value size, we need to issue ret <something>. Since ret
 # only takes an immediate value, and I prefer not to branch, the return address is moved instead according
 # to BackRegisters::ret_pop before ret is issued.
+# We need to branch at the end to avoid x87 stack imbalance.
 .macro trampoline id
     .cfi_startproc
     .cfi_def_cfa esp, 4
@@ -108,36 +109,16 @@ ForwardCallRD:
     movl 44(%esp), %edx
     movl 36(%esp), %ecx
     movl %edx, 44(%esp, %ecx)
+    cmpl $1, 32(%esp)
+    je 1f
+    cmpl $2, 32(%esp)
+    je 2f
+0:
     movl 16(%esp), %eax
     movl 20(%esp), %edx
     leal 44(%esp, %ecx), %esp
     .cfi_def_cfa esp, 4
     ret
-    .cfi_endproc
-.endm
-
-# This version also loads the x87 stack with the result, if need be.
-# We have to branch to avoid x87 stack imbalance.
-.macro trampoline_vec id
-    .cfi_startproc
-    .cfi_def_cfa esp, 4
-    ENDBR32
-    sub $44, %esp
-    .cfi_def_cfa esp, 48
-    movl $\id, 0(%esp)
-    movl %esp, 4(%esp)
-    leal 48(%esp), %eax
-    movl %eax, 8(%esp)
-    leal 16(%esp), %eax
-    movl %eax, 12(%esp)
-    call GetEIP
-    addl $_GLOBAL_OFFSET_TABLE_, %ecx
-    call *RelayCallback@GOT(%ecx)
-    movl 44(%esp), %edx
-    movl 36(%esp), %ecx
-    movl %edx, 44(%esp, %ecx, 4)
-    cmpb $0, 32(%esp)
-    jne 2f
 1:
     flds 24(%esp)
     leal 44(%esp, %ecx), %esp