koffi 1.0.0 → 1.0.3

package/src/{call_arm64.cc → abi_arm64.cc}

@@ -87,6 +87,7 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
             case PrimitiveKind::Int64:
             case PrimitiveKind::UInt64:
             case PrimitiveKind::String:
+            case PrimitiveKind::String16:
             case PrimitiveKind::Pointer: {
 #ifdef __APPLE__
                 if (param.variadic)
@@ -215,11 +216,8 @@ static Napi::Object PopHFA(napi_env env, const uint8_t *ptr, const TypeInfo *typ
     return obj;
 }
 
-Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, const Napi::CallbackInfo &info)
+Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
 {
-    Napi::Env env = info.Env();
-    CallData call(env, instance, func);
-
     // Sanity checks
     if (info.Length() < (uint32_t)func->parameters.len) {
         ThrowError<Napi::TypeError>(env, "Expected %1 arguments, got %2", func->parameters.len, info.Length());
@@ -232,14 +230,14 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
     uint64_t *vec_ptr = nullptr;
 
     // Return through registers unless it's too big
-    if (RG_UNLIKELY(!call.AllocStack(func->args_size, 16, &args_ptr)))
+    if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
         return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(8 * 8, 8, &vec_ptr)))
+    if (RG_UNLIKELY(!AllocStack(8 * 8, 8, &vec_ptr)))
         return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(9 * 8, 8, &gpr_ptr)))
+    if (RG_UNLIKELY(!AllocStack(9 * 8, 8, &gpr_ptr)))
         return env.Null();
     if (func->ret.use_memory) {
-        if (RG_UNLIKELY(!call.AllocHeap(func->ret.type->size, 16, &return_ptr)))
+        if (RG_UNLIKELY(!AllocHeap(func->ret.type->size, 16, &return_ptr)))
             return env.Null();
         gpr_ptr[8] = (uint64_t)return_ptr;
     }
@@ -341,7 +339,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
-                    str = call.PushString(value);
+                    str = PushString(value);
                     if (RG_UNLIKELY(!str))
                         return env.Null();
                 } else if (IsNullOrUndefined(value)) {
@@ -359,6 +357,27 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     args_ptr += 8;
                 }
             } break;
+            case PrimitiveKind::String16: {
+                const char16_t *str16;
+                if (RG_LIKELY(value.IsString())) {
+                    str16 = PushString16(value);
+                    if (RG_UNLIKELY(!str16))
+                        return env.Null();
+                } 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();
+                }
+
+                if (RG_LIKELY(param.gpr_count)) {
+                    *(gpr_ptr++) = (uint64_t)str16;
+                } else {
+                    args_ptr = AlignUp(args_ptr, 8);
+                    *(uint64_t *)args_ptr = (uint64_t)str16;
+                    args_ptr += 8;
+                }
+            } break;
             case PrimitiveKind::Pointer: {
                 uint8_t *ptr;
 
@@ -367,11 +386,11 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 } else if (IsObject(value) && param.type->ref->primitive == PrimitiveKind::Record) {
                     Napi::Object obj = value.As<Napi::Object>();
 
-                    if (RG_UNLIKELY(!call.AllocHeap(param.type->ref->size, 16, &ptr)))
+                    if (RG_UNLIKELY(!AllocHeap(param.type->ref->size, 16, &ptr)))
                         return env.Null();
 
                     if (param.directions & 1) {
-                        if (!call.PushObject(obj, param.type->ref, ptr))
+                        if (!PushObject(obj, param.type->ref, ptr))
                             return env.Null();
                     } else {
                         memset(ptr, 0, param.type->size);
@@ -412,18 +431,18 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     if (param.gpr_count) {
                         RG_ASSERT(param.type->align <= 8);
 
-                        if (!call.PushObject(obj, param.type, (uint8_t *)gpr_ptr))
+                        if (!PushObject(obj, param.type, (uint8_t *)gpr_ptr))
                             return env.Null();
                         gpr_ptr += param.gpr_count;
                     } else if (param.type->size) {
                         args_ptr = AlignUp(args_ptr, 8);
-                        if (!call.PushObject(obj, param.type, args_ptr))
+                        if (!PushObject(obj, param.type, args_ptr))
                             return env.Null();
                         args_ptr += AlignLen(param.type->size, 8);
                     }
                 } else {
                     uint8_t *ptr;
-                    if (RG_UNLIKELY(!call.AllocHeap(param.type->size, 16, &ptr)))
+                    if (RG_UNLIKELY(!AllocHeap(param.type->size, 16, &ptr)))
                         return env.Null();
 
                     if (param.gpr_count) {
@@ -437,7 +456,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                         args_ptr += 8;
                     }
 
-                    if (!call.PushObject(obj, param.type, ptr))
+                    if (!PushObject(obj, param.type, ptr))
                         return env.Null();
                 }
             } break;
@@ -445,30 +464,69 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
     }
 
     if (instance->debug) {
-        call.DumpDebug();
+        DumpDebug();
     }
 
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, call.GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, call.GetSP())); \
+            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: {
+            X0X1Ret ret = PERFORM_CALL(GG);
+            return Napi::Boolean::New(env, ret.x0);
+        } break;
+        case PrimitiveKind::Int8:
+        case PrimitiveKind::UInt8:
+        case PrimitiveKind::Int16:
+        case PrimitiveKind::UInt16:
+        case PrimitiveKind::Int32:
+        case PrimitiveKind::UInt32: {
+            X0X1Ret ret = PERFORM_CALL(GG);
+            return Napi::Number::New(env, (double)ret.x0);
+        } break;
+        case PrimitiveKind::Int64: {
+            X0X1Ret ret = PERFORM_CALL(GG);
+            return Napi::BigInt::New(env, (int64_t)ret.x0);
+        } break;
+        case PrimitiveKind::UInt64: {
+            X0X1Ret ret = PERFORM_CALL(GG);
+            return Napi::BigInt::New(env, ret.x0);
+        } break;
         case PrimitiveKind::Float32: {
             float f = PERFORM_CALL(F);
-
             return Napi::Number::New(env, (double)f);
         } break;
-
         case PrimitiveKind::Float64: {
             HfaRet ret = PERFORM_CALL(DDDD);
-
             return Napi::Number::New(env, (double)ret.d0);
         } break;
+        case PrimitiveKind::String: {
+            X0X1Ret ret = PERFORM_CALL(GG);
+            return Napi::String::New(env, (const char *)ret.x0);
+        } break;
+        case PrimitiveKind::String16: {
+            X0X1Ret ret = PERFORM_CALL(GG);
+            return Napi::String::New(env, (const char16_t *)ret.x0);
+        } break;
+        case PrimitiveKind::Pointer: {
+            X0X1Ret ret = PERFORM_CALL(GG);
+            void *ptr = (void *)ret.x0;
+
+            Napi::External<void> external = Napi::External<void>::New(env, ptr);
+            SetValueTag(instance, external, func->ret.type);
+
+            return external;
+        } break;
 
         case PrimitiveKind::Record: {
             if (func->ret.gpr_count) {
@@ -496,36 +554,6 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 return obj;
             }
         } break;
-
-        default: {
-            X0X1Ret ret = PERFORM_CALL(GG);
-
-            switch (func->ret.type->primitive) {
-                case PrimitiveKind::Void: return env.Null();
-                case PrimitiveKind::Bool: return Napi::Boolean::New(env, ret.x0);
-                case PrimitiveKind::Int8: return Napi::Number::New(env, (double)ret.x0);
-                case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)ret.x0);
-                case PrimitiveKind::Int16: return Napi::Number::New(env, (double)ret.x0);
-                case PrimitiveKind::UInt16: return Napi::Number::New(env, (double)ret.x0);
-                case PrimitiveKind::Int32: return Napi::Number::New(env, (double)ret.x0);
-                case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)ret.x0);
-                case PrimitiveKind::Int64: return Napi::BigInt::New(env, (int64_t)ret.x0);
-                case PrimitiveKind::UInt64: return Napi::BigInt::New(env, ret.x0);
-                case PrimitiveKind::Float32: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::Float64: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::String: return Napi::String::New(env, (const char *)ret.x0);
-                case PrimitiveKind::Pointer: {
-                    void *ptr = (void *)ret.x0;
-
-                    Napi::External<void> external = Napi::External<void>::New(env, ptr);
-                    SetValueTag(instance, external, func->ret.type);
-
-                    return external;
-                } break;
-
-                case PrimitiveKind::Record: { RG_UNREACHABLE(); } break;
-            }
-        } break;
     }
 
 #undef PERFORM_CALL

package/src/{call_x64_sysv.cc → abi_x64_sysv.cc}

@@ -93,6 +93,7 @@ static Size ClassifyType(const TypeInfo *type, Size offset, Span<RegisterClass>
         case PrimitiveKind::Int64:
         case PrimitiveKind::UInt64:
         case PrimitiveKind::String:
+        case PrimitiveKind::String16:
         case PrimitiveKind::Pointer: {
             classes[0] = MergeClasses(classes[0], RegisterClass::Integer);
             return 1;
@@ -180,11 +181,8 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
     return true;
 }
 
-Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, const Napi::CallbackInfo &info)
+Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
 {
-    Napi::Env env = info.Env();
-    CallData call(env, instance, func);
-
     // Sanity checks
     if (info.Length() < (uint32_t)func->parameters.len) {
         ThrowError<Napi::TypeError>(env, "Expected %1 arguments, got %2", func->parameters.len, info.Length());
@@ -197,14 +195,14 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
     uint64_t *xmm_ptr = nullptr;
 
     // Return through registers unless it's too big
-    if (RG_UNLIKELY(!call.AllocStack(func->args_size, 16, &args_ptr)))
+    if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
         return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(8 * 8, 8, &xmm_ptr)))
+    if (RG_UNLIKELY(!AllocStack(8 * 8, 8, &xmm_ptr)))
         return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(6 * 8, 8, &gpr_ptr)))
+    if (RG_UNLIKELY(!AllocStack(6 * 8, 8, &gpr_ptr)))
         return env.Null();
     if (func->ret.use_memory) {
-        if (RG_UNLIKELY(!call.AllocHeap(func->ret.type->size, 16, &return_ptr)))
+        if (RG_UNLIKELY(!AllocHeap(func->ret.type->size, 16, &return_ptr)))
             return env.Null();
         *(uint8_t **)(gpr_ptr++) = return_ptr;
     }
@@ -294,7 +292,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
-                    str = call.PushString(value);
+                    str = PushString(value);
                     if (RG_UNLIKELY(!str))
                         return env.Null();
                 } else if (IsNullOrUndefined(value)) {
@@ -312,6 +310,27 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     args_ptr += 8;
                 }
             } break;
+            case PrimitiveKind::String16: {
+                const char16_t *str16;
+                if (RG_LIKELY(value.IsString())) {
+                    str16 = PushString16(value);
+                    if (RG_UNLIKELY(!str16))
+                        return env.Null();
+                } 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();
+                }
+
+                if (RG_LIKELY(param.gpr_count)) {
+                    *(gpr_ptr++) = (uint64_t)str16;
+                } else {
+                    args_ptr = AlignUp(args_ptr, 8);
+                    *(uint64_t *)args_ptr = (uint64_t)str16;
+                    args_ptr += 8;
+                }
+            } break;
             case PrimitiveKind::Pointer: {
                 uint8_t *ptr;
 
@@ -320,11 +339,11 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 } else if (IsObject(value) && param.type->ref->primitive == PrimitiveKind::Record) {
                     Napi::Object obj = value.As<Napi::Object>();
 
-                    if (RG_UNLIKELY(!call.AllocHeap(param.type->ref->size, 16, &ptr)))
+                    if (RG_UNLIKELY(!AllocHeap(param.type->ref->size, 16, &ptr)))
                         return env.Null();
 
                     if (param.directions & 1) {
-                        if (!call.PushObject(obj, param.type->ref, ptr))
+                        if (!PushObject(obj, param.type->ref, ptr))
                             return env.Null();
                     } else {
                         memset(ptr, 0, param.type->size);
@@ -361,7 +380,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     RG_ASSERT(param.type->size <= 16);
 
                     uint64_t buf[2] = {};
-                    if (!call.PushObject(obj, param.type, (uint8_t *)buf))
+                    if (!PushObject(obj, param.type, (uint8_t *)buf))
                         return env.Null();
 
                     if (param.gpr_first) {
@@ -385,7 +404,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     }
                 } else if (param.use_memory) {
                     args_ptr = AlignUp(args_ptr, param.type->align);
-                    if (!call.PushObject(obj, param.type, args_ptr))
+                    if (!PushObject(obj, param.type, args_ptr))
                         return env.Null();
                     args_ptr += AlignLen(param.type->size, 8);
                 }
@@ -394,30 +413,69 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
     }
 
     if (instance->debug) {
-        call.DumpDebug();
+        DumpDebug();
     }
 
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, call.GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, call.GetSP())); \
+            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::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::Record: {
             if (func->ret.gpr_first && !func->ret.xmm_count) {
@@ -450,36 +508,6 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 return obj;
             }
         } break;
-
-        default: {
-            RaxRdxRet ret = PERFORM_CALL(GG);
-
-            switch (func->ret.type->primitive) {
-                case PrimitiveKind::Void: return env.Null();
-                case PrimitiveKind::Bool: return Napi::Boolean::New(env, ret.rax);
-                case PrimitiveKind::Int8: return Napi::Number::New(env, (double)ret.rax);
-                case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)ret.rax);
-                case PrimitiveKind::Int16: return Napi::Number::New(env, (double)ret.rax);
-                case PrimitiveKind::UInt16: return Napi::Number::New(env, (double)ret.rax);
-                case PrimitiveKind::Int32: return Napi::Number::New(env, (double)ret.rax);
-                case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)ret.rax);
-                case PrimitiveKind::Int64: return Napi::BigInt::New(env, (int64_t)ret.rax);
-                case PrimitiveKind::UInt64: return Napi::BigInt::New(env, ret.rax);
-                case PrimitiveKind::Float32: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::Float64: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::String: return Napi::String::New(env, (const char *)ret.rax);
-                case PrimitiveKind::Pointer: {
-                    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::Record: { RG_UNREACHABLE(); } break;
-            }
-        } break;
     }
 
 #undef PERFORM_CALL

package/src/{call_x64_win.cc → abi_x64_win.cc}

@@ -51,11 +51,8 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
     return true;
 }
 
-Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, const Napi::CallbackInfo &info)
+Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
 {
-    Napi::Env env = info.Env();
-    CallData call(env, instance, func);
-
     // Sanity checks
     if (info.Length() < (uint32_t)func->parameters.len) {
         ThrowError<Napi::TypeError>(env, "Expected %1 arguments, got %2", func->parameters.len, info.Length());
@@ -66,10 +63,10 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
     uint64_t *args_ptr = nullptr;
 
     // Pass return value in register or through memory
-    if (RG_UNLIKELY(!call.AllocStack(func->args_size, 16, &args_ptr)))
+    if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
         return env.Null();
     if (!func->ret.regular) {
-        if (RG_UNLIKELY(!call.AllocHeap(func->ret.type->size, 16, &return_ptr)))
+        if (RG_UNLIKELY(!AllocHeap(func->ret.type->size, 16, &return_ptr)))
             return env.Null();
         *(uint8_t **)(args_ptr++) = return_ptr;
     }
@@ -133,7 +130,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
-                    str = call.PushString(value);
+                    str = PushString(value);
                     if (RG_UNLIKELY(!str))
                         return env.Null();
                 } else if (IsNullOrUndefined(value)) {
@@ -145,7 +142,21 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
 
                 *(const char **)(args_ptr++) = str;
             } break;
+            case PrimitiveKind::String16: {
+                const char16_t *str16;
+                if (RG_LIKELY(value.IsString())) {
+                    str16 = PushString16(value);
+                    if (RG_UNLIKELY(!str16))
+                        return env.Null();
+                } 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();
+                }
 
+                *(const char16_t **)(args_ptr++) = str16;
+            } break;
             case PrimitiveKind::Pointer: {
                 uint8_t *ptr;
 
@@ -154,11 +165,11 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 } else if (IsObject(value) && param.type->ref->primitive == PrimitiveKind::Record) {
                     Napi::Object obj = value.As<Napi::Object>();
 
-                    if (RG_UNLIKELY(!call.AllocHeap(param.type->ref->size, 16, &ptr)))
+                    if (RG_UNLIKELY(!AllocHeap(param.type->ref->size, 16, &ptr)))
                         return env.Null();
 
                     if (param.directions & 1) {
-                        if (!call.PushObject(obj, param.type->ref, ptr))
+                        if (!PushObject(obj, param.type->ref, ptr))
                             return env.Null();
                     } else {
                         memset(ptr, 0, param.type->size);
@@ -187,76 +198,89 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 if (param.regular) {
                     ptr = (uint8_t *)(args_ptr++);
                 } else {
-                    if (RG_UNLIKELY(!call.AllocHeap(param.type->size, 16, &ptr)))
+                    if (RG_UNLIKELY(!AllocHeap(param.type->size, 16, &ptr)))
                         return env.Null();
                     *(uint8_t **)(args_ptr++) = ptr;
                 }
 
                 Napi::Object obj = value.As<Napi::Object>();
-                if (!call.PushObject(obj, param.type, ptr))
+                if (!PushObject(obj, param.type, ptr))
                     return env.Null();
             } break;
         }
     }
 
     if (instance->debug) {
-        call.DumpDebug();
+        DumpDebug();
     }
 
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, call.GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, call.GetSP())); \
+            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::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;
+
+            Napi::External<void> external = Napi::External<void>::New(env, ptr);
+            SetValueTag(instance, external, func->ret.type);
+
+            return external;
+        } break;
 
-        default: {
+        case PrimitiveKind::Record: {
             uint64_t rax = PERFORM_CALL(G);
+            const uint8_t *ptr = return_ptr ? return_ptr : (const uint8_t *)&rax;
 
-            switch (func->ret.type->primitive) {
-                case PrimitiveKind::Void: return env.Null();
-                case PrimitiveKind::Bool: return Napi::Boolean::New(env, rax);
-                case PrimitiveKind::Int8: return Napi::Number::New(env, (double)rax);
-                case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)rax);
-                case PrimitiveKind::Int16: return Napi::Number::New(env, (double)rax);
-                case PrimitiveKind::UInt16: return Napi::Number::New(env, (double)rax);
-                case PrimitiveKind::Int32: return Napi::Number::New(env, (double)rax);
-                case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)rax);
-                case PrimitiveKind::Int64: return Napi::BigInt::New(env, (int64_t)rax);
-                case PrimitiveKind::UInt64: return Napi::BigInt::New(env, rax);
-                case PrimitiveKind::Float32: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::Float64: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::String: return Napi::String::New(env, (const char *)rax);
-                case PrimitiveKind::Pointer: {
-                    void *ptr = (void *)rax;
-
-                    Napi::External<void> external = Napi::External<void>::New(env, ptr);
-                    SetValueTag(instance, external, func->ret.type);
-
-                    return external;
-                } break;
-
-                case PrimitiveKind::Record: {
-                    const uint8_t *ptr = return_ptr ? return_ptr : (const uint8_t *)&rax;
-                    Napi::Object obj = PopObject(env, ptr, func->ret.type);
-                    return obj;
-                } break;
-            }
+            Napi::Object obj = PopObject(env, ptr, func->ret.type);
+            return obj;
         } break;
     }