koffi 3.0.1 → 3.1.0

package/src/koffi/src/abi/x64sysv.cc

@@ -6,6 +6,7 @@
 #include "lib/native/base/base.hh"
 #include "../ffi.hh"
 #include "../call.hh"
+#include "../type.hh"
 #include "../util.hh"
 
 #include <napi.h>
@@ -683,13 +684,8 @@ namespace {
     OP(PushAggregateReg) {
         napi_value arg = args[inst->a];
 
-        if (!IsObject(call->env, arg)) [[unlikely]] {
-            ThrowError<Napi::TypeError>(call->env, "Unexpected %1 value, expected object", GetValueType(call->instance, args[inst->a]));
-            return call->env.Null();
-        }
-
         uint64_t buf[2];
-        if (!call->PushObject(arg, inst->type, (uint8_t *)buf))
+        if (!call->PushObject(arg, inst->type, (uint8_t *)buf)) [[unlikely]]
             return call->env.Null();
 
         // The second part might be useless (if object fits in one register), in
@@ -704,12 +700,7 @@ namespace {
     OP(PushAggregateStack) {
         napi_value arg = args[inst->a];
 
-        if (!IsObject(call->env, arg)) [[unlikely]] {
-            ThrowError<Napi::TypeError>(call->env, "Unexpected %1 value, expected object", GetValueType(call->instance, arg));
-            return call->env.Null();
-        }
-
-        if (!call->PushObject(arg, inst->type, base + inst->b1))
+        if (!call->PushObject(arg, inst->type, base + inst->b1)) [[unlikely]]
             return call->env.Null();
 
         NEXT();
@@ -733,7 +724,7 @@ namespace {
 #define DISPOSE(Ptr) \
         do { \
             if (inst->type->dispose) { \
-                inst->type->dispose(call->env, inst->type, (Ptr)); \
+                inst->type->dispose(call->instance, inst->type, (Ptr)); \
             } \
         } while (false)
 
@@ -761,42 +752,42 @@ namespace {
     OP(RunUInt64S) { INTEGER_SWAP(GG, uint64_t); }
     OP(RunString) {
         uint64_t rax = WRAP(ForwardCallGG(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? Napi::String::New(call->env, (const char *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString16) {
         uint64_t rax = WRAP(ForwardCallGG(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? Napi::String::New(call->env, (const char16_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char16_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString32) {
         uint64_t rax = WRAP(ForwardCallGG(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? MakeStringFromUTF32(call->env, (const char32_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char32_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunPointer) {
         uint64_t rax = WRAP(ForwardCallGG(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        napi_value value = WrapPointer(call->env, inst->type, (void *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunCallback) {
         uint64_t rax = WRAP(ForwardCallGG(call->native, base, &call->saved_sp).rax);
-        return rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        return WrapPointer(call->env, inst->type, (void *)rax);
     }
     OP(RunRecord) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunUnion) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunArray) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunFloat32) {
         float f = WRAP(ForwardCallF(call->native, base, &call->saved_sp));
-        return Napi::Number::New(call->env, (double)f);
+        return NewFloat(call->env, f);
     }
     OP(RunFloat64) {
         double d = WRAP(ForwardCallDD(call->native, base, &call->saved_sp).xmm0);
-        return Napi::Number::New(call->env, d);
+        return NewFloat(call->env, d);
     }
     OP(RunPrototype) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunAggregateGG) {
@@ -845,42 +836,42 @@ namespace {
     OP(RunUInt64SX) { INTEGER_SWAP(GGX, uint64_t); }
     OP(RunStringX) {
         uint64_t rax = WRAP(ForwardCallGGX(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? Napi::String::New(call->env, (const char *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString16X) {
         uint64_t rax = WRAP(ForwardCallGGX(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? Napi::String::New(call->env, (const char16_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char16_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString32X) {
         uint64_t rax = WRAP(ForwardCallGGX(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? MakeStringFromUTF32(call->env, (const char32_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char32_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunPointerX) {
         uint64_t rax = WRAP(ForwardCallGGX(call->native, base, &call->saved_sp).rax);
-        napi_value value = rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        napi_value value = WrapPointer(call->env, inst->type, (void *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunCallbackX) {
         uint64_t rax = WRAP(ForwardCallGGX(call->native, base, &call->saved_sp).rax);
-        return rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        return WrapPointer(call->env, inst->type, (void *)rax);
     }
     OP(RunRecordX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunUnionX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunArrayX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunFloat32X) {
         float f = WRAP(ForwardCallFX(call->native, base, &call->saved_sp));
-        return Napi::Number::New(call->env, (double)f);
+        return NewFloat(call->env, f);
     }
     OP(RunFloat64X) {
         double d = WRAP(ForwardCallDDX(call->native, base, &call->saved_sp).xmm0);
-        return Napi::Number::New(call->env, d);
+        return NewFloat(call->env, d);
     }
     OP(RunPrototypeX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunAggregateGGX) {
@@ -919,7 +910,7 @@ namespace {
         do { \
             if (inst->type->dispose) { \
                 void *ptr = *(void **)base; \
-                inst->type->dispose(call->env, inst->type, ptr); \
+                inst->type->dispose(call->instance, inst->type, ptr); \
             } \
         } while (false)
 #define INTEGER(CType) \
@@ -982,42 +973,42 @@ namespace {
     OP(ReturnUInt64S) { INTEGER_SWAP(uint64_t); }
     OP(ReturnString) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? Napi::String::New(call->env, (const char *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnString16) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? Napi::String::New(call->env, (const char16_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char16_t *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnString32) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? MakeStringFromUTF32(call->env, (const char32_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char32_t *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnPointer) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        napi_value value = WrapPointer(call->env, inst->type, (void *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnCallback) {
         uint64_t rax = *(uint64_t *)base;
-        return rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        return WrapPointer(call->env, inst->type, (void *)rax);
     }
     OP(ReturnRecord) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnUnion) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnArray) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnFloat32) {
         float f = *(float *)base;
-        return Napi::Number::New(call->env, (double)f);
+        return NewFloat(call->env, f);
     }
     OP(ReturnFloat64) {
         double d = *(double *)base;
-        return Napi::Number::New(call->env, d);
+        return NewFloat(call->env, d);
     }
     OP(ReturnPrototype) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnAggregateReg) { return DecodeObject(call->instance, base, inst->type); }
@@ -1187,30 +1178,30 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 const uint8_t *src = in_ptr + param.abi.offsets[0];
                 const char *str = *(const char **)src;
 
-                arguments[i] = str ? Napi::String::New(env, str) : env.Null();
+                arguments[i] = NewString(env, str);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, str);
+                    param.type->dispose(instance, param.type, str);
                 }
             } break;
             case PrimitiveKind::String16: {
                 const uint8_t *src = in_ptr + param.abi.offsets[0];
                 const char16_t *str16 = *(const char16_t **)src;
 
-                arguments[i] = str16 ? Napi::String::New(env, str16) : env.Null();
+                arguments[i] = NewString(env, str16);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, str16);
+                    param.type->dispose(instance, param.type, str16);
                 }
             } break;
             case PrimitiveKind::String32: {
                 const uint8_t *src = in_ptr + param.abi.offsets[0];
                 const char32_t *str32 = *(const char32_t **)src;
 
-                arguments[i] = str32 ? MakeStringFromUTF32(env, str32) : env.Null();
+                arguments[i] = NewString(env, str32);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, str32);
+                    param.type->dispose(instance, param.type, str32);
                 }
             } break;
 
@@ -1218,10 +1209,10 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 const uint8_t *src = in_ptr + param.abi.offsets[0];
                 void *ptr2 = *(void **)src;
 
-                arguments[i] = ptr2 ? WrapPointer(env, param.type->ref.type, ptr2) : env.Null();
+                arguments[i] = WrapPointer(env, param.type->ref.type, ptr2);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, ptr2);
+                    param.type->dispose(instance, param.type, ptr2);
                 }
             } break;
 
@@ -1243,24 +1234,20 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 const uint8_t *src = in_ptr + param.abi.offsets[0];
                 float f = *(float *)src;
 
-                arguments[i] = Napi::Number::New(env, (double)f);
+                arguments[i] = NewFloat(env, f);
             } break;
             case PrimitiveKind::Float64: {
                 const uint8_t *src = in_ptr + param.abi.offsets[0];
                 double d = *(double *)src;
 
-                arguments[i] = Napi::Number::New(env, d);
+                arguments[i] = NewFloat(env, d);
             } break;
 
             case PrimitiveKind::Callback: {
                 const uint8_t *src = in_ptr + param.abi.offsets[0];
                 void *ptr2 = *(void **)src;
 
-                arguments[i] = ptr2 ? WrapPointer(env, param.type->ref.type, ptr2) : env.Null();
-
-                if (param.type->dispose) {
-                    param.type->dispose(env, param.type, ptr2);
-                }
+                arguments[i] = WrapPointer(env, param.type->ref.type, ptr2);
             } break;
 
             case PrimitiveKind::Prototype: { K_UNREACHABLE(); } break;
@@ -1360,16 +1347,11 @@ void CallData::Relay(Size idx, uint8_t *sp)
 
         case PrimitiveKind::Record:
         case PrimitiveKind::Union: {
-            if (!IsObject(env, value)) [[unlikely]] {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
-                return;
-            }
-
             if (proto->ret.abi.method == AbiMethod::Stack) {
                 uint64_t *gpr_ptr = (uint64_t *)in_ptr;
                 uint8_t *dest = (uint8_t *)gpr_ptr[0];
 
-                if (!PushObject(value, type, dest))
+                if (!PushObject(value, type, dest)) [[unlikely]]
                     return;
 
                 out_reg->rax = (uint64_t)dest;
@@ -1377,7 +1359,7 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 K_ASSERT(type->size <= 16);
 
                 uint8_t buf[16] = {};
-                if (!PushObject(value, type, buf))
+                if (!PushObject(value, type, buf)) [[unlikely]]
                     return;
 
                 switch (proto->ret.abi.method) {

package/src/koffi/src/abi/x64win.cc

@@ -6,6 +6,7 @@
 #include "lib/native/base/base.hh"
 #include "../ffi.hh"
 #include "../call.hh"
+#include "../type.hh"
 #include "../util.hh"
 #include "../win32.hh"
 
@@ -73,16 +74,16 @@ inline void *Code2Op(AbiOpcode code)
 
 bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 {
-    func->ret.regular = IsRegularSize(func->ret.type->size, 8);
+    func->ret.abi.regular = IsRegularSize(func->ret.type->size, 8);
 
     for (Size i = 0; i < func->parameters.len; i++) {
-        int16_t arg = (int16_t)(!func->ret.regular + i);
+        int16_t arg = (int16_t)(!func->ret.abi.regular + i);
         ParameterInfo &param = func->parameters[i];
 
-        param.regular = IsRegularSize(param.type->size, 8);
+        param.abi.regular = IsRegularSize(param.type->size, 8);
 
         if (param.type->primitive == PrimitiveKind::Record || param.type->primitive == PrimitiveKind::Union) {
-            AbiOpcode code = param.regular ? AbiOpcode::PushAggregateReg : AbiOpcode::PushAggregateMem;
+            AbiOpcode code = param.abi.regular ? AbiOpcode::PushAggregateReg : AbiOpcode::PushAggregateMem;
 
             func->sync.Append({ .op = Code2Op(code), .a = param.offset, .b1 = (int16_t)(arg * 8), .b2 = (int16_t)param.directions, .type = param.type });
             func->async.Append({ .op = Code2Op(code), .a = param.offset, .b1 = (int16_t)(arg * 8), .b2 = (int16_t)param.directions, .type = param.type });
@@ -99,7 +100,7 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 
     // At least 4 parameter registers
     {
-        Size count = std::max((Size)4, func->parameters.len + !func->ret.regular);
+        Size count = std::max((Size)4, func->parameters.len + !func->ret.abi.regular);
         func->stk_size = AlignLen(8 * count, 16);
     }
 
@@ -167,7 +168,7 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
 
         case PrimitiveKind::Record:
         case PrimitiveKind::Union: {
-            if (func->ret.regular) {
+            if (func->ret.abi.regular) {
                 AbiOpcode run = func->forward_fp ? AbiOpcode::RunAggregateRegX : AbiOpcode::RunAggregateReg;
                 AbiOpcode call = func->forward_fp ? AbiOpcode::CallGX : AbiOpcode::CallG;
 
@@ -369,14 +370,9 @@ namespace {
     OP(PushAggregateReg) {
         napi_value arg = args[inst->a];
 
-        if (!IsObject(call->env, arg)) [[unlikely]] {
-            ThrowError<Napi::TypeError>(call->env, "Unexpected %1 value, expected object", GetValueType(call->instance, arg));
-            return call->env.Null();
-        }
-
         uint8_t *ptr = (uint8_t *)(base + inst->b1);
 
-        if (!call->PushObject(arg, inst->type, ptr))
+        if (!call->PushObject(arg, inst->type, ptr)) [[unlikely]]
             return call->env.Null();
 
         NEXT();
@@ -384,15 +380,10 @@ namespace {
     OP(PushAggregateMem) {
         napi_value arg = args[inst->a];
 
-        if (!IsObject(call->env, arg)) [[unlikely]] {
-            ThrowError<Napi::TypeError>(call->env, "Unexpected %1 value, expected object", GetValueType(call->instance, arg));
-            return call->env.Null();
-        }
-
         uint8_t *ptr = call->AllocHeap(inst->type->size);
         *(uint8_t **)(base + inst->b1) = ptr;
 
-        if (!call->PushObject(arg, inst->type, ptr))
+        if (!call->PushObject(arg, inst->type, ptr)) [[unlikely]]
             return call->env.Null();
 
         NEXT();
@@ -414,7 +405,7 @@ namespace {
 #define DISPOSE(Ptr) \
         do { \
             if (inst->type->dispose) { \
-                inst->type->dispose(call->env, inst->type, (Ptr)); \
+                inst->type->dispose(call->instance, inst->type, (Ptr)); \
             } \
         } while (false)
 
@@ -442,42 +433,42 @@ namespace {
     OP(RunUInt64S) { INTEGER_SWAP(G, uint64_t); }
     OP(RunString) {
         uint64_t rax = WRAP(ForwardCallG(call->native, base, &call->saved_sp));
-        napi_value value = rax ? Napi::String::New(call->env, (const char *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString16) {
         uint64_t rax = WRAP(ForwardCallG(call->native, base, &call->saved_sp));
-        napi_value value = rax ? Napi::String::New(call->env, (const char16_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char16_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString32) {
         uint64_t rax = WRAP(ForwardCallG(call->native, base, &call->saved_sp));
-        napi_value value = rax ? MakeStringFromUTF32(call->env, (const char32_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char32_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunPointer) {
         uint64_t rax = WRAP(ForwardCallG(call->native, base, &call->saved_sp));
-        napi_value value = rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        napi_value value = WrapPointer(call->env, inst->type, (void *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunCallback) {
         uint64_t rax = WRAP(ForwardCallG(call->native, base, &call->saved_sp));
-        return rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        return WrapPointer(call->env, inst->type, (void *)rax);
     }
     OP(RunRecord) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunUnion) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunArray) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunFloat32) {
         float f = WRAP(ForwardCallF(call->native, base, &call->saved_sp));
-        return Napi::Number::New(call->env, (double)f);
+        return NewFloat(call->env, f);
     }
     OP(RunFloat64) {
         double d = WRAP(ForwardCallD(call->native, base, &call->saved_sp));
-        return Napi::Number::New(call->env, d);
+        return NewFloat(call->env, d);
     }
     OP(RunPrototype) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunAggregateReg) {
@@ -513,42 +504,42 @@ namespace {
     OP(RunUInt64SX) { INTEGER_SWAP(GX, uint64_t); }
     OP(RunStringX) {
         uint64_t rax = WRAP(ForwardCallGX(call->native, base, &call->saved_sp));
-        napi_value value = rax ? Napi::String::New(call->env, (const char *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString16X) {
         uint64_t rax = WRAP(ForwardCallGX(call->native, base, &call->saved_sp));
-        napi_value value = rax ? Napi::String::New(call->env, (const char16_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char16_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunString32X) {
         uint64_t rax = WRAP(ForwardCallGX(call->native, base, &call->saved_sp));
-        napi_value value = rax ? MakeStringFromUTF32(call->env, (const char32_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char32_t *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunPointerX) {
         uint64_t rax = WRAP(ForwardCallGX(call->native, base, &call->saved_sp));
-        napi_value value = rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        napi_value value = WrapPointer(call->env, inst->type, (void *)rax);
         DISPOSE((void *)rax);
         return value;
     }
     OP(RunCallbackX) {
         uint64_t rax = WRAP(ForwardCallGX(call->native, base, &call->saved_sp));
-        return rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        return WrapPointer(call->env, inst->type, (void *)rax);
     }
     OP(RunRecordX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunUnionX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunArrayX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunFloat32X) {
         float f = WRAP(ForwardCallFX(call->native, base, &call->saved_sp));
-        return Napi::Number::New(call->env, (double)f);
+        return NewFloat(call->env, f);
     }
     OP(RunFloat64X) {
         double d = WRAP(ForwardCallDX(call->native, base, &call->saved_sp));
-        return Napi::Number::New(call->env, d);
+        return NewFloat(call->env, d);
     }
     OP(RunPrototypeX) { K_UNREACHABLE(); return call->env.Null(); }
     OP(RunAggregateRegX) {
@@ -574,7 +565,7 @@ namespace {
         do { \
             if (inst->type->dispose) { \
                 void *ptr = *(void **)base; \
-                inst->type->dispose(call->env, inst->type, ptr); \
+                inst->type->dispose(call->instance, inst->type, ptr); \
             } \
         } while (false)
 #define INTEGER(CType) \
@@ -631,42 +622,42 @@ namespace {
     OP(ReturnUInt64S) { INTEGER_SWAP(uint64_t); }
     OP(ReturnString) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? Napi::String::New(call->env, (const char *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnString16) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? Napi::String::New(call->env, (const char16_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char16_t *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnString32) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? MakeStringFromUTF32(call->env, (const char32_t *)rax) : call->env.Null();
+        napi_value value = NewString(call->env, (const char32_t *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnPointer) {
         uint64_t rax = *(uint64_t *)base;
-        napi_value value = rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        napi_value value = WrapPointer(call->env, inst->type, (void *)rax);
         DISPOSE();
         return value;
     }
     OP(ReturnCallback) {
         uint64_t rax = *(uint64_t *)base;
-        return rax ? WrapPointer(call->env, inst->type, (void *)rax) : call->env.Null();
+        return WrapPointer(call->env, inst->type, (void *)rax);
     }
     OP(ReturnRecord) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnUnion) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnArray) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnFloat32) {
         float f = *(float *)base;
-        return Napi::Number::New(call->env, (double)f);
+        return NewFloat(call->env, f);
     }
     OP(ReturnFloat64) {
         double d = *(double *)base;
-        return Napi::Number::New(call->env, d);
+        return NewFloat(call->env, d);
     }
     OP(ReturnPrototype) { K_UNREACHABLE(); return call->env.Null(); }
     OP(ReturnAggregateReg) { return DecodeObject(call->instance, base, inst->type); }
@@ -777,7 +768,7 @@ void CallData::Relay(Size idx, uint8_t *sp)
     uint64_t *xmm_ptr = gpr_ptr + 4;
     uint64_t *stk_ptr = (uint64_t *)caller_sp;
 
-    uint8_t *return_ptr = !proto->ret.regular ? (uint8_t *)gpr_ptr[0] : nullptr;
+    uint8_t *return_ptr = !proto->ret.abi.regular ? (uint8_t *)gpr_ptr[0] : nullptr;
 
     K_DEFER_N(err_guard) {
         trampoline->state = -1;
@@ -888,56 +879,52 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 const char *str = *(const char **)(j < 4 ? gpr_ptr + j : stk_ptr);
                 stk_ptr += (j >= 4);
 
-                arguments[i] = str ? Napi::String::New(env, str) : env.Null();
+                arguments[i] = NewString(env, str);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, str);
+                    param.type->dispose(instance, param.type, str);
                 }
             } break;
             case PrimitiveKind::String16: {
                 const char16_t *str16 = *(const char16_t **)(j < 4 ? gpr_ptr + j : stk_ptr);
                 stk_ptr += (j >= 4);
 
-                arguments[i] = str16 ? Napi::String::New(env, str16) : env.Null();
+                arguments[i] = NewString(env, str16);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, str16);
+                    param.type->dispose(instance, param.type, str16);
                 }
             } break;
             case PrimitiveKind::String32: {
                 const char32_t *str32 = *(const char32_t **)(j < 4 ? gpr_ptr + j : stk_ptr);
                 stk_ptr += (j >= 4);
 
-                arguments[i] = str32 ? MakeStringFromUTF32(env, str32) : env.Null();
+                arguments[i] = NewString(env, str32);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, str32);
+                    param.type->dispose(instance, param.type, str32);
                 }
             } break;
             case PrimitiveKind::Pointer: {
                 void *ptr2 = *(void **)(j < 4 ? gpr_ptr + j : stk_ptr);
                 stk_ptr += (j >= 4);
 
-                arguments[i] = ptr2 ? WrapPointer(env, param.type->ref.type, ptr2) : env.Null();
+                arguments[i] = WrapPointer(env, param.type->ref.type, ptr2);
 
                 if (param.type->dispose) {
-                    param.type->dispose(env, param.type, ptr2);
+                    param.type->dispose(instance, param.type, ptr2);
                 }
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr2 = *(void **)(j < 4 ? gpr_ptr + j : stk_ptr);
                 stk_ptr += (j >= 4);
 
-                arguments[i] = ptr2 ? WrapPointer(env, param.type->ref.type, ptr2) : env.Null();
-
-                if (param.type->dispose) {
-                    param.type->dispose(env, param.type, ptr2);
-                }
+                arguments[i] = WrapPointer(env, param.type->ref.type, ptr2);
             } break;
             case PrimitiveKind::Record:
             case PrimitiveKind::Union: {
                 uint8_t *ptr;
-                if (param.regular) {
+                if (param.abi.regular) {
                     ptr = (uint8_t *)(j < 4 ? gpr_ptr + j : stk_ptr);
                 } else {
                     ptr = *(uint8_t **)(j < 4 ? gpr_ptr + j : stk_ptr);
@@ -951,13 +938,13 @@ void CallData::Relay(Size idx, uint8_t *sp)
                 float f = *(float *)(j < 4 ? xmm_ptr + j : stk_ptr);
                 stk_ptr += (j >= 4);
 
-                arguments[i] = Napi::Number::New(env, (double)f);
+                arguments[i] = NewFloat(env, f);
             } break;
             case PrimitiveKind::Float64: {
                 double d = *(double *)(j < 4 ? xmm_ptr + j : stk_ptr);
                 stk_ptr += (j >= 4);
 
-                arguments[i] = Napi::Number::New(env, d);
+                arguments[i] = NewFloat(env, d);
             } break;
 
             case PrimitiveKind::Prototype: { K_UNREACHABLE(); } break;
@@ -1048,17 +1035,13 @@ void CallData::Relay(Size idx, uint8_t *sp)
         } break;
         case PrimitiveKind::Record:
         case PrimitiveKind::Union: {
-            if (!IsObject(env, value)) [[unlikely]] {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected object", GetValueType(instance, value));
-                return;
-            }
-
             if (return_ptr) {
-                if (!PushObject(value, type, return_ptr))
+                if (!PushObject(value, type, return_ptr)) [[unlikely]]
                     return;
                 out_reg->rax = (uint64_t)return_ptr;
             } else {
-                PushObject(value, type, (uint8_t *)&out_reg->rax);
+                if (!PushObject(value, type, (uint8_t *)&out_reg->rax)) [[unlikely]]
+                    return;
             }
         } break;
         case PrimitiveKind::Array: { K_UNREACHABLE(); } break;