koffi 2.16.0-beta.2 → 2.16.0

package/src/koffi/src/{abi/x64_sysv_asm.S → abi_x64_sysv_asm.S}

@@ -146,7 +146,9 @@ SYMBOL(ForwardCallXDD):
 # ----------------------------
 
 .global SYMBOL(RelayCallback)
-.global SYMBOL(CallSwitchStack)
+.global SYMBOL(SwitchAndRelay)
+.global SYMBOL(RelayDirect)
+.global SYMBOL(TrampolineEnd)
 
 # First, make a copy of argument registers.
 # Then call the C function RelayCallback with the following arguments:
@@ -157,6 +159,14 @@ SYMBOL(ForwardCallXDD):
     .cfi_startproc
     .cfi_def_cfa rsp, 8
     ENDBR64
+    movq $\id, %rax
+    jmp RelayTrampoline
+    .cfi_endproc
+.endm
+
+RelayTrampoline:
+    .cfi_startproc
+    .cfi_def_cfa rsp, 8
     subq $152, %rsp
     .cfi_def_cfa rsp, 160
     movq %rdi, 0(%rsp)
@@ -173,10 +183,8 @@ SYMBOL(ForwardCallXDD):
     movsd %xmm5, 88(%rsp)
     movsd %xmm6, 96(%rsp)
     movsd %xmm7, 104(%rsp)
-    movq $\id, %rdi
+    movq %rax, %rdi
     movq %rsp, %rsi
-    leaq 160(%rsp), %rdx
-    leaq 112(%rsp), %rcx
 #if defined(__linux__)
     call *RelayCallback@GOTPCREL(%rip)
 #else
@@ -190,14 +198,13 @@ SYMBOL(ForwardCallXDD):
     .cfi_def_cfa rsp, 8
     ret
     .cfi_endproc
-.endm
 
 # When a callback is relayed, Koffi will call into Node.js and V8 to execute Javascript.
 # The problem is that we're still running on the separate Koffi stack, and V8 will
 # probably misdetect this as a "stack overflow". We have to restore the old
 # stack pointer, call Node.js/V8 and go back to ours.
 # The first three parameters (rdi, rsi, rdx) are passed through untouched.
-SYMBOL(CallSwitchStack):
+SYMBOL(SwitchAndRelay):
     .cfi_startproc
     .cfi_def_cfa rsp, 8
     ENDBR64
@@ -210,7 +217,7 @@ SYMBOL(CallSwitchStack):
     movq %r10, 8(%r8)
     movq %rcx, %rsp
     .cfi_def_cfa rsp, 16
-    call *%r9
+    call SYMBOL(RelayDirect)
     mov %rbp, %rsp
     .cfi_def_cfa rsp, 16
     pop %rbp
@@ -218,7 +225,7 @@ SYMBOL(CallSwitchStack):
     ret
     .cfi_endproc
 
-# Trampolines
-# ----------------------------
+#include "gnu.inc"
 
-#include "../trampolines/gnu.inc"
+SYMBOL(TrampolineEnd):
+    ret

package/src/koffi/src/{abi/x64_win.cc → abi_x64_win.cc}

@@ -4,10 +4,10 @@
 #if defined(_WIN32) && (defined(__x86_64__) || defined(_M_AMD64))
 
 #include "lib/native/base/base.hh"
-#include "../ffi.hh"
-#include "../call.hh"
-#include "../util.hh"
-#include "../win32.hh"
+#include "ffi.hh"
+#include "call.hh"
+#include "util.hh"
+#include "win32.hh"
 
 #include <napi.h>
 
@@ -25,10 +25,6 @@ extern "C" uint64_t ForwardCallXG(const void *func, uint8_t *sp, uint8_t **out_o
 extern "C" float ForwardCallXF(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 extern "C" double ForwardCallXD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 
-extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_value *argv,
-                                      uint8_t *old_sp, Span<uint8_t> *new_stack,
-                                      napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
-
 bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 {
     func->ret.regular = IsRegularSize(func->ret.type->size, 8);
@@ -45,212 +41,154 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 
 bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 {
-    uint64_t *args_ptr = AllocStack<uint64_t>(func->args_size);
+    uint64_t *args_ptr = nullptr;
 
-    if (!args_ptr) [[unlikely]]
+    // Pass return value in register or through memory
+    if (!AllocStack(func->args_size, 16, &args_ptr)) [[unlikely]]
         return false;
     if (!func->ret.regular) {
         return_ptr = AllocHeap(func->ret.type->size, 16);
         *(uint8_t **)(args_ptr++) = 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(CType) \
         do { \
-            const ParameterInfo &param = func->parameters[i]; \
-            Napi::Value value = info[param.offset]; \
-             \
-            CType v; \
-            if (!TryNumber(value, &v)) [[unlikely]] { \
+            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return false; \
             } \
              \
+            CType v = GetNumber<CType>(value); \
             *(args_ptr++) = (uint64_t)v; \
         } while (false)
 #define PUSH_INTEGER_SWAP(CType) \
         do { \
-            const ParameterInfo &param = func->parameters[i]; \
-            Napi::Value value = info[param.offset]; \
-             \
-            CType v; \
-            if (!TryNumber(value, &v)) [[unlikely]] { \
+            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return false; \
             } \
              \
+            CType v = GetNumber<CType>(value); \
             *(args_ptr++) = (uint64_t)ReverseBytes(v); \
         } while (false)
 
-    LOOP {
-        CASE(Void) { K_UNREACHABLE(); };
-
-        CASE(Bool) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
-
-            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;
-            }
-
-            *(bool *)(args_ptr++) = b;
-        };
-
-        CASE(Int8) { PUSH_INTEGER(int8_t); };
-        CASE(UInt8) { PUSH_INTEGER(uint8_t); };
-        CASE(Int16) { PUSH_INTEGER(int16_t); };
-        CASE(Int16S) { PUSH_INTEGER_SWAP(int16_t); };
-        CASE(UInt16) { PUSH_INTEGER(uint16_t); };
-        CASE(UInt16S) { PUSH_INTEGER_SWAP(uint16_t); };
-        CASE(Int32) { PUSH_INTEGER(int32_t); };
-        CASE(Int32S) { PUSH_INTEGER_SWAP(int32_t); };
-        CASE(UInt32) { PUSH_INTEGER(uint32_t); };
-        CASE(UInt32S) { PUSH_INTEGER_SWAP(uint32_t); };
-        CASE(Int64) { PUSH_INTEGER(int64_t); };
-        CASE(Int64S) { PUSH_INTEGER_SWAP(int64_t); };
-        CASE(UInt64) { PUSH_INTEGER(uint64_t); };
-        CASE(UInt64S) { PUSH_INTEGER_SWAP(uint64_t); };
-
-        CASE(String) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
-
-            const char *str;
-            if (!PushString(value, param.directions, &str)) [[unlikely]]
-                return false;
-
-            *(const char **)(args_ptr++) = str;
-        };
-        CASE(String16) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
-
-            const char16_t *str16;
-            if (!PushString16(value, param.directions, &str16)) [[unlikely]]
-                return false;
-
-            *(const char16_t **)(args_ptr++) = str16;
-        };
-        CASE(String32) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
-
-            const char32_t *str32;
-            if (!PushString32(value, param.directions, &str32)) [[unlikely]]
-                return 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);
 
-            *(const char32_t **)(args_ptr++) = str32;
-        };
+        Napi::Value value = info[param.offset];
 
-        CASE(Pointer) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+        switch (param.type->primitive) {
+            case PrimitiveKind::Void: { K_UNREACHABLE(); } break;
 
-            void *ptr;
-            if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
-                return false;
+            case PrimitiveKind::Bool: {
+                if (!value.IsBoolean()) [[unlikely]] {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
+                    return false;
+                }
 
-            *(void **)(args_ptr++) = ptr;
-        };
+                bool b = value.As<Napi::Boolean>();
 
-        CASE(Record) OR(Union) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+                *(bool *)(args_ptr++) = b;
+            } 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 (!PushString(value, param.directions, &str)) [[unlikely]]
+                    return false;
 
-            if (!IsObject(value)) [[unlikely]] {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
-                return false;
-            }
+                *(const char **)(args_ptr++) = str;
+            } break;
+            case PrimitiveKind::String16: {
+                const char16_t *str16;
+                if (!PushString16(value, param.directions, &str16)) [[unlikely]]
+                    return false;
 
-            uint8_t *ptr;
-            if (param.regular) {
-                ptr = (uint8_t *)(args_ptr++);
-            } else {
-                ptr = AllocHeap(param.type->size, 16);
-                *(uint8_t **)(args_ptr++) = ptr;
-            }
+                *(const char16_t **)(args_ptr++) = str16;
+            } break;
+            case PrimitiveKind::String32: {
+                const char32_t *str32;
+                if (!PushString32(value, param.directions, &str32)) [[unlikely]]
+                    return false;
 
-            Napi::Object obj = value.As<Napi::Object>();
-            if (!PushObject(obj, param.type, ptr))
-                return false;
-        };
-        CASE(Array) { K_UNREACHABLE(); };
+                *(const char32_t **)(args_ptr++) = str32;
+            } break;
+            case PrimitiveKind::Pointer: {
+                void *ptr;
+                if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
+                    return false;
 
-        CASE(Float32) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+                *(void **)(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;
+                }
 
-            float f;
-            if (!TryNumber(value, &f)) [[unlikely]] {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                return false;
-            }
+                uint8_t *ptr;
+                if (param.regular) {
+                    ptr = (uint8_t *)(args_ptr++);
+                } else {
+                    ptr = AllocHeap(param.type->size, 16);
+                    *(uint8_t **)(args_ptr++) = ptr;
+                }
 
-            memset((uint8_t *)args_ptr + 4, 0, 4);
-            *(float *)(args_ptr++) = f;
-        };
-        CASE(Float64) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+                Napi::Object obj = value.As<Napi::Object>();
+                if (!PushObject(obj, param.type, ptr))
+                    return false;
+            } 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;
+                }
 
-            double d;
-            if (!TryNumber(value, &d)) [[unlikely]] {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                return false;
-            }
+                float f = GetNumber<float>(value);
 
-            *(double *)(args_ptr++) = d;
-        };
-        CASE(Callback) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+                memset((uint8_t *)args_ptr + 4, 0, 4);
+                *(float *)(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;
+                }
 
-            void *ptr;
-            if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
-                return false;
+                double d = GetNumber<double>(value);
+                *(double *)(args_ptr++) = d;
+            } break;
+            case PrimitiveKind::Callback: {
+                void *ptr;
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
+                    return false;
 
-            *(void **)(args_ptr++) = ptr;
-        };
+                *(void **)(args_ptr++) = ptr;
+            } break;
 
-        CASE(Prototype) { /* End loop */ };
+            case PrimitiveKind::Prototype: { K_UNREACHABLE(); } break;
+        }
     }
 
 #undef PUSH_INTEGER_SWAP
 #undef PUSH_INTEGER
 
-#undef OR
-#undef CASE
-#undef LOOP
-
     new_sp = mem->stack.end();
 
     return true;
@@ -358,8 +296,17 @@ 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: 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::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::Record:
         case PrimitiveKind::Union: {
             const uint8_t *ptr = return_ptr ? (const uint8_t *)return_ptr
@@ -378,8 +325,12 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     K_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *sp)
 {
+    uint8_t *own_sp = sp;
+    uint8_t *caller_sp = sp + 128;
+    BackRegisters *out_reg = (BackRegisters *)(sp + 64);
+
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
@@ -567,23 +518,19 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
                 Napi::Value arg = str32 ? MakeStringFromUTF32(env, str32) : env.Null();
                 arguments.Append(arg);
             } break;
-            case PrimitiveKind::Pointer: {
+            case PrimitiveKind::Pointer:
+            case PrimitiveKind::Callback: {
                 void *ptr2 = *(void **)(j < 4 ? gpr_ptr + j : args_ptr);
                 args_ptr += (j >= 4);
 
-                Napi::Value p = ptr2 ? WrapPointer(env, param.type->ref.type, ptr2) : env.Null();
-                arguments.Append(p);
+                if (ptr2) {
+                    Napi::External<void> external = Napi::External<void>::New(env, ptr2);
+                    SetValueTag(external, param.type->ref.marker);
 
-                if (param.type->dispose) {
-                    param.type->dispose(env, param.type, ptr2);
+                    arguments.Append(external);
+                } else {
+                    arguments.Append(env.Null());
                 }
-            } break;
-            case PrimitiveKind::Callback: {
-                void *ptr2 = *(void **)(j < 4 ? gpr_ptr + j : args_ptr);
-                args_ptr += (j >= 4);
-
-                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);
@@ -624,49 +571,42 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
 
     const TypeInfo *type = proto->ret.type;
 
-    // Make the call
-    napi_value ret;
-    if (switch_stack) {
-        ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
-                              [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
-    } else {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    }
-    Napi::Value value(env, ret);
+    // Make the call!
+    Napi::Value value = func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
 
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
 #define RETURN_INTEGER(CType) \
         do { \
-            CType v; \
-            if (!TryNumber(value, &v)) [[unlikely]] { \
+            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
+            CType v = GetNumber<CType>(value); \
             out_reg->rax = (uint64_t)v; \
         } while (false)
 #define RETURN_INTEGER_SWAP(CType) \
         do { \
-            CType v; \
-            if (!TryNumber(value, &v)) [[unlikely]] { \
+            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
+            CType v = GetNumber<CType>(value); \
             out_reg->rax = (uint64_t)ReverseBytes(v); \
         } while (false)
 
     switch (type->primitive) {
         case PrimitiveKind::Void: {} break;
         case PrimitiveKind::Bool: {
-            bool b;
-            if (napi_get_value_bool(env, value, &b) != napi_ok) [[unlikely]] {
+            if (!value.IsBoolean()) [[unlikely]] {
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
                 return;
             }
 
+            bool b = value.As<Napi::Boolean>();
             out_reg->rax = (uint64_t)b;
         } break;
         case PrimitiveKind::Int8: { RETURN_INTEGER(int8_t); } break;
@@ -705,9 +645,24 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
             out_reg->rax = (uint64_t)str32;
         } break;
         case PrimitiveKind::Pointer: {
-            void *ptr;
-            if (!PushPointer(value, type, 1, &ptr)) [[unlikely]]
+            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);
                 return;
+            }
 
             out_reg->rax = (uint64_t)ptr;
         } break;
@@ -730,28 +685,42 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
         } break;
         case PrimitiveKind::Array: { K_UNREACHABLE(); } break;
         case PrimitiveKind::Float32: {
-            float f;
-            if (!TryNumber(value, &f)) [[unlikely]] {
+            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                 return;
             }
 
+            float f = GetNumber<float>(value);
+
             memset((uint8_t *)&out_reg->xmm0 + 4, 0, 4);
             memcpy(&out_reg->xmm0, &f, 4);
         } break;
         case PrimitiveKind::Float64: {
-            double d;
-            if (!TryNumber(value, &d)) [[unlikely]] {
+            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
                 ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
                 return;
             }
 
+            double d = GetNumber<double>(value);
             out_reg->xmm0 = d;
         } break;
         case PrimitiveKind::Callback: {
             void *ptr;
-            if (!PushCallback(value, type, &ptr)) [[unlikely]]
+
+            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);
                 return;
+            }
 
             out_reg->rax = (uint64_t)ptr;
         } break;