koffi 1.0.3 → 1.0.4

package/src/abi_arm64.cc

@@ -163,28 +163,24 @@ static bool PushHFA(const Napi::Object &obj, const TypeInfo *type, uint8_t *dest
     InstanceData *instance = env.GetInstanceData<InstanceData>();
 
     RG_ASSERT(IsObject(obj));
+    RG_ASSERT(IsHFA(type));
     RG_ASSERT(type->primitive == PrimitiveKind::Record);
-    RG_ASSERT(AlignUp(dest, 8) == dest);
+    RG_ASSERT(AlignUp(dest, type->members[0].type->size) == dest);
+
+    bool float32 = (type->members[0].type->primitive == PrimitiveKind::Float32);
 
     for (const RecordMember &member: type->members) {
         Napi::Value value = obj.Get(member.name);
 
-        if (member.type->primitive == PrimitiveKind::Float32) {
-            if (!value.IsNumber() && !value.IsBigInt()) {
-                ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected number", GetValueType(instance, value), member.name);
-                return false;
-            }
+        if (!value.IsNumber() && !value.IsBigInt()) {
+            ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected number", GetValueType(instance, value), member.name);
+            return false;
+        }
 
+        if (float32) {
             *(float *)dest = CopyNumber<float>(value);
-        } else if (member.type->primitive == PrimitiveKind::Float64) {
-            if (!value.IsNumber() && !value.IsBigInt()) {
-                ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected number", GetValueType(instance, value), member.name);
-                return false;
-            }
-
-            *(double *)dest = CopyNumber<double>(value);
         } else {
-            RG_UNREACHABLE();
+            *(double *)dest = CopyNumber<double>(value);
         }
 
         dest += 8;
@@ -196,18 +192,19 @@ static bool PushHFA(const Napi::Object &obj, const TypeInfo *type, uint8_t *dest
 static Napi::Object PopHFA(napi_env env, const uint8_t *ptr, const TypeInfo *type)
 {
     RG_ASSERT(type->primitive == PrimitiveKind::Record);
+    RG_ASSERT(IsHFA(type));
 
     Napi::Object obj = Napi::Object::New(env);
 
+    bool float32 = (type->members[0].type->primitive == PrimitiveKind::Float32);
+
     for (const RecordMember &member: type->members) {
-        if (member.type->primitive == PrimitiveKind::Float32) {
+        if (float32) {
             float f = *(float *)ptr;
             obj.Set(member.name, Napi::Number::New(env, (double)f));
-        } else if (member.type->primitive == PrimitiveKind::Float64) {
+        } else {
             double d = *(double *)ptr;
             obj.Set(member.name, Napi::Number::New(env, d));
-        } else {
-            RG_UNREACHABLE();
         }
 
         ptr += 8;
@@ -216,34 +213,25 @@ static Napi::Object PopHFA(napi_env env, const uint8_t *ptr, const TypeInfo *typ
     return obj;
 }
 
-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 *vec_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, &vec_ptr)))
-        return env.Null();
+        return false;
     if (RG_UNLIKELY(!AllocStack(9 * 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;
         gpr_ptr[8] = (uint64_t)return_ptr;
     }
 
-    LocalArray<OutObject, MaxOutParameters> out_objects;
-
     // Push arguments
     for (Size i = 0; i < func->parameters.len; i++) {
         const ParameterInfo &param = func->parameters[i];
@@ -257,7 +245,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>();
@@ -283,7 +271,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);
@@ -303,7 +291,7 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
             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();
+                    return false;
                 }
 
                 float f = CopyNumber<float>(value);
@@ -323,7 +311,7 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
             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();
+                    return false;
                 }
 
                 double d = CopyNumber<double>(value);
@@ -341,12 +329,12 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                 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)) {
@@ -362,12 +350,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)) {
@@ -387,11 +375,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);
                     }
@@ -403,7 +391,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)) {
@@ -418,32 +406,32 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
             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>();
 
                 if (param.vec_count) {
                     if (!PushHFA(obj, param.type, (uint8_t *)vec_ptr))
-                        return env.Null();
+                        return false;
                     vec_ptr += param.vec_count;
                 } else if (!param.use_memory) {
                     if (param.gpr_count) {
                         RG_ASSERT(param.type->align <= 8);
 
                         if (!PushObject(obj, param.type, (uint8_t *)gpr_ptr))
-                            return env.Null();
+                            return false;
                         gpr_ptr += param.gpr_count;
                     } else if (param.type->size) {
                         args_ptr = AlignUp(args_ptr, 8);
                         if (!PushObject(obj, param.type, args_ptr))
-                            return env.Null();
+                            return false;
                         args_ptr += AlignLen(param.type->size, 8);
                     }
                 } else {
                     uint8_t *ptr;
                     if (RG_UNLIKELY(!AllocHeap(param.type->size, 16, &ptr)))
-                        return env.Null();
+                        return false;
 
                     if (param.gpr_count) {
                         RG_ASSERT(param.gpr_count == 1);
@@ -457,107 +445,98 @@ Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
                     }
 
                     if (!PushObject(obj, param.type, ptr))
-                        return env.Null();
+                        return false;
                 }
             } 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: {
-            X0X1Ret ret = PERFORM_CALL(GG);
-            return Napi::Boolean::New(env, ret.x0);
-        } 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: {
-            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::UInt32:
+        case PrimitiveKind::Int64:
+        case PrimitiveKind::UInt64:
+        case PrimitiveKind::String:
+        case PrimitiveKind::String16:
+        case PrimitiveKind::Pointer: { result.u64 = PERFORM_CALL(GG).x0; } break;
         case PrimitiveKind::Record: {
             if (func->ret.gpr_count) {
                 X0X1Ret 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.vec_count) {
                 HfaRet ret = PERFORM_CALL(DDDD);
+                memcpy_safe(&result.buf, &ret, RG_SIZE(ret));
+            } else {
+                PERFORM_CALL(GG);
+            }
+        } break;
+        case PrimitiveKind::Float32: { result.f = PERFORM_CALL(F); } break;
+        case PrimitiveKind::Float64: { result.d = PERFORM_CALL(DDDD).d0; } break;
+    }
 
-                Napi::Object obj = PopHFA(env, (const uint8_t *)&ret, func->ret.type);
-                return obj;
-            } else if (func->ret.type->size) {
-                RG_ASSERT(return_ptr);
+#undef PERFORM_CALL
+}
 
-                X0X1Ret ret = PERFORM_CALL(GG);
-                RG_ASSERT(ret.x0 == (uint64_t)return_ptr);
+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);
 
-                Napi::Object obj = PopObject(env, return_ptr, func->ret.type);
+            return external;
+        } break;
+        case PrimitiveKind::Record: {
+            if (func->ret.vec_count) {
+                Napi::Object obj = PopHFA(env, (const uint8_t *)&result.buf, func->ret.type);
                 return obj;
             } else {
-                PERFORM_CALL(GG);
+                const uint8_t *ptr = return_ptr ? (const uint8_t *)return_ptr
+                                                : (const uint8_t *)&result.buf;
 
-                Napi::Object obj = Napi::Object::New(env);
+                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();
 }