koffi 2.16.0-beta.2 → 2.16.1

package/src/koffi/src/{abi/arm64.cc → abi_arm64.cc}

@@ -4,11 +4,11 @@
 #if defined(__aarch64__) || defined(_M_ARM64)
 
 #include "lib/native/base/base.hh"
-#include "../ffi.hh"
-#include "../call.hh"
-#include "../util.hh"
+#include "ffi.hh"
+#include "call.hh"
+#include "util.hh"
 #if defined(_WIN32)
-    #include "../win32.hh"
+    #include "win32.hh"
 #endif
 
 #include <napi.h>
@@ -48,9 +48,10 @@ extern "C" X0X1Ret ForwardCallXGG(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" HfaRet ForwardCallXDDDD(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));
+extern "C" uint8_t Trampoline0;
+extern "C" uint8_t TrampolineEnd;
+extern "C" void *FindTrampolineStart();
+extern "C" void *FindTrampolineEnd();
 
 static HfaInfo IsHFA(const TypeInfo *type)
 {
@@ -247,45 +248,22 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 
 bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 {
-    uint64_t *gpr_ptr = AllocStack<uint64_t>(17 * 8 + func->args_size);
-    uint64_t *vec_ptr = gpr_ptr + 9;
-    uint64_t *args_ptr = gpr_ptr + 17;
+    uint64_t *args_ptr = nullptr;
+    uint64_t *gpr_ptr = nullptr;
+    uint64_t *vec_ptr = nullptr;
 
-    if (!gpr_ptr) [[unlikely]]
+    // Return through registers unless it's too big
+    if (!AllocStack(func->args_size, 16, &args_ptr)) [[unlikely]]
+        return false;
+    if (!AllocStack(8 * 8, 8, &vec_ptr)) [[unlikely]]
+        return false;
+    if (!AllocStack(9 * 8, 8, &gpr_ptr)) [[unlikely]]
         return false;
     if (func->ret.use_memory) {
         return_ptr = AllocHeap(func->ret.type->size, 16);
         gpr_ptr[8] = (uint64_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
-
 #if defined(_M_ARM64EC)
     if (func->variadic) {
         gpr_ptr[4] = (uint64_t)args_ptr;
@@ -301,15 +279,13 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 #if defined(__APPLE__)
     #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); \
+             \
             if (param.gpr_count) [[likely]] { \
                 *(gpr_ptr++) = (uint64_t)v; \
             } else { \
@@ -320,15 +296,13 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
         } 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); \
+             \
             if (param.gpr_count) [[likely]] { \
                 *(gpr_ptr++) = (uint64_t)ReverseBytes(v); \
             } else { \
@@ -340,259 +314,228 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 #else
     #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); \
             *((param.gpr_count ? gpr_ptr : 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); \
             *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint64_t)ReverseBytes(v); \
         } while (false)
 #endif
 
     // Push arguments
-    LOOP {
-        CASE(Void) { K_UNREACHABLE(); };
+    for (Size i = 0; i < func->parameters.len; i++) {
+        const ParameterInfo &param = func->parameters[i];
+        K_ASSERT(param.directions >= 1 && param.directions <= 3);
 
-        CASE(Bool) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+        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;
-            }
+        switch (param.type->primitive) {
+            case PrimitiveKind::Void: { K_UNREACHABLE(); } break;
+
+            case PrimitiveKind::Bool: {
+                if (!value.IsBoolean()) [[unlikely]] {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
+                    return false;
+                }
+
+                bool b = value.As<Napi::Boolean>();
 
 #if defined(__APPLE__)
-            if (param.gpr_count) [[likely]] {
-                *(gpr_ptr++) = (uint64_t)b;
-            } else {
-                *(uint8_t *)args_ptr = b;
-                args_ptr = (uint64_t *)((uint8_t *)args_ptr + 1);
-            }
+                if (param.gpr_count) [[likely]] {
+                    *(gpr_ptr++) = (uint64_t)b;
+                } else {
+                    args_ptr = AlignUp(args_ptr, param.variadic ? 8 : 1);
+                    *(uint8_t *)args_ptr = b;
+                    args_ptr = (uint64_t *)((uint8_t *)args_ptr + 1);
+                }
 #else
-            *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint64_t)b;
+                *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint64_t)b;
 #endif
-        };
-
-        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;
+            } 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 defined(__APPLE__)
-            args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
+                args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
-            *(const char **)((param.gpr_count ? gpr_ptr : 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 char **)((param.gpr_count ? gpr_ptr : args_ptr)++) = str;
+            } break;
+            case PrimitiveKind::String16: {
+                const char16_t *str16;
+                if (!PushString16(value, param.directions, &str16)) [[unlikely]]
+                    return false;
 
 #if defined(__APPLE__)
-            args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
+                args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
-            *(const char16_t **)((param.gpr_count ? gpr_ptr : 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;
+                *(const char16_t **)((param.gpr_count ? gpr_ptr : args_ptr)++) = str16;
+            } break;
+            case PrimitiveKind::String32: {
+                const char32_t *str32;
+                if (!PushString32(value, param.directions, &str32)) [[unlikely]]
+                    return false;
 
 #if defined(__APPLE__)
-            args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
+                args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
-            *(const char32_t **)((param.gpr_count ? gpr_ptr : args_ptr)++) = str32;
-        };
-
-        CASE(Pointer) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
-
-            void *ptr;
-            if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
-                return false;
+                *(const char32_t **)((param.gpr_count ? gpr_ptr : args_ptr)++) = str32;
+            } break;
+            case PrimitiveKind::Pointer: {
+                void *ptr;
+                if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
+                    return false;
 
 #if defined(__APPLE__)
-            args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
+                args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
-            *(void **)((param.gpr_count ? gpr_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;
-            }
+                *(void **)((param.gpr_count ? gpr_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;
+                }
 
-            Napi::Object obj = value.As<Napi::Object>();
+                Napi::Object obj = value.As<Napi::Object>();
 
-            if (param.vec_count) { // HFA
-                uint8_t *ptr = (uint8_t *)vec_ptr;
+                if (param.vec_count) { // HFA
+                    uint8_t *ptr = (uint8_t *)vec_ptr;
 
-                if (!PushObject(obj, param.type, ptr))
-                    return false;
-                ExpandFloats(ptr, param.vec_count, param.vec_bytes);
+                    if (!PushObject(obj, param.type, ptr))
+                        return false;
+                    ExpandFloats(ptr, param.vec_count, param.vec_bytes);
 
-                vec_ptr += param.vec_count;
-            } else if (!param.use_memory) {
-                if (param.gpr_count) {
-                    K_ASSERT(param.type->align <= 8);
+                    vec_ptr += param.vec_count;
+                } else if (!param.use_memory) {
+                    if (param.gpr_count) {
+                        K_ASSERT(param.type->align <= 8);
 
-                    if (!PushObject(obj, param.type, (uint8_t *)gpr_ptr))
-                        return false;
-                    gpr_ptr += param.gpr_count;
-                } else if (param.type->size) {
+                        if (!PushObject(obj, param.type, (uint8_t *)gpr_ptr))
+                            return false;
+                        gpr_ptr += param.gpr_count;
+                    } else if (param.type->size) {
 #if defined(__APPLE__)
-                    args_ptr = AlignUp(args_ptr, param.type->align);
+                        args_ptr = AlignUp(args_ptr, 8);
 #endif
-                    if (!PushObject(obj, param.type, (uint8_t *)args_ptr))
-                        return false;
-                    args_ptr += (param.type->size + 7) / 8;
-                }
-            } else {
-                uint8_t *ptr = AllocHeap(param.type->size, 16);
+                        if (!PushObject(obj, param.type, (uint8_t *)args_ptr))
+                            return false;
+                        args_ptr += (param.type->size + 7) / 8;
+                    }
+                } else {
+                    uint8_t *ptr = AllocHeap(param.type->size, 16);
 
-                if (param.gpr_count) {
-                    K_ASSERT(param.gpr_count == 1);
-                    K_ASSERT(param.vec_count == 0);
+                    if (param.gpr_count) {
+                        K_ASSERT(param.gpr_count == 1);
+                        K_ASSERT(param.vec_count == 0);
 
-                    *(uint8_t **)(gpr_ptr++) = ptr;
-                } else {
+                        *(uint8_t **)(gpr_ptr++) = ptr;
+                    } else {
 #if defined(__APPLE__)
-                    args_ptr = AlignUp(args_ptr, 8);
+                        args_ptr = AlignUp(args_ptr, 8);
 #endif
-                    *(uint8_t **)(args_ptr++) = ptr;
-                }
+                        *(uint8_t **)(args_ptr++) = ptr;
+                    }
 
-                if (!PushObject(obj, param.type, ptr))
+                    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;
-            }
-        };
-        CASE(Array) { K_UNREACHABLE(); };
-
-        CASE(Float32) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+                }
 
-            float f;
-            if (!TryNumber(value, &f)) [[unlikely]] {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                return false;
-            }
+                float f = GetNumber<float>(value);
 
-            if (param.vec_count) [[likely]] {
-                memset((uint8_t *)vec_ptr + 4, 0, 4);
-                *(float *)(vec_ptr++) = f;
+                if (param.vec_count) [[likely]] {
+                    memset((uint8_t *)vec_ptr + 4, 0, 4);
+                    *(float *)(vec_ptr++) = f;
 #if defined(_WIN32)
-            } else if (param.gpr_count) {
-                memset((uint8_t *)gpr_ptr + 4, 0, 4);
-                *(float *)(gpr_ptr++) = f;
+                } else if (param.gpr_count) {
+                    memset((uint8_t *)gpr_ptr + 4, 0, 4);
+                    *(float *)(gpr_ptr++) = f;
 #endif
-            } else {
+                } else {
 #if defined(__APPLE__)
-                args_ptr = AlignUp(args_ptr, 4);
-                *(float *)args_ptr = f;
-                args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
+                    args_ptr = AlignUp(args_ptr, param.variadic ? 8 : 4);
+                    *(float *)args_ptr = f;
+                    args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
 #else
-                memset((uint8_t *)args_ptr + 4, 0, 4);
-                *(float *)(args_ptr++) = f;
+                    memset((uint8_t *)args_ptr + 4, 0, 4);
+                    *(float *)(args_ptr++) = f;
 #endif
-            }
-        };
-        CASE(Float64) {
-            const ParameterInfo &param = func->parameters[i];
-            Napi::Value value = info[param.offset];
+                }
+            } break;
+            case PrimitiveKind::Float64: {
+                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;
-            }
+                double d = GetNumber<double>(value);
 
-            if (param.vec_count) [[likely]] {
-                *(double *)(vec_ptr++) = d;
+                if (param.vec_count) [[likely]] {
+                    *(double *)(vec_ptr++) = d;
 #if defined(_WIN32)
-            } else if (param.gpr_count) {
-                *(double *)(gpr_ptr++) = d;
+                } else if (param.gpr_count) {
+                    *(double *)(gpr_ptr++) = d;
 #endif
-            } else {
+                } else {
 #if defined(__APPLE__)
-                args_ptr = AlignUp(args_ptr, 8);
+                    args_ptr = AlignUp(args_ptr, 8);
 #endif
-                *(double *)(args_ptr++) = d;
-            }
-        };
-
-        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;
+                    *(double *)(args_ptr++) = d;
+                }
+            } break;
+            case PrimitiveKind::Callback: {
+                void *ptr;
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
+                    return false;
 
 #if defined(__APPLE__)
-            args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
+                args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);
 #endif
-            *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
-        };
+                *(void **)((param.gpr_count ? gpr_ptr : 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;
@@ -710,8 +653,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: {
             if (func->ret.vec_count) { // HFA
@@ -739,31 +691,14 @@ 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)
 {
-    if (env.IsExceptionPending()) [[unlikely]]
-        return;
-
-#if defined(_WIN32)
-    TEB *teb = GetTEB();
-
-    // Restore previous stack limits at the end
-    K_DEFER_C(base = teb->StackBase,
-               limit = teb->StackLimit,
-               dealloc = teb->DeallocationStack) {
-        teb->StackBase = base;
-        teb->StackLimit = limit;
-        teb->DeallocationStack = dealloc;
-    };
-
-    // Adjust stack limits so SEH works correctly
-    teb->StackBase = instance->main_stack_max;
-    teb->StackLimit = instance->main_stack_min;
-    teb->DeallocationStack = instance->main_stack_min;
-#endif
-
     const TrampolineInfo &trampoline = shared.trampolines[idx];
 
+    uint8_t *own_sp = sp;
+    uint8_t *caller_sp = sp + 208;
+    BackRegisters *out_reg = (BackRegisters *)(sp + 136);
+
     const FunctionInfo *proto = trampoline.proto;
     Napi::Function func = trampoline.func.Value();
 
@@ -775,11 +710,6 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
 
     K_DEFER_N(err_guard) { memset(out_reg, 0, K_SIZE(*out_reg)); };
 
-    if (trampoline.generation >= 0 && trampoline.generation != (int32_t)mem->generation) [[unlikely]] {
-        ThrowError<Napi::Error>(env, "Cannot use non-registered callback beyond FFI call");
-        return;
-    }
-
     LocalArray<napi_value, MaxParameters + 1> arguments;
 
     arguments.Append(!trampoline.recv.IsEmpty() ? trampoline.recv.Value() : env.Undefined());
@@ -1074,29 +1004,22 @@ 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: {
 #if defined(__APPLE__)
                 args_ptr = AlignUp(args_ptr, 8);
 #endif
 
                 void *ptr2 = *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
-                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: {
-#if defined(__APPLE__)
-                args_ptr = AlignUp(args_ptr, 8);
-#endif
-
-                void *ptr2 = *(void **)((param.gpr_count ? gpr_ptr : 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);
@@ -1188,37 +1111,30 @@ 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->x0 = (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->x0 = (uint64_t)ReverseBytes(v); \
         } while (false)
 
@@ -1226,12 +1142,12 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
     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->x0 = (uint64_t)b;
         } break;
         case PrimitiveKind::Int8: { RETURN_INTEGER(int8_t); } break;
@@ -1270,9 +1186,24 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
             out_reg->x0 = (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->x0 = (uint64_t)ptr;
         } break;
@@ -1300,30 +1231,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->d0 + 4, 0, 4);
             memcpy(&out_reg->d0, &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->d0 = 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->x0 = (uint64_t)ptr;
         } break;
@@ -1337,6 +1280,16 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
     err_guard.Disable();
 }
 
+void *FindTrampolineStart()
+{
+    return &Trampoline0;
+}
+
+void *FindTrampolineEnd()
+{
+    return &TrampolineEnd;
+}
+
 }
 
 #endif