koffi 1.0.3 → 1.0.4

package/src/abi_x64_sysv.cc

@@ -181,34 +181,25 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
     return true;
 }
 
-Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
+bool CallData::Prepare(const Napi::CallbackInfo &info)
 {
-    // Sanity checks
-    if (info.Length() < (uint32_t)func->parameters.len) {
-        ThrowError<Napi::TypeError>(env, "Expected %1 arguments, got %2", func->parameters.len, info.Length());
-        return env.Null();
-    }
-
-    uint8_t *return_ptr = nullptr;
     uint8_t *args_ptr = nullptr;
     uint64_t *gpr_ptr = nullptr;
     uint64_t *xmm_ptr = nullptr;
 
     // Return through registers unless it's too big
     if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
-        return env.Null();
+        return false;
     if (RG_UNLIKELY(!AllocStack(8 * 8, 8, &xmm_ptr)))
-        return env.Null();
+        return false;
     if (RG_UNLIKELY(!AllocStack(6 * 8, 8, &gpr_ptr)))
-        return env.Null();
+        return false;
     if (func->ret.use_memory) {
         if (RG_UNLIKELY(!AllocHeap(func->ret.type->size, 16, &return_ptr)))
-            return env.Null();
+            return false;
         *(uint8_t **)(gpr_ptr++) = return_ptr;
     }
 
-    LocalArray<OutObject, MaxOutParameters> out_objects;
-
     // Push arguments
     for (Size i = 0; i < func->parameters.len; i++) {
         const ParameterInfo &param = func->parameters[i];
@@ -222,7 +213,7 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
             case PrimitiveKind::Bool: {
                 if (RG_UNLIKELY(!value.IsBoolean())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argmument %2, expected boolean", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 bool b = value.As<Napi::Boolean>();
@@ -244,7 +235,7 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
             case PrimitiveKind::UInt64: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 int64_t v = CopyNumber<int64_t>(value);
@@ -257,49 +248,17 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     args_ptr += 8;
                 }
             } break;
-            case PrimitiveKind::Float32: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
-                    return env.Null();
-                }
-
-                float f = CopyNumber<float>(value);
-
-                if (RG_LIKELY(param.xmm_count)) {
-                    memcpy(xmm_ptr++, &f, 4);
-                } else {
-                    args_ptr = AlignUp(args_ptr, 4);
-                    memcpy(args_ptr, &f, 4);
-                    args_ptr += 8;
-                }
-            } break;
-            case PrimitiveKind::Float64: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
-                    return env.Null();
-                }
-
-                double d = CopyNumber<double>(value);
-
-                if (RG_LIKELY(param.xmm_count)) {
-                    memcpy(xmm_ptr++, &d, 8);
-                } else {
-                    args_ptr = AlignUp(args_ptr, 8);
-                    memcpy(args_ptr, &d, 8);
-                    args_ptr += 8;
-                }
-            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
                     str = PushString(value);
                     if (RG_UNLIKELY(!str))
-                        return env.Null();
+                        return false;
                 } else if (IsNullOrUndefined(value)) {
                     str = nullptr;
                 } else {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected string", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 if (RG_LIKELY(param.gpr_count)) {
@@ -315,12 +274,12 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                 if (RG_LIKELY(value.IsString())) {
                     str16 = PushString16(value);
                     if (RG_UNLIKELY(!str16))
-                        return env.Null();
+                        return false;
                 } else if (IsNullOrUndefined(value)) {
                     str16 = nullptr;
                 } else {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected string", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 if (RG_LIKELY(param.gpr_count)) {
@@ -340,11 +299,11 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     Napi::Object obj = value.As<Napi::Object>();
 
                     if (RG_UNLIKELY(!AllocHeap(param.type->ref->size, 16, &ptr)))
-                        return env.Null();
+                        return false;
 
                     if (param.directions & 1) {
                         if (!PushObject(obj, param.type->ref, ptr))
-                            return env.Null();
+                            return false;
                     } else {
                         memset(ptr, 0, param.type->size);
                     }
@@ -356,7 +315,7 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     ptr = nullptr;
                 } else {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected %3", GetValueType(instance, value), i + 1, param.type->name);
-                    return env.Null();
+                    return false;
                 }
 
                 if (RG_LIKELY(param.gpr_count)) {
@@ -367,11 +326,10 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     args_ptr += 8;
                 }
             } break;
-
             case PrimitiveKind::Record: {
                 if (RG_UNLIKELY(!IsObject(value))) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected object", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 Napi::Object obj = value.As<Napi::Object>();
@@ -381,7 +339,7 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
 
                     uint64_t buf[2] = {};
                     if (!PushObject(obj, param.type, (uint8_t *)buf))
-                        return env.Null();
+                        return false;
 
                     if (param.gpr_first) {
                         uint64_t *ptr = buf;
@@ -405,112 +363,129 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                 } else if (param.use_memory) {
                     args_ptr = AlignUp(args_ptr, param.type->align);
                     if (!PushObject(obj, param.type, args_ptr))
-                        return env.Null();
+                        return false;
                     args_ptr += AlignLen(param.type->size, 8);
                 }
             } break;
+            case PrimitiveKind::Float32: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
+                    return false;
+                }
+
+                float f = CopyNumber<float>(value);
+
+                if (RG_LIKELY(param.xmm_count)) {
+                    memcpy(xmm_ptr++, &f, 4);
+                } else {
+                    args_ptr = AlignUp(args_ptr, 4);
+                    memcpy(args_ptr, &f, 4);
+                    args_ptr += 8;
+                }
+            } break;
+            case PrimitiveKind::Float64: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
+                    return false;
+                }
+
+                double d = CopyNumber<double>(value);
+
+                if (RG_LIKELY(param.xmm_count)) {
+                    memcpy(xmm_ptr++, &d, 8);
+                } else {
+                    args_ptr = AlignUp(args_ptr, 8);
+                    memcpy(args_ptr, &d, 8);
+                    args_ptr += 8;
+                }
+            } break;
         }
     }
 
-    if (instance->debug) {
-        DumpDebug();
-    }
+    return true;
+}
 
+void CallData::Execute()
+{
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
             auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, GetSP()) \
                                          : ForwardCall ## Suffix(func->func, GetSP())); \
-            PopOutArguments(out_objects); \
             return ret; \
         })()
 
     // Execute and convert return value
     switch (func->ret.type->primitive) {
-        case PrimitiveKind::Void: {
-            PERFORM_CALL(GG);
-            return env.Null();
-        } break;
-        case PrimitiveKind::Bool: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-            return Napi::Boolean::New(env, ret.rax);
-        } break;
+        case PrimitiveKind::Void:
+        case PrimitiveKind::Bool:
         case PrimitiveKind::Int8:
         case PrimitiveKind::UInt8:
         case PrimitiveKind::Int16:
         case PrimitiveKind::UInt16:
         case PrimitiveKind::Int32:
-        case PrimitiveKind::UInt32: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-            return Napi::Number::New(env, (double)ret.rax);
-        } break;
-        case PrimitiveKind::Int64: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-            return Napi::BigInt::New(env, (int64_t)ret.rax);
-        } break;
-        case PrimitiveKind::UInt64: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-            return Napi::BigInt::New(env, ret.rax);
-        } break;
-        case PrimitiveKind::Float32: {
-            float f = PERFORM_CALL(F);
-            return Napi::Number::New(env, (double)f);
-        } break;
-        case PrimitiveKind::Float64: {
-            Xmm0RaxRet ret = PERFORM_CALL(DG);
-            return Napi::Number::New(env, ret.xmm0);
-        } break;
-        case PrimitiveKind::String: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-            return Napi::String::New(env, (const char *)ret.rax);
-        } break;
-        case PrimitiveKind::String16: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-            return Napi::String::New(env, (const char16_t *)ret.rax);
-        } break;
-        case PrimitiveKind::Pointer: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-            void *ptr = (void *)ret.rax;
-
-            Napi::External<void> external = Napi::External<void>::New(env, ptr);
-            SetValueTag(instance, external, func->ret.type);
-
-            return external;
-        } break;
-
+        case PrimitiveKind::UInt32:
+        case PrimitiveKind::Int64: 
+        case PrimitiveKind::UInt64:
+        case PrimitiveKind::String:
+        case PrimitiveKind::String16:
+        case PrimitiveKind::Pointer: { result.u64 = PERFORM_CALL(GG).rax; } break;
         case PrimitiveKind::Record: {
             if (func->ret.gpr_first && !func->ret.xmm_count) {
                 RaxRdxRet ret = PERFORM_CALL(GG);
-
-                Napi::Object obj = PopObject(env, (const uint8_t *)&ret, func->ret.type);
-                return obj;
+                memcpy_safe(&result.buf, &ret, RG_SIZE(ret));
             } else if (func->ret.gpr_first) {
                 RaxXmm0Ret ret = PERFORM_CALL(GD);
-
-                Napi::Object obj = PopObject(env, (const uint8_t *)&ret, func->ret.type);
-                return obj;
-            } else if (func->ret.xmm_count) {
+                memcpy_safe(&result.buf, &ret, RG_SIZE(ret));
+            } else if (func->ret.xmm_count == 2) {
+                Xmm0Xmm1Ret ret = PERFORM_CALL(DD);
+                memcpy_safe(&result.buf, &ret, RG_SIZE(ret));
+            } else {
                 Xmm0RaxRet ret = PERFORM_CALL(DG);
+                memcpy_safe(&result.buf, &ret, RG_SIZE(ret));
+            }
+        } break;
+        case PrimitiveKind::Float32: { result.f = PERFORM_CALL(F); } break;
+        case PrimitiveKind::Float64: { result.d = PERFORM_CALL(DG).xmm0; } break;
+    }
 
-                Napi::Object obj = PopObject(env, (const uint8_t *)&ret, func->ret.type);
-                return obj;
-            } else if (func->ret.type->size) {
-                RG_ASSERT(return_ptr);
+#undef PERFORM_CALL
+}
 
-                RaxRdxRet ret = PERFORM_CALL(GG);
-                RG_ASSERT(ret.rax == (uint64_t)return_ptr);
+Napi::Value CallData::Complete()
+{
+    for (const OutObject &obj: out_objects) {
+        PopObject(obj.obj, obj.ptr, obj.type);
+    }
 
-                Napi::Object obj = PopObject(env, return_ptr, func->ret.type);
-                return obj;
-            } else {
-                PERFORM_CALL(GG);
+    switch (func->ret.type->primitive) {
+        case PrimitiveKind::Void: return env.Null();
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Int8:
+        case PrimitiveKind::UInt8:
+        case PrimitiveKind::Int16:
+        case PrimitiveKind::UInt16:
+        case PrimitiveKind::Int32:
+        case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)result.u32);
+        case PrimitiveKind::Int64: return Napi::BigInt::New(env, (int64_t)result.u64);
+        case PrimitiveKind::UInt64: return Napi::BigInt::New(env, result.u64);
+        case PrimitiveKind::String: return Napi::String::New(env, (const char *)result.ptr);
+        case PrimitiveKind::String16: return Napi::String::New(env, (const char16_t *)result.ptr);
+        case PrimitiveKind::Pointer: {
+            Napi::External<void> external = Napi::External<void>::New(env, result.ptr);
+            SetValueTag(instance, external, func->ret.type);
 
-                Napi::Object obj = Napi::Object::New(env);
-                return obj;
-            }
+            return external;
         } break;
-    }
+        case PrimitiveKind::Record: {
+            const uint8_t *ptr = return_ptr ? (const uint8_t *)return_ptr
+                                            : (const uint8_t *)&result.buf;
 
-#undef PERFORM_CALL
+            Napi::Object obj = PopObject(ptr, func->ret.type);
+            return obj;
+        } break;
+        case PrimitiveKind::Float32: return Napi::Number::New(env, (double)result.f);
+        case PrimitiveKind::Float64: return Napi::Number::New(env, result.d);
+    }
 
     RG_UNREACHABLE();
 }

package/src/abi_x64_win.cc

@@ -51,28 +51,19 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
     return true;
 }
 
-Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
+bool CallData::Prepare(const Napi::CallbackInfo &info)
 {
-    // Sanity checks
-    if (info.Length() < (uint32_t)func->parameters.len) {
-        ThrowError<Napi::TypeError>(env, "Expected %1 arguments, got %2", func->parameters.len, info.Length());
-        return env.Null();
-    }
-
-    uint8_t *return_ptr = nullptr;
     uint64_t *args_ptr = nullptr;
 
     // Pass return value in register or through memory
     if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
-        return env.Null();
+        return false;
     if (!func->ret.regular) {
         if (RG_UNLIKELY(!AllocHeap(func->ret.type->size, 16, &return_ptr)))
-            return env.Null();
+            return false;
         *(uint8_t **)(args_ptr++) = return_ptr;
     }
 
-    LocalArray<OutObject, MaxOutParameters> out_objects;
-
     // Push arguments
     for (Size i = 0; i < func->parameters.len; i++) {
         const ParameterInfo &param = func->parameters[i];
@@ -86,7 +77,7 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
             case PrimitiveKind::Bool: {
                 if (RG_UNLIKELY(!value.IsBoolean())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected boolean", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 bool b = value.As<Napi::Boolean>();
@@ -103,41 +94,23 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
             case PrimitiveKind::UInt64: {
                 if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 int64_t v = CopyNumber<int64_t>(value);
                 *(args_ptr++) = (uint64_t)v;
             } break;
-            case PrimitiveKind::Float32: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
-                    return env.Null();
-                }
-
-                float f = CopyNumber<float>(value);
-                *(float *)(args_ptr++) = f;
-            } break;
-            case PrimitiveKind::Float64: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
-                    return env.Null();
-                }
-
-                double d = CopyNumber<double>(value);
-                *(double *)(args_ptr++) = d;
-            } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
                     str = PushString(value);
                     if (RG_UNLIKELY(!str))
-                        return env.Null();
+                        return false;
                 } else if (IsNullOrUndefined(value)) {
                     str = nullptr;
                 } else {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected string", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 *(const char **)(args_ptr++) = str;
@@ -147,12 +120,12 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                 if (RG_LIKELY(value.IsString())) {
                     str16 = PushString16(value);
                     if (RG_UNLIKELY(!str16))
-                        return env.Null();
+                        return false;
                 } else if (IsNullOrUndefined(value)) {
                     str16 = nullptr;
                 } else {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected string", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 *(const char16_t **)(args_ptr++) = str16;
@@ -166,11 +139,11 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     Napi::Object obj = value.As<Napi::Object>();
 
                     if (RG_UNLIKELY(!AllocHeap(param.type->ref->size, 16, &ptr)))
-                        return env.Null();
+                        return false;
 
                     if (param.directions & 1) {
                         if (!PushObject(obj, param.type->ref, ptr))
-                            return env.Null();
+                            return false;
                     } else {
                         memset(ptr, 0, param.type->size);
                     }
@@ -182,16 +155,15 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     ptr = nullptr;
                 } else {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected %3", GetValueType(instance, value), i + 1, param.type->name);
-                    return env.Null();
+                    return false;
                 }
 
                 *(uint8_t **)(args_ptr++) = ptr;
             } break;
-
             case PrimitiveKind::Record: {
                 if (RG_UNLIKELY(!IsObject(value))) {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected object", GetValueType(instance, value), i + 1);
-                    return env.Null();
+                    return false;
                 }
 
                 uint8_t *ptr;
@@ -199,93 +171,105 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     ptr = (uint8_t *)(args_ptr++);
                 } else {
                     if (RG_UNLIKELY(!AllocHeap(param.type->size, 16, &ptr)))
-                        return env.Null();
+                        return false;
                     *(uint8_t **)(args_ptr++) = ptr;
                 }
 
                 Napi::Object obj = value.As<Napi::Object>();
                 if (!PushObject(obj, param.type, ptr))
-                    return env.Null();
+                    return false;
+            } break;
+            case PrimitiveKind::Float32: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
+                    return false;
+                }
+
+                float f = CopyNumber<float>(value);
+                *(float *)(args_ptr++) = f;
+            } break;
+            case PrimitiveKind::Float64: {
+                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), i + 1);
+                    return false;
+                }
+
+                double d = CopyNumber<double>(value);
+                *(double *)(args_ptr++) = d;
             } break;
         }
     }
 
-    if (instance->debug) {
-        DumpDebug();
-    }
+    return true;
+}
 
+void CallData::Execute()
+{
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
             auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, GetSP()) \
                                          : ForwardCall ## Suffix(func->func, GetSP())); \
-            PopOutArguments(out_objects); \
             return ret; \
         })()
 
-    // Execute and convert return value
     switch (func->ret.type->primitive) {
-        case PrimitiveKind::Void: {
-            PERFORM_CALL(G);
-            return env.Null();
-        } break;
-        case PrimitiveKind::Bool: {
-            uint64_t rax = PERFORM_CALL(G);
-            return Napi::Boolean::New(env, rax);
-        } break;
+        case PrimitiveKind::Void:
+        case PrimitiveKind::Bool:
         case PrimitiveKind::Int8:
         case PrimitiveKind::UInt8:
         case PrimitiveKind::Int16:
         case PrimitiveKind::UInt16:
         case PrimitiveKind::Int32:
-        case PrimitiveKind::UInt32: {
-            uint64_t rax = PERFORM_CALL(G);
-            return Napi::Number::New(env, (double)rax);
-        } break;
-        case PrimitiveKind::Int64: {
-            uint64_t rax = PERFORM_CALL(G);
-            return Napi::BigInt::New(env, (int64_t)rax);
-        } break;
-        case PrimitiveKind::UInt64: {
-            uint64_t rax = PERFORM_CALL(G);
-            return Napi::BigInt::New(env, rax);
-        } break;
-        case PrimitiveKind::Float32: {
-            float f = PERFORM_CALL(F);
-            return Napi::Number::New(env, (double)f);
-        } break;
-        case PrimitiveKind::Float64: {
-            double d = PERFORM_CALL(D);
-            return Napi::Number::New(env, d);
-        } break;
-        case PrimitiveKind::String: {
-            uint64_t rax = PERFORM_CALL(G);
-            return Napi::String::New(env, (const char *)rax);
-        } break;
-        case PrimitiveKind::String16: {
-            uint64_t rax = PERFORM_CALL(G);
-            return Napi::String::New(env, (const char16_t *)rax);
-        } break;
-        case PrimitiveKind::Pointer: {
-            uint64_t rax = PERFORM_CALL(G);
-            void *ptr = (void *)rax;
+        case PrimitiveKind::UInt32:
+        case PrimitiveKind::Int64:
+        case PrimitiveKind::UInt64:
+        case PrimitiveKind::String:
+        case PrimitiveKind::String16:
+        case PrimitiveKind::Pointer:
+        case PrimitiveKind::Record: { result.u64 = PERFORM_CALL(G); } break;
+        case PrimitiveKind::Float32: { result.f = PERFORM_CALL(F); } break;
+        case PrimitiveKind::Float64: { result.d = PERFORM_CALL(D); } break;
+    }
 
-            Napi::External<void> external = Napi::External<void>::New(env, ptr);
+#undef PERFORM_CALL
+}
+
+Napi::Value CallData::Complete()
+{
+    for (const OutObject &obj: out_objects) {
+        PopObject(obj.obj, obj.ptr, obj.type);
+    }
+
+    switch (func->ret.type->primitive) {
+        case PrimitiveKind::Void: return env.Null();
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Int8:
+        case PrimitiveKind::UInt8:
+        case PrimitiveKind::Int16:
+        case PrimitiveKind::UInt16:
+        case PrimitiveKind::Int32:
+        case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)result.u32);
+        case PrimitiveKind::Int64: return Napi::BigInt::New(env, (int64_t)result.u64);
+        case PrimitiveKind::UInt64: return Napi::BigInt::New(env, result.u64);
+        case PrimitiveKind::String: return Napi::String::New(env, (const char *)result.ptr);
+        case PrimitiveKind::String16: return Napi::String::New(env, (const char16_t *)result.ptr);
+        case PrimitiveKind::Pointer: {
+            Napi::External<void> external = Napi::External<void>::New(env, result.ptr);
             SetValueTag(instance, external, func->ret.type);
 
             return external;
         } break;
-
         case PrimitiveKind::Record: {
-            uint64_t rax = PERFORM_CALL(G);
-            const uint8_t *ptr = return_ptr ? return_ptr : (const uint8_t *)&rax;
+            const uint8_t *ptr = return_ptr ? (const uint8_t *)return_ptr
+                                            : (const uint8_t *)&result.buf;
 
-            Napi::Object obj = PopObject(env, ptr, func->ret.type);
+            Napi::Object obj = PopObject(ptr, func->ret.type);
             return obj;
         } break;
+        case PrimitiveKind::Float32: return Napi::Number::New(env, (double)result.f);
+        case PrimitiveKind::Float64: return Napi::Number::New(env, result.d);
     }
 
-#undef PERFORM_CALL
-
     RG_UNREACHABLE();
 }