koffi 1.0.1 → 1.0.4

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,37 +181,25 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
     return true;
 }
 
-Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, const Napi::CallbackInfo &info)
+bool CallData::Prepare(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());
-        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(!call.AllocStack(func->args_size, 16, &args_ptr)))
-        return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(8 * 8, 8, &xmm_ptr)))
-        return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(6 * 8, 8, &gpr_ptr)))
-        return env.Null();
+    if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
+        return false;
+    if (RG_UNLIKELY(!AllocStack(8 * 8, 8, &xmm_ptr)))
+        return false;
+    if (RG_UNLIKELY(!AllocStack(6 * 8, 8, &gpr_ptr)))
+        return false;
     if (func->ret.use_memory) {
-        if (RG_UNLIKELY(!call.AllocHeap(func->ret.type->size, 16, &return_ptr)))
-            return env.Null();
+        if (RG_UNLIKELY(!AllocHeap(func->ret.type->size, 16, &return_ptr)))
+            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];
@@ -224,7 +213,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
             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>();
@@ -246,7 +235,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
             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);
@@ -259,56 +248,45 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     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);
+            case PrimitiveKind::String: {
+                const char *str;
+                if (RG_LIKELY(value.IsString())) {
+                    str = PushString(value);
+                    if (RG_UNLIKELY(!str))
+                        return false;
+                } else if (IsNullOrUndefined(value)) {
+                    str = nullptr;
                 } 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();
+                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected string", GetValueType(instance, value), i + 1);
+                    return false;
                 }
 
-                double d = CopyNumber<double>(value);
-
-                if (RG_LIKELY(param.xmm_count)) {
-                    memcpy(xmm_ptr++, &d, 8);
+                if (RG_LIKELY(param.gpr_count)) {
+                    *(gpr_ptr++) = (uint64_t)str;
                 } else {
                     args_ptr = AlignUp(args_ptr, 8);
-                    memcpy(args_ptr, &d, 8);
+                    *(uint64_t *)args_ptr = (uint64_t)str;
                     args_ptr += 8;
                 }
             } break;
-            case PrimitiveKind::String: {
-                const char *str;
+            case PrimitiveKind::String16: {
+                const char16_t *str16;
                 if (RG_LIKELY(value.IsString())) {
-                    str = call.PushString(value);
-                    if (RG_UNLIKELY(!str))
-                        return env.Null();
+                    str16 = PushString16(value);
+                    if (RG_UNLIKELY(!str16))
+                        return false;
                 } else if (IsNullOrUndefined(value)) {
-                    str = nullptr;
+                    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)) {
-                    *(gpr_ptr++) = (uint64_t)str;
+                    *(gpr_ptr++) = (uint64_t)str16;
                 } else {
                     args_ptr = AlignUp(args_ptr, 8);
-                    *(uint64_t *)args_ptr = (uint64_t)str;
+                    *(uint64_t *)args_ptr = (uint64_t)str16;
                     args_ptr += 8;
                 }
             } break;
@@ -320,12 +298,12 @@ 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)))
-                        return env.Null();
+                    if (RG_UNLIKELY(!AllocHeap(param.type->ref->size, 16, &ptr)))
+                        return false;
 
                     if (param.directions & 1) {
-                        if (!call.PushObject(obj, param.type->ref, ptr))
-                            return env.Null();
+                        if (!PushObject(obj, param.type->ref, ptr))
+                            return false;
                     } else {
                         memset(ptr, 0, param.type->size);
                     }
@@ -337,7 +315,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     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)) {
@@ -348,11 +326,10 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     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>();
@@ -361,8 +338,8 @@ 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))
-                        return env.Null();
+                    if (!PushObject(obj, param.type, (uint8_t *)buf))
+                        return false;
 
                     if (param.gpr_first) {
                         uint64_t *ptr = buf;
@@ -385,105 +362,131 @@ 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))
-                        return env.Null();
+                    if (!PushObject(obj, param.type, args_ptr))
+                        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) {
-        call.DumpDebug();
-    }
+    return true;
+}
 
+void CallData::Execute()
+{
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, call.GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, call.GetSP())); \
-            PopOutArguments(out_objects); \
+            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, GetSP()) \
+                                         : ForwardCall ## Suffix(func->func, GetSP())); \
             return ret; \
         })()
 
     // Execute and convert return value
     switch (func->ret.type->primitive) {
-        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::Void:
+        case PrimitiveKind::Bool:
+        case PrimitiveKind::Int8:
+        case PrimitiveKind::UInt8:
+        case PrimitiveKind::Int16:
+        case PrimitiveKind::UInt16:
+        case PrimitiveKind::Int32:
+        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;
 
-        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;
-            }
+            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();
 }