koffi 2.16.1 → 3.0.0-alpha.2

package/src/koffi/src/{abi_arm32.cc → abi/arm32.cc}

@@ -4,9 +4,9 @@
 #if defined(__arm__) || (defined(__M_ARM) && !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"
 
 #include <napi.h>
 #include <signal.h>
@@ -38,10 +38,11 @@ extern "C" uint64_t ForwardCallXGG(const void *func, uint8_t *sp, uint8_t **out_
 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" uint8_t Trampoline0;
-extern "C" uint8_t TrampolineEnd;
-extern "C" void *FindTrampolineStart();
-extern "C" void *FindTrampolineEnd();
+enum class AbiOpcode : int8_t {
+    #define PRIMITIVE(Name) Name,
+    #include "../primitives.inc"
+    End
+};
 
 static int IsHFA(const TypeInfo *type)
 {
@@ -190,9 +191,11 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
             case PrimitiveKind::Prototype: { K_UNREACHABLE(); } break;
         }
 
+        func->instructions.Append((AbiOpcode)param.type->primitive);
         func->args_size += AlignLen(param.type->size, 16);
     }
 
+    func->instructions.Append(AbiOpcode::End);
     func->forward_fp = (vec_avail < 16);
 
     return true;
@@ -200,54 +203,74 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 
 bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 {
-    uint32_t *args_ptr = nullptr;
-    uint32_t *gpr_ptr = nullptr;
-    uint32_t *vec_ptr = nullptr;
-
-    // Unlike other call conventions, here we put the general-purpose
-    // registers just before the stack (so behind the vector ones).
-    // In the armv7hf calling convention, some arguments can end up
-    // partially in GPR, partially in the stack.
-    if (!AllocStack(func->args_size, 16, &args_ptr)) [[unlikely]]
-        return false;
-    if (!AllocStack(4 * 4, 8, &gpr_ptr)) [[unlikely]]
-        return false;
-    if (!AllocStack(8 * 8, 8, &vec_ptr)) [[unlikely]]
+    // Unlike other call conventions, here we put the general-purpose registers before the stack, behind the vector ones).
+    // In the armv7hf calling convention, some arguments can end up partially in GPR, partially in the stack.
+    uint32_t *vec_ptr = AllocStack<uint32_t>(20 * 4 + func->args_size);
+    uint32_t *gpr_ptr = vec_ptr + 16;
+    uint32_t *args_ptr = vec_ptr + 20;
+
+    if (!vec_ptr) [[unlikely]]
         return false;
     if (func->ret.use_memory) {
-        return_ptr = AllocHeap(func->ret.type->size, 16);
+        return_ptr = AllocHeap(func->ret.type->size);
         *(uint8_t **)(gpr_ptr++) = return_ptr;
     }
 
+    Size i = -1;
+
+    static const void *const DispatchTable[] = {
+        #define PRIMITIVE(Name) && Name,
+        #include "../primitives.inc"
+        && End
+    };
+
+    #define LOOP
+    #define CASE(Primitive) \
+        do { \
+            AbiOpcode next = func->instructions[++i]; \
+            goto *DispatchTable[(int)next]; \
+        } while (false); \
+        Primitive:
+    #define OR(Primitive) \
+        Primitive:
+
 #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.gpr_count ? gpr_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.gpr_count ? gpr_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); \
-             \
             if (param.gpr_count) [[likely]] { \
                 gpr_ptr = AlignUp(gpr_ptr, 8); \
                 *(uint64_t *)gpr_ptr = (uint64_t)v; \
@@ -260,13 +283,15 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
         } 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); \
-             \
             if (param.gpr_count) [[likely]] { \
                 gpr_ptr = AlignUp(gpr_ptr, 8); \
                 *(uint64_t *)gpr_ptr = (uint64_t)ReverseBytes(v); \
@@ -278,148 +303,172 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } \
         } 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;
-                }
+            *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint32_t)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>();
-                *((param.gpr_count ? gpr_ptr : args_ptr)++) = (uint32_t)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.gpr_count ? gpr_ptr : args_ptr)++) = str;
-            } break;
-            case PrimitiveKind::String16: {
-                const char16_t *str16;
-                if (!PushString16(value, param.directions, &str16)) [[unlikely]]
-                    return false;
+            *(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 **)((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;
+            const char16_t *str16;
+            if (!PushString16(value, param.directions, &str16)) [[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;
+            *(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];
 
-                *(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;
-                }
+            const char32_t *str32;
+            if (!PushString32(value, param.directions, &str32)) [[unlikely]]
+                return false;
 
-                Napi::Object obj = value.As<Napi::Object>();
+            *(const char32_t **)((param.gpr_count ? gpr_ptr : args_ptr)++) = str32;
+        };
 
-                if (param.vec_count) {
-                    if (!PushObject(obj, param.type, (uint8_t *)vec_ptr))
-                        return false;
-                    vec_ptr += param.vec_count;
-                } else if (param.gpr_count) {
-                    K_ASSERT(param.type->align <= 8);
+        CASE(Pointer) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-                    int16_t align = (param.type->align <= 4) ? 4 : 8;
-                    gpr_ptr = AlignUp(gpr_ptr, align);
+            void *ptr;
+            if (!PushPointer(value, param.type, param.directions, &ptr)) [[unlikely]]
+                return false;
 
-                    if (!PushObject(obj, param.type, (uint8_t *)gpr_ptr))
-                        return false;
+            *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
+        };
 
-                    gpr_ptr += param.gpr_count;
-                    args_ptr += (param.type->size - param.gpr_count * 4 + 3) / 4;
-                } else if (param.type->size) {
-                    int16_t align = (param.type->align <= 4) ? 4 : 8;
-                    args_ptr = AlignUp(args_ptr, align);
+        CASE(Record) OR(Union) {
+            const ParameterInfo &param = func->parameters[i];
+            Napi::Value value = info[param.offset];
 
-                    if (!PushObject(obj, param.type, (uint8_t *)args_ptr))
-                        return false;
-                    args_ptr += (param.type->size + 3) / 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));
+            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.vec_count) {
+                if (!PushObject(obj, param.type, (uint8_t *)vec_ptr))
                     return false;
-                }
+                vec_ptr += param.vec_count;
+            } else if (param.gpr_count) {
+                K_ASSERT(param.type->align <= 8);
 
-                float f = GetNumber<float>(value);
+                int16_t align = (param.type->align <= 4) ? 4 : 8;
+                gpr_ptr = AlignUp(gpr_ptr, align);
 
-                if (param.vec_count) [[likely]] {
-                    *(float *)(vec_ptr++) = f;
-                } else if (param.gpr_count) {
-                    *(float *)(gpr_ptr++) = f;
-                } else {
-                    *(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));
+                if (!PushObject(obj, param.type, (uint8_t *)gpr_ptr))
                     return false;
-                }
 
-                double d = GetNumber<double>(value);
+                gpr_ptr += param.gpr_count;
+                args_ptr += (param.type->size - param.gpr_count * 4 + 3) / 4;
+            } else if (param.type->size) {
+                int16_t align = (param.type->align <= 4) ? 4 : 8;
+                args_ptr = AlignUp(args_ptr, align);
 
-                if (param.vec_count) [[likely]] {
-                    *(double *)vec_ptr = d;
-                    vec_ptr += 2;
-                } else if (param.gpr_count) {
-                    gpr_ptr = AlignUp(gpr_ptr, 8);
-                    *(double *)gpr_ptr = d;
-                    gpr_ptr += 2;
-                } else {
-                    args_ptr = AlignUp(args_ptr, 8);
-                    *(double *)args_ptr = d;
-                    args_ptr += 2;
-                }
-            } break;
-            case PrimitiveKind::Callback: {
-                void *ptr;
-                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
+                if (!PushObject(obj, param.type, (uint8_t *)args_ptr))
                     return false;
+                args_ptr += (param.type->size + 3) / 4;
+            }
+        };
+        CASE(Array) { K_UNREACHABLE(); };
 
-                *(void **)((param.gpr_count ? gpr_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;
+            }
+
+            if (param.vec_count) [[likely]] {
+                *(float *)(vec_ptr++) = f;
+            } else if (param.gpr_count) {
+                *(float *)(gpr_ptr++) = f;
+            } else {
+                *(float *)(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;
+            }
+
+            if (param.vec_count) [[likely]] {
+                *(double *)vec_ptr = d;
+                vec_ptr += 2;
+            } else if (param.gpr_count) {
+                gpr_ptr = AlignUp(gpr_ptr, 8);
+                *(double *)gpr_ptr = d;
+                gpr_ptr += 2;
+            } else {
+                args_ptr = AlignUp(args_ptr, 8);
+                *(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.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
+        };
+
+        CASE(Prototype) { K_UNREACHABLE(); };
+
+        CASE(End) { /* End loop */ };
     }
 
 #undef PUSH_INTEGER_64_SWAP
@@ -427,6 +476,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;
@@ -486,8 +539,6 @@ void CallData::Execute(const FunctionInfo *func, void *native)
 Napi::Value CallData::Complete(const FunctionInfo *func)
 {
     K_DEFER {
-       PopOutArguments();
-
         if (func->ret.type->dispose) {
             func->ret.type->dispose(env, func->ret.type, result.ptr);
         }
@@ -496,34 +547,25 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void: return env.Undefined();
         case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u8 & 0x1);
-        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::Int8: return NewInt(env, result.i8);
+        case PrimitiveKind::UInt8: return NewInt(env, result.u8);
+        case PrimitiveKind::Int16: return NewInt(env, result.i16);
+        case PrimitiveKind::Int16S: return NewInt(env, ReverseBytes(result.i16));
+        case PrimitiveKind::UInt16: return NewInt(env, result.u16);
+        case PrimitiveKind::UInt16S: return NewInt(env, ReverseBytes(result.u16));
+        case PrimitiveKind::Int32: return NewInt(env, result.i32);
+        case PrimitiveKind::Int32S: return NewInt(env, ReverseBytes(result.i32));
+        case PrimitiveKind::UInt32: return NewInt(env, result.u32);
+        case PrimitiveKind::UInt32S: return NewInt(env, ReverseBytes(result.u32));
+        case PrimitiveKind::Int64: return NewInt(env, result.i64);
+        case PrimitiveKind::Int64S: return NewInt(env, ReverseBytes(result.i64));
+        case PrimitiveKind::UInt64: return NewInt(env, result.u64);
+        case PrimitiveKind::UInt64S: return NewInt(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::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
@@ -544,14 +586,14 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
 
 void CallData::Relay(Size idx, uint8_t *sp)
 {
-    const TrampolineInfo &trampoline = shared.trampolines[idx];
+    TrampolineInfo *trampoline = &shared.trampolines[idx];
 
     uint8_t *own_sp = sp;
     uint8_t *caller_sp = sp + 128;
     BackRegisters *out_reg = (BackRegisters *)(sp + 80);
 
-    const FunctionInfo *proto = trampoline.proto;
-    Napi::Function func = trampoline.func.Value();
+    const FunctionInfo *proto = trampoline->proto;
+    Napi::Function func = trampoline->func.Value();
 
     uint32_t *vec_ptr = (uint32_t *)own_sp;
     uint32_t *gpr_ptr = vec_ptr + 16;
@@ -560,11 +602,14 @@ void CallData::Relay(Size idx, uint8_t *sp)
     uint8_t *return_ptr = proto->ret.use_memory ? (uint8_t *)gpr_ptr[0] : nullptr;
     gpr_ptr += proto->ret.use_memory;
 
-    K_DEFER_N(err_guard) { memset(out_reg, 0, K_SIZE(*out_reg)); };
+    K_DEFER_N(err_guard) {
+        trampoline->state = -1;
+        memset(out_reg, 0, K_SIZE(*out_reg));
+    };
 
     LocalArray<napi_value, MaxParameters + 1> arguments;
 
-    arguments.Append(!trampoline.recv.IsEmpty() ? trampoline.recv.Value() : env.Undefined());
+    arguments.Append(!trampoline->recv.IsEmpty() ? trampoline->recv.Value() : env.Undefined());
 
     // Convert to JS arguments
     for (Size i = 0; i < proto->parameters.len; i++) {
@@ -581,67 +626,63 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int8: {
-                double d = (double)*(int8_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                int8_t v = *(int8_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt8: {
-                double d = (double)*(uint8_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                uint8_t v = *(uint8_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int16: {
-                double d = (double)*(int16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                int16_t v = *(int16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int16S: {
                 int16_t v = *(int16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
-                double d = (double)ReverseBytes(v);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, ReverseBytes(v));
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt16: {
-                double d = (double)*(uint16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                uint16_t v = *(uint16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt16S: {
                 uint16_t v = *(uint16_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
-                double d = (double)ReverseBytes(v);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, ReverseBytes(v));
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int32: {
-                double d = (double)*(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                int32_t v = *(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int32S: {
                 int32_t v = *(int32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
-                double d = (double)ReverseBytes(v);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, ReverseBytes(v));
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32: {
-                double d = (double)*(uint32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
+                uint32_t v = *(uint32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt32S: {
                 uint32_t v = *(uint32_t *)((param.gpr_count ? gpr_ptr : args_ptr)++);
-                double d = (double)ReverseBytes(v);
 
-                Napi::Value arg = Napi::Number::New(env, d);
+                Napi::Value arg = NewInt(env, ReverseBytes(v));
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int64: {
@@ -650,7 +691,7 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 int64_t v = *(int64_t *)(param.gpr_count ? gpr_ptr : args_ptr);
                 (param.gpr_count ? gpr_ptr : args_ptr) += 2;
 
-                Napi::Value arg = NewBigInt(env, v);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::Int64S: {
@@ -659,7 +700,7 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 int64_t v = *(int64_t *)(param.gpr_count ? gpr_ptr : args_ptr);
                 (param.gpr_count ? gpr_ptr : args_ptr) += 2;
 
-                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                Napi::Value arg = NewInt(env, ReverseBytes(v));
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt64: {
@@ -668,7 +709,7 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 uint64_t v = *(uint64_t *)(param.gpr_count ? gpr_ptr : args_ptr);
                 (param.gpr_count ? gpr_ptr : args_ptr) += 2;
 
-                Napi::Value arg = NewBigInt(env, v);
+                Napi::Value arg = NewInt(env, v);
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::UInt64S: {
@@ -677,7 +718,7 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 uint64_t v = *(uint64_t *)(param.gpr_count ? gpr_ptr : args_ptr);
                 (param.gpr_count ? gpr_ptr : args_ptr) += 2;
 
-                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                Napi::Value arg = NewInt(env, ReverseBytes(v));
                 arguments.Append(arg);
             } break;
             case PrimitiveKind::String: {
@@ -706,18 +747,21 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 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 **)((param.gpr_count ? gpr_ptr : 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 **)((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);
@@ -740,7 +784,7 @@ void CallData::Relay(Size idx, uint8_t *sp)
                     if (param.type->size > gpr_size) {
                         // XXX: Expensive, can we do better?
                         // The problem is that the object is split between the GPRs and the caller stack.
-                        uint8_t *ptr = AllocHeap(param.type->size, 16);
+                        uint8_t *ptr = AllocHeap(param.type->size);
 
                         memcpy(ptr, gpr_ptr, gpr_size);
                         memcpy(ptr + gpr_size, args_ptr, param.type->size - gpr_size);
@@ -813,45 +857,43 @@ void CallData::Relay(Size idx, uint8_t *sp)
 
 #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 for return value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
             out_reg->r0 = (uint32_t)v; \
         } while (false)
 #define RETURN_INTEGER_32_SWAP(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
             out_reg->r0 = (uint32_t)ReverseBytes(v); \
         } while (false)
 #define RETURN_INTEGER_64(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = GetNumber<CType>(value); \
-             \
             out_reg->r0 = (uint32_t)((uint64_t)v >> 32); \
             out_reg->r1 = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
         } while (false)
 #define RETURN_INTEGER_64_SWAP(CType) \
         do { \
-            if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] { \
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+            CType v; \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value)); \
                 return; \
             } \
              \
-            CType v = ReverseBytes(GetNumber<CType>(value)); \
-             \
             out_reg->r0 = (uint32_t)((uint64_t)v >> 32); \
             out_reg->r1 = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
         } while (false)
@@ -860,12 +902,12 @@ void CallData::Relay(Size idx, uint8_t *sp)
     switch (type->primitive) {
         case PrimitiveKind::Void: {} 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->r0 = (uint32_t)b;
         } break;
         case PrimitiveKind::Int8: { RETURN_INTEGER_32(int8_t); } break;
@@ -904,24 +946,9 @@ void CallData::Relay(Size idx, uint8_t *sp)
             out_reg->r0 = (uint32_t)str32;
         } 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->r0 = (uint32_t)ptr;
         } break;
@@ -946,12 +973,12 @@ void CallData::Relay(Size idx, uint8_t *sp)
         } 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;
             }
 
-            float f = GetNumber<float>(value);
 #if defined(__ARM_PCS_VFP)
             memcpy(&out_reg->d0, &f, 4);
 #else
@@ -959,12 +986,12 @@ void CallData::Relay(Size idx, uint8_t *sp)
 #endif
         } 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;
             }
 
-            double d = GetNumber<double>(value);
 #if defined(__ARM_PCS_VFP)
             out_reg->d0 = d;
 #else
@@ -973,21 +1000,8 @@ void CallData::Relay(Size idx, uint8_t *sp)
         } 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->r0 = (uint32_t)ptr;
         } break;
@@ -1003,16 +1017,6 @@ void CallData::Relay(Size idx, uint8_t *sp)
     err_guard.Disable();
 }
 
-void *FindTrampolineStart()
-{
-    return &Trampoline0;
-}
-
-void *FindTrampolineEnd()
-{
-    return &TrampolineEnd;
-}
-
 }
 
 #endif