koffi 1.0.1 → 1.0.4

package/src/util.cc

@@ -56,6 +56,13 @@ const TypeInfo *ResolveType(const InstanceData *instance, Napi::Value value, int
 
 const TypeInfo *GetPointerType(InstanceData *instance, const TypeInfo *ref)
 {
+    // Special cases
+    if (TestStr(ref->name, "char")) {
+        return instance->types_map.FindValue("string", nullptr);
+    } else if (TestStr(ref->name, "char16") || TestStr(ref->name, "char16_t")) {
+        return instance->types_map.FindValue("string16", nullptr);
+    }
+
     char name_buf[256];
     Fmt(name_buf, "%1%2*", ref->name, ref->primitive == PrimitiveKind::Pointer ? "" : " ");
 
@@ -119,284 +126,4 @@ bool CheckValueTag(const InstanceData *instance, Napi::Value value, const void *
     return match;
 }
 
-CallData::CallData(Napi::Env env, InstanceData *instance, const FunctionInfo *func)
-    : env(env), instance(instance), func(func),
-      stack_mem(&instance->stack_mem), heap_mem(&instance->heap_mem),
-      old_stack_mem(instance->stack_mem), old_heap_mem(instance->heap_mem)
-{
-    RG_ASSERT(AlignUp(stack_mem->ptr, 16) == stack_mem->ptr);
-    RG_ASSERT(AlignUp(stack_mem->end(), 16) == stack_mem->end());
-}
-
-CallData::~CallData()
-{
-    instance->stack_mem = old_stack_mem;
-    instance->heap_mem = old_heap_mem;
-}
-
-const char *CallData::PushString(const Napi::Value &value)
-{
-    RG_ASSERT(value.IsString());
-
-    Napi::Env env = value.Env();
-
-    Span<char> buf;
-    size_t len = 0;
-    napi_status status;
-
-    buf.ptr = (char *)heap_mem->ptr;
-    buf.len = std::max((Size)0, heap_mem->len - Kibibytes(32));
-
-    status = napi_get_value_string_utf8(env, value, buf.ptr, (size_t)buf.len, &len);
-    RG_ASSERT(status == napi_ok);
-
-    len++;
-
-    if (RG_LIKELY(len < (size_t)buf.len)) {
-        heap_mem->ptr += (Size)len;
-        heap_mem->len -= (Size)len;
-    } else {
-        status = napi_get_value_string_utf8(env, value, nullptr, 0, &len);
-        RG_ASSERT(status == napi_ok);
-
-        len++;
-
-        buf.ptr = (char *)Allocator::Allocate(&big_alloc, (Size)len);
-        buf.len = (Size)len;
-
-        status = napi_get_value_string_utf8(env, value, buf.ptr, (size_t)buf.len, &len);
-        RG_ASSERT(status == napi_ok);
-    }
-
-    return buf.ptr;
-}
-
-bool CallData::PushObject(const Napi::Object &obj, const TypeInfo *type, uint8_t *dest)
-{
-    Napi::Env env = obj.Env();
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
-
-    RG_ASSERT(IsObject(obj));
-    RG_ASSERT(type->primitive == PrimitiveKind::Record);
-
-    for (const RecordMember &member: type->members) {
-        Napi::Value value = obj.Get(member.name);
-
-        if (RG_UNLIKELY(value.IsUndefined())) {
-            ThrowError<Napi::TypeError>(env, "Missing expected object property '%1'", member.name);
-            return false;
-        }
-
-        dest = AlignUp(dest, member.align);
-
-        switch (member.type->primitive) {
-            case PrimitiveKind::Void: { RG_UNREACHABLE(); } break;
-
-            case PrimitiveKind::Bool: {
-                if (RG_UNLIKELY(!value.IsBoolean())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected boolean", GetValueType(instance, value), member.name);
-                    return false;
-                }
-
-                bool b = value.As<Napi::Boolean>();
-                *(bool *)dest = b;
-            } break;
-
-            case PrimitiveKind::Int8:
-            case PrimitiveKind::UInt8:
-            case PrimitiveKind::Int16:
-            case PrimitiveKind::UInt16:
-            case PrimitiveKind::Int32:
-            case PrimitiveKind::UInt32:
-            case PrimitiveKind::Int64:
-            case PrimitiveKind::UInt64: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected number", GetValueType(instance, value), member.name);
-                    return false;
-                }
-
-                int64_t v = CopyNumber<int64_t>(value);
-                memcpy(dest, &v, member.type->size); // Little Endian
-            } break;
-            case PrimitiveKind::Float32: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected number", GetValueType(instance, value), member.name);
-                    return false;
-                }
-
-                float f = CopyNumber<float>(value);
-                memcpy(dest, &f, 4);
-            } break;
-            case PrimitiveKind::Float64: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected number", GetValueType(instance, value), member.name);
-                    return false;
-                }
-
-                double d = CopyNumber<double>(value);
-                memcpy(dest, &d, 8);
-            } break;
-            case PrimitiveKind::String: {
-                if (RG_UNLIKELY(!value.IsString())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected string", GetValueType(instance, value), member.name);
-                    return false;
-                }
-
-                const char *str = PushString(value);
-                if (RG_UNLIKELY(!str))
-                    return false;
-                *(const char **)dest = str;
-            } break;
-            case PrimitiveKind::Pointer: {
-                if (RG_UNLIKELY(!CheckValueTag(instance, value, member.type))) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for member '%2', expected %3", GetValueType(instance, value), member.name, member.type->name);
-                    return false;
-                }
-
-                Napi::External external = value.As<Napi::External<void>>();
-                void *ptr = external.Data();
-                *(void **)dest = ptr;
-            } break;
-
-            case PrimitiveKind::Record: {
-                if (RG_UNLIKELY(!IsObject(value))) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected value %1 for member '%2', expected object", GetValueType(instance, value), member.name);
-                    return false;
-                }
-
-                Napi::Object obj = value.As<Napi::Object>();
-                if (!PushObject(obj, member.type, dest))
-                    return false;
-            } break;
-        }
-
-        dest += member.type->size;
-    }
-
-    return true;
-}
-
-void PopObject(Napi::Object obj, const uint8_t *ptr, const TypeInfo *type)
-{
-    Napi::Env env = obj.Env();
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
-
-    RG_ASSERT(type->primitive == PrimitiveKind::Record);
-
-    for (const RecordMember &member: type->members) {
-        ptr = AlignUp(ptr, member.align);
-
-        switch (member.type->primitive) {
-            case PrimitiveKind::Void: { RG_UNREACHABLE(); } break;
-
-            case PrimitiveKind::Bool: {
-                bool b = *(bool *)ptr;
-                obj.Set(member.name, Napi::Boolean::New(env, b));
-            } break;
-            case PrimitiveKind::Int8: {
-                double d = (double)*(int8_t *)ptr;
-                obj.Set(member.name, Napi::Number::New(env, d));
-            } break;
-            case PrimitiveKind::UInt8: {
-                double d = (double)*(uint8_t *)ptr;
-                obj.Set(member.name, Napi::Number::New(env, d));
-            } break;
-            case PrimitiveKind::Int16: {
-                double d = (double)*(int16_t *)ptr;
-                obj.Set(member.name, Napi::Number::New(env, d));
-            } break;
-            case PrimitiveKind::UInt16: {
-                double d = (double)*(uint16_t *)ptr;
-                obj.Set(member.name, Napi::Number::New(env, d));
-            } break;
-            case PrimitiveKind::Int32: {
-                double d = (double)*(int32_t *)ptr;
-                obj.Set(member.name, Napi::Number::New(env, d));
-            } break;
-            case PrimitiveKind::UInt32: {
-                double d = (double)*(uint32_t *)ptr;
-                obj.Set(member.name, Napi::Number::New(env, d));
-            } break;
-            case PrimitiveKind::Int64: {
-                int64_t v = *(int64_t *)ptr;
-                obj.Set(member.name, Napi::BigInt::New(env, v));
-            } break;
-            case PrimitiveKind::UInt64: {
-                uint64_t v = *(uint64_t *)ptr;
-                obj.Set(member.name, Napi::BigInt::New(env, v));
-            } break;
-            case PrimitiveKind::Float32: {
-                float f;
-                memcpy(&f, ptr, 4);
-                obj.Set(member.name, Napi::Number::New(env, (double)f));
-            } break;
-            case PrimitiveKind::Float64: {
-                double d;
-                memcpy(&d, ptr, 8);
-                obj.Set(member.name, Napi::Number::New(env, d));
-            } break;
-            case PrimitiveKind::String: {
-                const char *str = *(const char **)ptr;
-                obj.Set(member.name, Napi::String::New(env, str));
-            } break;
-            case PrimitiveKind::Pointer: {
-                void *ptr2 = *(void **)ptr;
-
-                Napi::External<void> external = Napi::External<void>::New(env, ptr2);
-                SetValueTag(instance, external, member.type);
-
-                obj.Set(member.name, external);
-            } break;
-
-            case PrimitiveKind::Record: {
-                Napi::Object obj2 = PopObject(env, ptr, member.type);
-                obj.Set(member.name, obj2);
-            } break;
-        }
-
-        ptr += member.type->size;
-    }
-}
-
-void PopOutArguments(Span<const OutObject> objects)
-{
-    for (const OutObject &obj: objects) {
-        PopObject(obj.obj, obj.ptr, obj.type);
-    }
-}
-
-static void DumpMemory(const char *type, Span<const uint8_t> bytes)
-{
-    if (bytes.len) {
-        PrintLn(stderr, "%1 at 0x%2 (%3):", type, bytes.ptr, FmtMemSize(bytes.len));
-
-        for (const uint8_t *ptr = bytes.begin(); ptr < bytes.end();) {
-            Print(stderr, "  [0x%1 %2 %3]  ", FmtArg(ptr).Pad0(-16),
-                                              FmtArg((ptr - bytes.begin()) / sizeof(void *)).Pad(-4),
-                                              FmtArg(ptr - bytes.begin()).Pad(-4));
-            for (int i = 0; ptr < bytes.end() && i < (int)sizeof(void *); i++, ptr++) {
-                Print(stderr, " %1", FmtHex(*ptr).Pad0(-2));
-            }
-            PrintLn(stderr);
-        }
-    }
-}
-
-void CallData::DumpDebug() const
-{
-    PrintLn(stderr, "%!..+---- %1 (%2) ----%!0", func->name, CallConventionNames[(int)func->convention]);
-
-    if (func->parameters.len) {
-        PrintLn(stderr, "Parameters:");
-        for (Size i = 0; i < func->parameters.len; i++) {
-            const ParameterInfo &param = func->parameters[i];
-            PrintLn(stderr, "  %1 = %2 (%3)", i, param.type->name, FmtMemSize(param.type->size));
-        }
-    }
-    PrintLn(stderr, "Return: %1 (%2)", func->ret.type->name, FmtMemSize(func->ret.type->size));
-
-    DumpMemory("Stack", GetStack());
-    DumpMemory("Heap", GetHeap());
-}
-
 }

package/src/util.hh

@@ -72,97 +72,6 @@ static inline bool IsObject(Napi::Value value)
     return value.IsObject() && !IsNullOrUndefined(value) && !value.IsArray();
 }
 
-class CallData {
-    Napi::Env env;
-    InstanceData *instance;
-    const FunctionInfo *func;
-
-    Span<uint8_t> *stack_mem;
-    Span<uint8_t> *heap_mem;
-    BlockAllocator big_alloc;
-
-    Span<uint8_t> old_stack_mem;
-    Span<uint8_t> old_heap_mem;
-
-public:
-    CallData(Napi::Env env, InstanceData *instance, const FunctionInfo *func);
-    ~CallData();
-
-    Span<uint8_t> GetStack() const
-    {
-        uint8_t *sp = stack_mem->end();
-        Size len = old_stack_mem.end() - sp;
-
-        return MakeSpan(sp, len);
-    }
-    uint8_t *GetSP() const { return stack_mem->end(); };
-
-    Span<uint8_t> GetHeap() const
-    {
-        uint8_t *ptr = old_heap_mem.ptr;
-        Size len = heap_mem->ptr - ptr;
-
-        return MakeSpan(ptr, len);
-    }
-
-    template <typename T = void>
-    bool AllocStack(Size size, Size align, T **out_ptr = nullptr);
-    template <typename T = void>
-    bool AllocHeap(Size size, Size align, T **out_ptr = nullptr);
-
-    const char *PushString(const Napi::Value &value);
-    bool PushObject(const Napi::Object &obj, const TypeInfo *type, uint8_t *dest);
-
-    void DumpDebug() const;
-};
-
-template <typename T>
-bool CallData::AllocStack(Size size, Size align, T **out_ptr)
-{
-    uint8_t *ptr = AlignDown(stack_mem->end() - size, align);
-    Size delta = stack_mem->end() - ptr;
-
-    if (RG_UNLIKELY(stack_mem->len < delta)) {
-        ThrowError<Napi::Error>(env, "FFI call is taking up too much memory");
-        return false;
-    }
-
-    if (instance->debug) {
-        memset(ptr, 0, delta);
-    }
-
-    stack_mem->len -= delta;
-
-    if (out_ptr) {
-        *out_ptr = (T *)ptr;
-    }
-    return true;
-}
-
-template <typename T>
-bool CallData::AllocHeap(Size size, Size align, T **out_ptr)
-{
-    uint8_t *ptr = AlignUp(heap_mem->ptr, align);
-    Size delta = size + (ptr - heap_mem->ptr);
-
-    if (RG_UNLIKELY(delta > heap_mem->len)) {
-        ThrowError<Napi::Error>(env, "FFI call is taking up too much memory");
-        return false;
-    }
-
-    if (instance->debug) {
-        memset(heap_mem->ptr, 0, (size_t)delta);
-    }
-
-    heap_mem->ptr += delta;
-    heap_mem->len -= delta;
-
-    if (out_ptr) {
-        *out_ptr = (T *)ptr;
-    }
-    return true;
-}
-
 template <typename T>
 T CopyNumber(const Napi::Value &value)
 {
@@ -180,20 +89,4 @@ T CopyNumber(const Napi::Value &value)
     RG_UNREACHABLE();
 }
 
-void PopObject(Napi::Object obj, const uint8_t *ptr, const TypeInfo *type);
-static inline Napi::Object PopObject(Napi::Env env, const uint8_t *ptr, const TypeInfo *type)
-{
-    Napi::Object obj = Napi::Object::New(env);
-    PopObject(obj, ptr, type);
-    return obj;
-}
-
-struct OutObject {
-    Napi::Object obj;
-    const uint8_t *ptr;
-    const TypeInfo *type;
-};
-
-void PopOutArguments(Span<const OutObject> objects);
-
 }

package/test/CMakeLists.txt

@@ -112,4 +112,5 @@ set_target_properties(misc PROPERTIES PREFIX "")
 
 if(MSVC)
     target_compile_options(misc PRIVATE /wd4116)
+    target_link_options(misc PRIVATE "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/misc.def")
 endif()