koffi 2.15.1 → 2.16.0-beta.1

package/src/koffi/src/call.cc

@@ -24,6 +24,8 @@ struct RelayContext {
     bool done = false;
 };
 
+#include "trampolines/prototypes.inc"
+
 CallData::CallData(Napi::Env env, InstanceData *instance, InstanceMemory *mem)
     : env(env), instance(instance),
       mem(mem), old_stack_mem(mem->stack), old_heap_mem(mem->heap)
@@ -343,6 +345,29 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
 
     MemSet(origin, 0, type->size);
 
+#define PUSH_NUMBER(CType) \
+        do { \
+            CType v; \
+            \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            *(CType *)dest = v; \
+        } while (false)
+#define PUSH_NUMBER_SWAP(CType) \
+        do { \
+            CType v; \
+            \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            *(CType *)dest = ReverseBytes(v); \
+        } while (false)
+
     for (Size i = 0; i < members.len; i++) {
         const RecordMember &member = members[i];
         Napi::Value value = obj.Get(member.name);
@@ -363,140 +388,30 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
             case PrimitiveKind::Void: { K_UNREACHABLE(); } break;
 
             case PrimitiveKind::Bool: {
-                if (!value.IsBoolean()) [[unlikely]] {
+                bool b;
+                napi_status status = napi_get_value_bool(env, value, &b);
+
+                if (status != napi_ok) [[unlikely]] {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
                     return false;
                 }
 
-                bool b = value.As<Napi::Boolean>();
                 *(bool *)dest = b;
             } break;
-            case PrimitiveKind::Int8: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                int8_t v = GetNumber<int8_t>(value);
-                *(int8_t *)dest = v;
-            } break;
-            case PrimitiveKind::UInt8: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                uint8_t v = GetNumber<uint8_t>(value);
-                *(uint8_t *)dest = v;
-            } break;
-            case PrimitiveKind::Int16: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                int16_t v = GetNumber<int16_t>(value);
-                *(int16_t *)dest = v;
-            } break;
-            case PrimitiveKind::Int16S: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                int16_t v = GetNumber<int16_t>(value);
-                *(int16_t *)dest = ReverseBytes(v);
-            } break;
-            case PrimitiveKind::UInt16: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                uint16_t v = GetNumber<uint16_t>(value);
-                *(uint16_t *)dest = v;
-            } break;
-            case PrimitiveKind::UInt16S: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                uint16_t v = GetNumber<uint16_t>(value);
-                *(uint16_t *)dest = ReverseBytes(v);
-            } break;
-            case PrimitiveKind::Int32: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                int32_t v = GetNumber<int32_t>(value);
-                *(int32_t *)dest = v;
-            } break;
-            case PrimitiveKind::Int32S: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                int32_t v = GetNumber<int32_t>(value);
-                *(int32_t *)dest = ReverseBytes(v);
-            } break;
-            case PrimitiveKind::UInt32: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                uint32_t v = GetNumber<uint32_t>(value);
-                *(uint32_t *)dest = v;
-            } break;
-            case PrimitiveKind::UInt32S: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                uint32_t v = GetNumber<uint32_t>(value);
-                *(uint32_t *)dest = ReverseBytes(v);
-            } break;
-            case PrimitiveKind::Int64: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                int64_t v = GetNumber<int64_t>(value);
-                *(int64_t *)dest = v;
-            } break;
-            case PrimitiveKind::Int64S: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                int64_t v = GetNumber<int64_t>(value);
-                *(int64_t *)dest = ReverseBytes(v);
-            } break;
-            case PrimitiveKind::UInt64: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                uint64_t v = GetNumber<uint64_t>(value);
-                *(uint64_t *)dest = v;
-            } break;
-            case PrimitiveKind::UInt64S: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                uint64_t v = GetNumber<uint64_t>(value);
-                *(uint64_t *)dest = ReverseBytes(v);
-            } break;
+            case PrimitiveKind::Int8: { PUSH_NUMBER(int8_t); } break;
+            case PrimitiveKind::UInt8: { PUSH_NUMBER(uint8_t); } break;
+            case PrimitiveKind::Int16: { PUSH_NUMBER(int16_t); } break;
+            case PrimitiveKind::Int16S: { PUSH_NUMBER_SWAP(int16_t); } break;
+            case PrimitiveKind::UInt16: { PUSH_NUMBER(uint16_t); } break;
+            case PrimitiveKind::UInt16S: { PUSH_NUMBER_SWAP(uint16_t); } break;
+            case PrimitiveKind::Int32: { PUSH_NUMBER(int32_t); } break;
+            case PrimitiveKind::Int32S: { PUSH_NUMBER_SWAP(int32_t); } break;
+            case PrimitiveKind::UInt32: { PUSH_NUMBER(uint32_t); } break;
+            case PrimitiveKind::UInt32S: { PUSH_NUMBER_SWAP(uint32_t); } break;
+            case PrimitiveKind::Int64: { PUSH_NUMBER(int64_t); } break;
+            case PrimitiveKind::Int64S: { PUSH_NUMBER_SWAP(int64_t); } break;
+            case PrimitiveKind::UInt64: { PUSH_NUMBER(uint64_t); } break;
+            case PrimitiveKind::UInt64S: { PUSH_NUMBER_SWAP(uint64_t); } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (!PushString(value, 1, &str)) [[unlikely]]
@@ -541,8 +456,7 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                     Napi::Array array = value.As<Napi::Array>();
                     if (!PushNormalArray(array, member.type, member.type->size, dest))
                         return false;
-                } else if (IsRawBuffer(value)) {
-                    Span<const uint8_t> buffer = GetRawBuffer(value);
+                } else if (Span<uint8_t> buffer = {}; TryBuffer(value, &buffer)) {
                     PushBuffer(buffer, member.type, dest);
                 } else if (value.IsString()) {
                     if (!PushStringArray(value, member.type, dest))
@@ -552,24 +466,8 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                     return false;
                 }
             } break;
-            case PrimitiveKind::Float32: {
-                if (!value.IsNumber() && !value.IsBigInt()) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value));
-                    return false;
-                }
-
-                float f = GetNumber<float>(value);
-                *(float *)dest = 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;
-                }
-
-                double d = GetNumber<double>(value);
-                *(double *)dest = d;
-            } break;
+            case PrimitiveKind::Float32: { PUSH_NUMBER(float); } break;
+            case PrimitiveKind::Float64: { PUSH_NUMBER(double); } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
                 if (!PushCallback(value, member.type, &ptr))
@@ -582,6 +480,9 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
         }
     }
 
+#undef PUSH_NUMBER_SWAP
+#undef PUSH_NUMBER
+
     return true;
 }
 
@@ -601,7 +502,7 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
 
     Size offset = 0;
 
-#define PUSH_ARRAY(Check, Expected, GetCode) \
+#define PUSH_ARRAY(Code) \
         do { \
             for (Size i = 0; i < len; i++) { \
                 Napi::Value value = array[(uint32_t)i]; \
@@ -609,16 +510,33 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
                 offset = AlignLen(offset, ref->align); \
                 uint8_t *dest = origin + offset; \
                  \
-                if (!(Check)) [[unlikely]] { \
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), (Expected)); \
-                    return false; \
-                } \
-                 \
-                GetCode \
+                Code \
                  \
                 offset += ref->size; \
             } \
         } while (false)
+#define PUSH_NUMBERS(CType) \
+        PUSH_ARRAY({ \
+            CType v; \
+             \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            *(CType *)dest = v; \
+        })
+#define PUSH_NUMBERS_SWAP(CType) \
+        PUSH_ARRAY({ \
+            CType v; \
+             \
+            if (!TryNumber(value, &v)) [[unlikely]] { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected number", GetValueType(instance, value)); \
+                return false; \
+            } \
+             \
+            *(CType *)dest = ReverseBytes(v); \
+        })
 
     switch (ref->primitive) {
         case PrimitiveKind::Void: {
@@ -627,97 +545,34 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
         } break;
 
         case PrimitiveKind::Bool: {
-            PUSH_ARRAY(value.IsBoolean(), "boolean", {
-                bool b = value.As<Napi::Boolean>();
+            PUSH_ARRAY({
+                bool b;
+                napi_status status = napi_get_value_bool(env, value, &b);
+
+                if (status != napi_ok) [[unlikely]] {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected boolean", GetValueType(instance, value));
+                    return false;
+                }
+
                 *(bool *)dest = b;
             });
         } break;
-        case PrimitiveKind::Int8: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                int8_t v = GetNumber<int8_t>(value);
-                *(int8_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::UInt8: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                uint8_t v = GetNumber<uint8_t>(value);
-                *(uint8_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::Int16: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                int16_t v = GetNumber<int16_t>(value);
-                *(int16_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::Int16S: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                int16_t v = GetNumber<int16_t>(value);
-                *(int16_t *)dest = ReverseBytes(v);
-            });
-        } break;
-        case PrimitiveKind::UInt16: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                uint16_t v = GetNumber<uint16_t>(value);
-                *(uint16_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::UInt16S: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                uint16_t v = GetNumber<uint16_t>(value);
-                *(uint16_t *)dest = ReverseBytes(v);
-            });
-        } break;
-        case PrimitiveKind::Int32: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                int32_t v = GetNumber<int32_t>(value);
-                *(int32_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::Int32S: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                int32_t v = GetNumber<int32_t>(value);
-                *(int32_t *)dest = ReverseBytes(v);
-            });
-        } break;
-        case PrimitiveKind::UInt32: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                uint32_t v = GetNumber<uint32_t>(value);
-                *(uint32_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::UInt32S: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                uint32_t v = GetNumber<uint32_t>(value);
-                *(uint32_t *)dest = ReverseBytes(v);
-            });
-        } break;
-        case PrimitiveKind::Int64: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                int64_t v = GetNumber<int64_t>(value);
-                *(int64_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::Int64S: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                int64_t v = GetNumber<int64_t>(value);
-                *(int64_t *)dest = ReverseBytes(v);
-            });
-        } break;
-        case PrimitiveKind::UInt64: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                uint64_t v = GetNumber<uint64_t>(value);
-                *(uint64_t *)dest = v;
-            });
-        } break;
-        case PrimitiveKind::UInt64S: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                uint64_t v = GetNumber<uint64_t>(value);
-                *(uint64_t *)dest = ReverseBytes(v);
-            });
-        } break;
+        case PrimitiveKind::Int8: { PUSH_NUMBERS(int8_t); } break;
+        case PrimitiveKind::UInt8: { PUSH_NUMBERS(uint8_t); } break;
+        case PrimitiveKind::Int16: { PUSH_NUMBERS(int16_t); } break;
+        case PrimitiveKind::Int16S: { PUSH_NUMBERS_SWAP(int16_t); } break;
+        case PrimitiveKind::UInt16: { PUSH_NUMBERS(uint16_t); } break;
+        case PrimitiveKind::UInt16S: { PUSH_NUMBERS_SWAP(uint16_t); } break;
+        case PrimitiveKind::Int32: { PUSH_NUMBERS(int32_t); } break;
+        case PrimitiveKind::Int32S: { PUSH_NUMBERS_SWAP(int32_t); } break;
+        case PrimitiveKind::UInt32: { PUSH_NUMBERS(uint32_t); } break;
+        case PrimitiveKind::UInt32S: { PUSH_NUMBERS_SWAP(uint32_t); } break;
+        case PrimitiveKind::Int64: { PUSH_NUMBERS(int64_t); } break;
+        case PrimitiveKind::Int64S: { PUSH_NUMBERS_SWAP(int64_t); } break;
+        case PrimitiveKind::UInt64: { PUSH_NUMBERS(uint64_t); } break;
+        case PrimitiveKind::UInt64S: { PUSH_NUMBERS_SWAP(uint64_t); } break;
         case PrimitiveKind::String: {
-            PUSH_ARRAY(true, "string", {
+            PUSH_ARRAY({
                 const char *str;
                 if (!PushString(value, 1, &str)) [[unlikely]]
                     return false;
@@ -726,7 +581,7 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
             });
         } break;
         case PrimitiveKind::String16: {
-            PUSH_ARRAY(true, "string", {
+            PUSH_ARRAY({
                 const char16_t *str16;
                 if (!PushString16(value, 1, &str16)) [[unlikely]]
                     return false;
@@ -735,7 +590,7 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
             });
         } break;
         case PrimitiveKind::String32: {
-            PUSH_ARRAY(true, "string", {
+            PUSH_ARRAY({
                 const char32_t *str32;
                 if (!PushString32(value, 1, &str32)) [[unlikely]]
                     return false;
@@ -744,7 +599,12 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
             });
         } break;
         case PrimitiveKind::Pointer: {
-            PUSH_ARRAY(true, ref->name, {
+            PUSH_ARRAY({
+                if (!IsObject(value)) [[unlikely]] {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
+                    return false;
+                }
+
                 void *ptr;
                 if (!PushPointer(value, ref, 1, &ptr)) [[unlikely]]
                     return false;
@@ -754,7 +614,12 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
         } break;
         case PrimitiveKind::Record:
         case PrimitiveKind::Union: {
-            PUSH_ARRAY(IsObject(value), "object", {
+            PUSH_ARRAY({
+                if (!IsObject(value)) [[unlikely]] {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
+                    return false;
+                }
+
                 Napi::Object obj2 = value.As<Napi::Object>();
                 if (!PushObject(obj2, ref, dest))
                     return false;
@@ -772,8 +637,7 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
                     Napi::Array array2 = value.As<Napi::Array>();
                     if (!PushNormalArray(array2, ref, (Size)ref->size, dest))
                         return false;
-                } else if (IsRawBuffer(value)) {
-                    Span<const uint8_t> buffer = GetRawBuffer(value);
+                } else if (Span<uint8_t> buffer = {}; TryBuffer(value, &buffer)) {
                     PushBuffer(buffer, ref, dest);
                 } else if (value.IsString()) {
                     if (!PushStringArray(value, ref, dest))
@@ -786,18 +650,8 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
                 offset += ref->size;
             }
         } break;
-        case PrimitiveKind::Float32: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                float f = GetNumber<float>(value);
-                *(float *)dest = f;
-            });
-        } break;
-        case PrimitiveKind::Float64: {
-            PUSH_ARRAY(value.IsNumber() || value.IsBigInt(), "number", {
-                double d = GetNumber<double>(value);
-                *(double *)dest = d;
-            });
-        } break;
+        case PrimitiveKind::Float32: { PUSH_NUMBERS(float); } break;
+        case PrimitiveKind::Float64: { PUSH_NUMBERS(double); } break;
         case PrimitiveKind::Callback: {
             for (Size i = 0; i < len; i++) {
                 Napi::Value value = array[(uint32_t)i];
@@ -819,6 +673,8 @@ bool CallData::PushNormalArray(Napi::Array array, const TypeInfo *type, Size siz
         case PrimitiveKind::Prototype: { K_UNREACHABLE(); } break;
     }
 
+#undef PUSH_NUMBERS_SWAP
+#undef PUSH_NUMBERS
 #undef PUSH_ARRAY
 
     return true;
@@ -899,178 +755,140 @@ bool CallData::PushPointer(Napi::Value value, const TypeInfo *type, int directio
 
     const TypeInfo *ref = type->ref.type;
 
-    switch (value.Type()) {
-        case napi_undefined:
-        case napi_null: {
-            *out_ptr = nullptr;
-            return true;
-        } break;
-
-        case napi_external: {
-            K_ASSERT(type->primitive == PrimitiveKind::Pointer ||
-                      type->primitive == PrimitiveKind::String ||
-                      type->primitive == PrimitiveKind::String16 ||
-                      type->primitive == PrimitiveKind::String32);
-
-            if (!CheckValueTag(value, type->ref.marker) &&
-                    !CheckValueTag(value, instance->void_type) &&
-                    ref != instance->void_type) [[unlikely]]
-                goto unexpected;
-
-            *out_ptr = value.As<Napi::External<uint8_t>>().Data();
-            return true;
-        } break;
-
-        case napi_object: {
-            uint8_t *ptr = nullptr;
-
-            OutArgument::Kind out_kind;
-            Size out_max_len = -1;
+    // In the past we were naively using napi_typeof() and a switch to "reduce" branching,
+    // but it did not match the common types very well (so there was still various if tests),
+    // and it turns out that napi_typeof() is made of successive type tests anyway so it
+    // just made things worse. Oh, well.
 
-            if (value.IsArray()) {
-                Napi::Array array = value.As<Napi::Array>();
-                Size len = PushIndirectString(array, ref, &ptr);
-
-                if (len >= 0) {
-                    if (!ref->size && ref != instance->void_type) [[unlikely]] {
-                        ThrowError<Napi::TypeError>(env, "Cannot pass [string] value to %1", type->name);
-                        return false;
-                    }
-
-                    switch (ref->size) {
-                        default: { out_kind = OutArgument::Kind::String; } break;
-                        case 2: { out_kind = OutArgument::Kind::String16; } break;
-                        case 4: { out_kind = OutArgument::Kind::String32; } break;
-                    }
-                    out_max_len = len;
-                } else {
-                    if (!ref->size) [[unlikely]] {
-                        ThrowError<Napi::TypeError>(env, "Cannot pass %1 value to %2, use koffi.as()",
-                                                    ref != instance->void_type ? "opaque" : "ambiguous", type->name);
-                        return false;
-                    }
-
-                    Size len = (Size)array.Length();
-                    Size size = len * ref->size;
+    if (void *ptr = nullptr; TryPointer(value, &ptr)) {
+        *out_ptr = ptr;
+        return true;
+    } else if (value.IsArray()) {
+        uint8_t *ptr = nullptr;
 
-                    ptr = AllocHeap(size, 16);
+        Napi::Array array = value.As<Napi::Array>();
+        Size len = PushIndirectString(array, ref, &ptr);
 
-                    if (directions & 1) {
-                        if (!PushNormalArray(array, type, size, ptr))
-                            return false;
-                    } else {
-                        MemSet(ptr, 0, size);
-                    }
+        OutArgument::Kind out_kind;
+        Size out_max_len = -1;
 
-                    out_kind = OutArgument::Kind::Array;
-                }
-            } else if (IsRawBuffer(value)) {
-                Span<uint8_t> buffer = GetRawBuffer(value);
+        if (len >= 0) {
+            if (!ref->size && ref != instance->void_type) [[unlikely]] {
+                ThrowError<Napi::TypeError>(env, "Cannot pass [string] value to %1", type->name);
+                return false;
+            }
 
-                // We can fast path
-                ptr = buffer.ptr;
-                directions = 1;
+            switch (ref->size) {
+                default: { out_kind = OutArgument::Kind::String; } break;
+                case 2: { out_kind = OutArgument::Kind::String16; } break;
+                case 4: { out_kind = OutArgument::Kind::String32; } break;
+            }
+            out_max_len = len;
+        } else {
+            if (!ref->size) [[unlikely]] {
+                ThrowError<Napi::TypeError>(env, "Cannot pass %1 value to %2, use koffi.as()",
+                                            ref != instance->void_type ? "opaque" : "ambiguous", type->name);
+                return false;
+            }
 
-                out_kind = OutArgument::Kind::Buffer;
-            } else if (ref->primitive == PrimitiveKind::Record ||
-                       ref->primitive == PrimitiveKind::Union) [[likely]] {
-                Napi::Object obj = value.As<Napi::Object>();
-                K_ASSERT(IsObject(value));
+            Size len = (Size)array.Length();
+            Size size = len * ref->size;
 
-                ptr = AllocHeap(ref->size, 16);
+            ptr = AllocHeap(size, 16);
 
-                if (ref->primitive == PrimitiveKind::Union &&
-                        (directions & 2) && !CheckValueTag(obj, &MagicUnionMarker)) [[unlikely]] {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected union value", GetValueType(instance, obj));
+            if (directions & 1) {
+                if (!PushNormalArray(array, type, size, ptr))
                     return false;
-                }
-
-                if (directions & 1) {
-                    if (!PushObject(obj, ref, ptr))
-                        return false;
-                } else {
-                    MemSet(ptr, 0, ref->size);
-                }
-
-                out_kind = OutArgument::Kind::Object;
             } else {
-                goto unexpected;
+                MemSet(ptr, 0, size);
             }
 
-            if (directions & 2) {
-                OutArgument *out = out_arguments.AppendDefault();
+            out_kind = OutArgument::Kind::Array;
+        }
 
-                napi_status status = napi_create_reference(env, value, 1, &out->ref);
-                K_ASSERT(status == napi_ok);
+        if (directions & 2) {
+            OutArgument *out = out_arguments.AppendDefault();
 
-                out->kind = out_kind;
-                out->ptr = ptr;
-                out->type = ref;
-                out->max_len = out_max_len;
-            }
+            napi_status status = napi_create_reference(env, value, 1, &out->ref);
+            K_ASSERT(status == napi_ok);
 
-            *out_ptr = ptr;
-            return true;
-        } break;
+            out->kind = out_kind;
+            out->ptr = ptr;
+            out->type = ref;
+            out->max_len = out_max_len;
+        }
 
-        case napi_string: {
-            K_ASSERT(type->primitive == PrimitiveKind::Pointer);
+        *out_ptr = ptr;
+        return true;
+    } else if (ref->primitive == PrimitiveKind::Record ||
+               ref->primitive == PrimitiveKind::Union) [[likely]] {
+        Napi::Object obj = value.As<Napi::Object>();
+        K_ASSERT(IsObject(value));
 
-            if (directions & 2) [[unlikely]]
-                goto unexpected;
+        uint8_t *ptr = AllocHeap(ref->size, 16);
 
-            if (ref == instance->void_type) {
-                PushStringValue(value, (const char **)out_ptr);
-                return true;
-            } else if (ref->primitive == PrimitiveKind::Int8) {
-                PushStringValue(value, (const char **)out_ptr);
-                return true;
-            } else if (ref->primitive == PrimitiveKind::Int16) {
-                PushString16Value(value, (const char16_t **)out_ptr);
-                return true;
-            } else if (ref->primitive == PrimitiveKind::Int32) {
-                PushString32Value(value, (const char32_t **)out_ptr);
-                return true;
-            } else {
-                goto unexpected;
-            }
-        } break;
+        if (ref->primitive == PrimitiveKind::Union &&
+                (directions & 2) && !CheckValueTag(obj, &MagicUnionMarker)) [[unlikely]] {
+            ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected union value", GetValueType(instance, obj));
+            return false;
+        }
 
-        case napi_function: {
-            if (type->primitive != PrimitiveKind::Callback) [[unlikely]] {
-                ThrowError<Napi::TypeError>(env, "Cannot pass function to type %1", type->name);
+        if (directions & 1) {
+            if (!PushObject(obj, ref, ptr))
                 return false;
-            }
+        } else {
+            MemSet(ptr, 0, ref->size);
+        }
 
-            Napi::Function func = value.As<Napi::Function>();
+        if (directions & 2) {
+            OutArgument *out = out_arguments.AppendDefault();
 
-            void *ptr = ReserveTrampoline(type->ref.proto, func);
-            if (!ptr) [[unlikely]]
-                return false;
+            napi_status status = napi_create_reference(env, value, 1, &out->ref);
+            K_ASSERT(status == napi_ok);
 
-            *out_ptr = (void *)ptr;
-            return true;
-        } break;
+            out->kind = OutArgument::Kind::Object;
+            out->ptr = ptr;
+            out->type = ref;
+            out->max_len = -1;
+        }
 
-        case napi_number: {
-            Napi::Number number = value.As<Napi::Number>();
-            intptr_t ptr = (intptr_t)number.Int32Value();
+        *out_ptr = ptr;
+        return true;
+    } else if (value.IsString()) {
+        K_ASSERT(type->primitive == PrimitiveKind::Pointer);
 
-            *out_ptr = (void *)ptr;
-            return true;
-        } break;
+        if (directions & 2) [[unlikely]]
+            goto unexpected;
 
-        case napi_bigint: {
-            Napi::BigInt bigint = value.As<Napi::BigInt>();
+        if (ref == instance->void_type) {
+            PushStringValue(value, (const char **)out_ptr);
+            return true;
+        } else if (ref->primitive == PrimitiveKind::Int8) {
+            PushStringValue(value, (const char **)out_ptr);
+            return true;
+        } else if (ref->primitive == PrimitiveKind::Int16) {
+            PushString16Value(value, (const char16_t **)out_ptr);
+            return true;
+        } else if (ref->primitive == PrimitiveKind::Int32) {
+            PushString32Value(value, (const char32_t **)out_ptr);
+            return true;
+        } else {
+            goto unexpected;
+        }
+    } else if (value.IsFunction()) {
+        if (type->primitive != PrimitiveKind::Callback) [[unlikely]] {
+            ThrowError<Napi::TypeError>(env, "Cannot pass function to type %1", type->name);
+            return false;
+        }
 
-            bool lossless;
-            intptr_t ptr = (intptr_t)bigint.Int64Value(&lossless);
+        Napi::Function func = value.As<Napi::Function>();
 
-            *out_ptr = (void *)ptr;
-            return true;
-        } break;
+        void *ptr = ReserveTrampoline(type->ref.proto, func);
+        if (!ptr) [[unlikely]]
+            return false;
 
-        default: {} break;
+        *out_ptr = (void *)ptr;
+        return true;
     }
 
 unexpected:
@@ -1080,7 +898,18 @@ unexpected:
 
 bool CallData::PushCallback(Napi::Value value, const TypeInfo *type, void **out_ptr)
 {
-    if (value.IsFunction()) {
+    if (CheckValueTag(value, &CastMarker)) {
+        Napi::External<ValueCast> external = value.As<Napi::External<ValueCast>>();
+        ValueCast *cast = external.Data();
+
+        value = cast->ref.Value();
+        type = cast->type;
+    }
+
+    if (void *ptr = nullptr; TryPointer(value, &ptr)) {
+        *out_ptr = ptr;
+        return true;
+    } else if (value.IsFunction()) {
         Napi::Function func = value.As<Napi::Function>();
 
         void *ptr = ReserveTrampoline(type->ref.proto, func);
@@ -1088,27 +917,9 @@ bool CallData::PushCallback(Napi::Value value, const TypeInfo *type, void **out_
             return false;
 
         *out_ptr = ptr;
-    } else if (CheckValueTag(value, type->ref.marker)) {
-        *out_ptr = value.As<Napi::External<void>>().Data();
-    } else if (CheckValueTag(value, &CastMarker)) {
-        Napi::External<ValueCast> external = value.As<Napi::External<ValueCast>>();
-        ValueCast *cast = external.Data();
-
-        value = cast->ref.Value();
-
-        if (!value.IsExternal() || cast->type != type)
-            goto unexpected;
-
-        *out_ptr = value.As<Napi::External<void>>().Data();
-    } else if (IsNullOrUndefined(value)) {
-        *out_ptr = nullptr;
-    } else {
-        goto unexpected;
+        return true;
     }
 
-    return true;
-
-unexpected:
     ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);
     return false;
 }
@@ -1166,7 +977,7 @@ void *CallData::ReserveTrampoline(const FunctionInfo *proto, Napi::Function func
     trampoline->recv.Reset();
     trampoline->generation = (int32_t)mem->generation;
 
-    void *ptr = GetTrampoline(idx, proto);
+    void *ptr = GetTrampoline(idx);
 
     return ptr;
 }
@@ -1200,14 +1011,14 @@ bool CallData::CheckDynamicLength(Napi::Object obj, Size element, const char *co
     {
         Napi::Value by = obj.Get(countedby);
 
-        if (!by.IsNumber() && !by.IsBigInt()) [[unlikely]] {
+        if (!TryNumber(by, &expected)) [[unlikely]] {
             ThrowError<Napi::Error>(env, "Unexpected %1 value for dynamic length, expected number", GetValueType(instance, by));
             return false;
         }
 
         // If we get anywhere near overflow there are other problems to worry about.
         // So let's not worry about that.
-        expected = GetNumber<int64_t>(by) * element;
+        expected *= element;
     }
 
     // Get actual size
@@ -1259,9 +1070,11 @@ void CallData::PopOutArguments()
             } break;
 
             case OutArgument::Kind::Buffer: {
-                K_ASSERT(IsRawBuffer(value));
+                Span<uint8_t> buffer;
+
+                bool success = TryBuffer(value, &buffer);
+                K_ASSERT(success);
 
-                Span<uint8_t> buffer = GetRawBuffer(value);
                 DecodeBuffer(buffer, out.ptr, out.type);
             } break;
 
@@ -1315,4 +1128,9 @@ void CallData::PopOutArguments()
     }
 }
 
+void *GetTrampoline(int16_t idx)
+{
+    return Trampolines[idx];
+}
+
 }