koffi 2.1.2 → 2.1.4

package/src/{call.cc → koffi/src/call.cc}

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "call.hh"
 #include "ffi.hh"
 #include "util.hh"

package/src/{call.hh → koffi/src/call.hh}

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "util.hh"
 
@@ -156,7 +156,7 @@ inline T *CallData::AllocHeap(Size size, Size align)
         return ptr;
     } else {
 #ifdef RG_DEBUG
-        int flags = (int)Allocator::Flag::Zero;
+        int flags = (int)AllocFlag::Zero;
 #else
         int flags = 0;
 #endif

package/src/{ffi.cc → koffi/src/ffi.cc}

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "parser.hh"
@@ -44,11 +44,8 @@ namespace RG {
 const int TypeInfoMarker = 0xDEADBEEF;
 const int CastMarker = 0xDEADBEEF;
 
-static bool ChangeMemorySize(const char *name, Napi::Value value, Size *out_size)
+static bool ChangeSize(const char *name, Napi::Value value, Size min_size, Size max_size, Size *out_size)
 {
-    const Size MinSize = Kibibytes(1);
-    const Size MaxSize = Mebibytes(16);
-
     Napi::Env env = value.Env();
 
     if (!value.IsNumber()) {
@@ -60,8 +57,8 @@ static bool ChangeMemorySize(const char *name, Napi::Value value, Size *out_size
 
     int64_t size = value.As<Napi::Number>().Int64Value();
 
-    if (size < MinSize || size > MaxSize) {
-        ThrowError<Napi::Error>(env, "Setting '%1' must be between %2 and %3", name, FmtMemSize(MinSize), FmtMemSize(MaxSize));
+    if (size < min_size || size > max_size) {
+        ThrowError<Napi::Error>(env, "Setting '%1' must be between %2 and %3", name, FmtMemSize(min_size), FmtMemSize(max_size));
         return false;
     }
 
@@ -69,6 +66,14 @@ static bool ChangeMemorySize(const char *name, Napi::Value value, Size *out_size
     return true;
 }
 
+static bool ChangeMemorySize(const char *name, Napi::Value value, Size *out_size)
+{
+    const Size MinSize = Kibibytes(1);
+    const Size MaxSize = Mebibytes(16);
+
+    return ChangeSize(name, value, MinSize, MaxSize, out_size);
+}
+
 static bool ChangeAsyncLimit(const char *name, Napi::Value value, int max, int *out_limit)
 {
     Napi::Env env = value.Env();
@@ -113,6 +118,7 @@ static Napi::Value GetSetConfig(const Napi::CallbackInfo &info)
         Size async_heap_size = instance->async_heap_size;
         int resident_async_pools = instance->resident_async_pools;
         int max_async_calls = resident_async_pools + instance->max_temporaries;
+        Size max_type_size = instance->max_type_size;
 
         Napi::Object obj = info[0].As<Napi::Object>();
         Napi::Array keys = obj.GetPropertyNames();
@@ -139,6 +145,9 @@ static Napi::Value GetSetConfig(const Napi::CallbackInfo &info)
             } else if (key == "max_async_calls") {
                 if (!ChangeAsyncLimit(key.c_str(), value, MaxAsyncCalls, &max_async_calls))
                     return env.Null();
+            } else if (key == "max_type_size") {
+                if (!ChangeSize(key.c_str(), value, 32, Mebibytes(512), &max_type_size))
+                    return env.Null();
             } else {
                 ThrowError<Napi::Error>(env, "Unexpected config member '%1'", key.c_str());
                 return env.Null();
@@ -156,6 +165,7 @@ static Napi::Value GetSetConfig(const Napi::CallbackInfo &info)
         instance->async_heap_size = async_heap_size;
         instance->resident_async_pools = resident_async_pools;
         instance->max_temporaries = max_async_calls - resident_async_pools;
+        instance->max_type_size = max_type_size;
     }
 
     Napi::Object obj = Napi::Object::New(env);
@@ -166,6 +176,7 @@ static Napi::Value GetSetConfig(const Napi::CallbackInfo &info)
     obj.Set("async_heap_size", instance->async_heap_size);
     obj.Set("resident_async_pools", instance->resident_async_pools);
     obj.Set("max_async_calls", instance->resident_async_pools + instance->max_temporaries);
+    obj.Set("max_type_size", instance->max_type_size);
 
     return obj;
 }
@@ -210,6 +221,7 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
     type->align = 1;
 
     HashSet<const char *> members;
+    int64_t size = 0;
 
     for (uint32_t i = 0; i < keys.Length(); i++) {
         RecordMember member = {};
@@ -250,11 +262,15 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         if (!align) {
             align = pad ? member.type->align : 1;
         }
-        member.offset = (int16_t)AlignLen(type->size, align);
+        member.offset = (int32_t)AlignLen(size, align);
 
-        type->size = (int16_t)(member.offset + member.type->size);
+        size = member.offset + member.type->size;
         type->align = std::max(type->align, align);
 
+        if (size > instance->max_type_size) {
+            ThrowError<Napi::Error>(env, "Struct '%1' size is too high (max = %2)", type->name, FmtMemSize(size));
+            return env.Null();
+        }
         if (!members.TrySet(member.name).second) {
             ThrowError<Napi::Error>(env, "Duplicate member '%1' in struct '%2'", member.name, type->name);
             return env.Null();
@@ -263,12 +279,12 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         type->members.Append(member);
     }
 
-    if (!type->size) {
-        ThrowError<Napi::TypeError>(env, "Empty struct '%1' is not allowed in C", type->name);
+    size = (int32_t)AlignLen(size, type->align);
+    if (!size) {
+        ThrowError<Napi::Error>(env, "Empty struct '%1' is not allowed in C", type->name);
         return env.Null();
     }
-
-    type->size = (int16_t)AlignLen(type->size, type->align);
+    type->size = (int32_t)size;
 
     // If the insert succeeds, we cannot fail anymore
     if (named && !instance->types_map.TrySet(type->name, type).second) {
@@ -565,7 +581,7 @@ static Napi::Value CreateArrayType(const Napi::CallbackInfo &info)
     }
 
     const TypeInfo *ref = ResolveType(info[0]);
-    int64_t len = (uint16_t)info[1].As<Napi::Number>().Int64Value();
+    int64_t len = info[1].As<Napi::Number>().Int64Value();
 
     if (!ref)
         return env.Null();
@@ -573,8 +589,8 @@ static Napi::Value CreateArrayType(const Napi::CallbackInfo &info)
         ThrowError<Napi::TypeError>(env, "Array length must be positive and non-zero");
         return env.Null();
     }
-    if (len > INT16_MAX / ref->size) {
-        ThrowError<Napi::TypeError>(env, "Array length is too high (max = %1)", INT16_MAX / ref->size);
+    if (len > instance->max_type_size / ref->size) {
+        ThrowError<Napi::TypeError>(env, "Array length is too high (max = %1)", instance->max_type_size / ref->size);
         return env.Null();
     }
 
@@ -615,7 +631,7 @@ static Napi::Value CreateArrayType(const Napi::CallbackInfo &info)
 
     type->primitive = PrimitiveKind::Array;
     type->align = ref->align;
-    type->size = (int16_t)(len * ref->size);
+    type->size = (int32_t)(len * ref->size);
     type->ref.type = ref;
     type->hint = hint;
 
@@ -684,7 +700,7 @@ static bool ParseClassicFunction(Napi::Env env, Napi::String name, Napi::Value r
             return false;
         }
         if ((param.directions & 2) && ++func->out_parameters >= MaxOutParameters) {
-            ThrowError<Napi::TypeError>(env, "Functions cannot have more than out %1 parameters", MaxOutParameters);
+            ThrowError<Napi::TypeError>(env, "Functions cannot have more than %1 output parameters", MaxOutParameters);
             return false;
         }
 
@@ -1031,7 +1047,7 @@ static Napi::Value TranslateVariadicCall(const Napi::CallbackInfo &info)
             return env.Null();
         }
         if (RG_UNLIKELY((param.directions & 2) && ++func.out_parameters >= MaxOutParameters)) {
-            ThrowError<Napi::TypeError>(env, "Functions cannot have more than out %1 parameters", MaxOutParameters);
+            ThrowError<Napi::TypeError>(env, "Functions cannot have more than %1 output parameters", MaxOutParameters);
             return env.Null();
         }
 
@@ -1417,7 +1433,7 @@ void LibraryHolder::Unref() const
 
 
 static void RegisterPrimitiveType(Napi::Env env, Napi::Object map, std::initializer_list<const char *> names,
-                                  PrimitiveKind primitive, int16_t size, int16_t align, const char *ref = nullptr)
+                                  PrimitiveKind primitive, int32_t size, int16_t align, const char *ref = nullptr)
 {
     RG_ASSERT(names.size() > 0);
     RG_ASSERT(align <= size);

package/src/{ffi.hh → koffi/src/ffi.hh}

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 
 #include <napi.h>
 
@@ -25,10 +25,11 @@ static const Size DefaultAsyncStackSize = Kibibytes(256);
 static const Size DefaultAsyncHeapSize = Kibibytes(512);
 static const int DefaultResidentAsyncPools = 2;
 static const int DefaultMaxAsyncCalls = 64;
+static const Size DefaultMaxTypeSize = Mebibytes(64);
 
 static const int MaxAsyncCalls = 256;
 static const Size MaxParameters = 32;
-static const Size MaxOutParameters = 8;
+static const Size MaxOutParameters = 16;
 static const Size MaxTrampolines = 16;
 
 extern const int TypeInfoMarker;
@@ -105,7 +106,7 @@ struct TypeInfo {
     const char *name;
 
     PrimitiveKind primitive;
-    int16_t size;
+    int32_t size;
     int16_t align;
 
     DisposeFunc *dispose;
@@ -127,7 +128,7 @@ struct TypeInfo {
 struct RecordMember {
     const char *name;
     const TypeInfo *type;
-    int16_t offset;
+    int32_t offset;
 };
 
 struct LibraryHolder {
@@ -266,6 +267,7 @@ struct InstanceData {
     Size async_heap_size = DefaultAsyncHeapSize;
     int resident_async_pools = DefaultResidentAsyncPools;
     int max_temporaries = DefaultMaxAsyncCalls - DefaultResidentAsyncPools;
+    Size max_type_size = DefaultMaxTypeSize;
 };
 RG_STATIC_ASSERT(DefaultResidentAsyncPools <= RG_LEN(InstanceData::memories.data) - 1);
 RG_STATIC_ASSERT(DefaultMaxAsyncCalls >= DefaultResidentAsyncPools);

package/src/{parser.cc → koffi/src/parser.cc}

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "ffi.hh"
 #include "parser.hh"
 

package/src/{parser.hh → koffi/src/parser.hh}

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "util.hh"
 
 #include <napi.h>

package/src/{util.cc → koffi/src/util.cc}

@@ -11,7 +11,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 #include "call.hh"
 #include "ffi.hh"
 #include "util.hh"

package/src/{util.hh → koffi/src/util.hh}

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "vendor/libcc/libcc.hh"
+#include "src/core/libcc/libcc.hh"
 
 #include <napi.h>
 

package/{test → src/koffi/test}/CMakeLists.txt

@@ -21,19 +21,18 @@ endif()
 # ---- Raylib ----
 
 add_library(raylib SHARED
-    ../vendor/raylib/src/rcore.c
-    ../vendor/raylib/src/rshapes.c
-    ../vendor/raylib/src/rtextures.c
-    ../vendor/raylib/src/rtext.c
-    ../vendor/raylib/src/rmodels.c
-    ../vendor/raylib/src/utils.c
-    ../vendor/raylib/src/rglfw.c
-    ../vendor/raylib/src/raudio.c
+    ../../../vendor/raylib/src/rcore.c
+    ../../../vendor/raylib/src/rshapes.c
+    ../../../vendor/raylib/src/rtextures.c
+    ../../../vendor/raylib/src/rtext.c
+    ../../../vendor/raylib/src/rmodels.c
+    ../../../vendor/raylib/src/utils.c
+    ../../../vendor/raylib/src/rglfw.c
+    ../../../vendor/raylib/src/raudio.c
 )
 set_target_properties(raylib PROPERTIES PREFIX "")
-target_include_directories(raylib PRIVATE ../vendor/raylib/src/external/glfw/include)
-target_compile_definitions(raylib PRIVATE PLATFORM_DESKTOP GRAPHICS_API_OPENGL_21
-                                          BUILD_LIBTYPE_SHARED NDEBUG)
+target_include_directories(raylib PRIVATE ../../../vendor/raylib/src/external/glfw/include)
+target_compile_definitions(raylib PRIVATE PLATFORM_DESKTOP GRAPHICS_API_OPENGL_21 BUILD_LIBTYPE_SHARED NDEBUG)
 
 if(MSVC)
     target_compile_options(raylib PRIVATE /wd4244 /wd4305)
@@ -59,7 +58,7 @@ endif()
 if(APPLE)
     target_compile_options(raylib PRIVATE -Wno-unknown-warning-option -Wno-macro-redefined)
     target_compile_definitions(raylib PRIVATE GL_SILENCE_DEPRECATION)
-    set_source_files_properties(../vendor/raylib/src/rglfw.c PROPERTIES COMPILE_FLAGS "-x objective-c")
+    set_source_files_properties(../../../vendor/raylib/src/rglfw.c PROPERTIES COMPILE_FLAGS "-x objective-c")
     target_link_libraries(raylib PRIVATE "-framework Cocoa" "-framework IOKit" "-framework CoreFoundation" "-framework OpenGL")
 endif()
 
@@ -101,11 +100,11 @@ endif()
 
 # ---- SQLite ----
 
-add_library(sqlite3 SHARED ../vendor/sqlite3/sqlite3.c)
-set_target_properties(sqlite3 PROPERTIES PREFIX "")
+add_library(sqlite3mc SHARED ../../../vendor/sqlite3mc/sqlite3mc.c)
+set_target_properties(sqlite3mc PROPERTIES PREFIX "")
 
 if(WIN32)
-    target_compile_definitions(sqlite3 PRIVATE SQLITE_API=__declspec\(dllexport\))
+    target_compile_definitions(sqlite3mc PRIVATE SQLITE_API=__declspec\(dllexport\))
 endif()
 
 # ---- Misc ----

package/{test → src/koffi/test}/misc.c

@@ -158,6 +158,10 @@ typedef struct EndianInts {
     uint64_t u64be;
 } EndianInts;
 
+typedef struct BigText {
+    char text[262145];
+} BigText;
+
 EXPORT int8_t GetMinusOne1(void)
 {
     return -1;
@@ -696,3 +700,12 @@ EXPORT void CopyEndianInts2(int16_t i16le, int16_t i16be, uint16_t u16le, uint16
 EXPORT uint16_t ReturnEndianInt2(uint16_t v) { return v; }
 EXPORT uint32_t ReturnEndianInt4(uint32_t v) { return v; }
 EXPORT uint64_t ReturnEndianInt8(uint64_t v) { return v; }
+
+EXPORT BigText ReverseBigText(BigText buf)
+{
+    BigText ret;
+    for (int i = 0; i < sizeof(buf.text); i++) {
+        ret.text[sizeof(buf.text) - 1 - i] = buf.text[i];
+    }
+    return ret;
+}

package/{test → src/koffi/test}/sqlite.js

@@ -36,7 +36,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = __dirname + '/build/sqlite3' + koffi.extension;
+    let lib_filename = __dirname + '/build/sqlite3mc' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const sqlite3_open_v2 = lib.func('sqlite3_open_v2', 'int', ['str', koffi.out(koffi.pointer(sqlite3, 2)), 'int', 'str']);

package/{test → src/koffi/test}/sync.js

@@ -129,6 +129,10 @@ const EndianInts = koffi.struct('EndianInts', {
     u64be: 'uint64_be_t'
 });
 
+const BigText = koffi.struct('BigText', {
+    text: koffi.array('uint8_t', 262145)
+});
+
 main();
 
 async function main() {
@@ -219,6 +223,7 @@ async function test() {
     const ReturnEndianInt8SB = lib.func('int64_be_t ReturnEndianInt8(int64_le_t v)');
     const ReturnEndianInt8UL = lib.func('uint64_le_t ReturnEndianInt8(uint64_be_t v)');
     const ReturnEndianInt8UB = lib.func('uint64_be_t ReturnEndianInt8(uint64_le_t v)');
+    const ReverseBigText = lib.func('BigText ReverseBigText(BigText buf)');
 
     // Simple signed value returns
     assert.equal(GetMinusOne1(), -1);
@@ -499,4 +504,16 @@ async function test() {
         assert.equal(ReturnEndianInt8UL(0x0123456789ABCD3Fn), 0x3FCDAB8967452301n);
         assert.equal(ReturnEndianInt8UB(0x0123456789ABCD3Fn), 0x3FCDAB8967452301n);
     }
+
+    // Test big structs
+    {
+        let text = 'hello!foo!bar'.repeat(20165);
+        let expected = text.split('').reverse().join('');
+
+        let big = { text: Buffer.from(text) };
+        let ret = ReverseBigText(big);
+
+        assert.equal(ret.len, big.len);
+        assert.equal(Buffer.from(ret.text).toString(), expected);
+    }
 }

package/vendor/brotli/BUILD

@@ -0,0 +1,144 @@
+# Description:
+#   Brotli is a generic-purpose lossless compression algorithm.
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+licenses(["notice"])  # MIT
+
+exports_files(["LICENSE"])
+
+config_setting(
+    name = "darwin",
+    values = {"cpu": "darwin"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "darwin_x86_64",
+    values = {"cpu": "darwin_x86_64"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "windows",
+    values = {"cpu": "x64_windows"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "windows_msvc",
+    values = {"cpu": "x64_windows_msvc"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "windows_msys",
+    values = {"cpu": "x64_windows_msys"},
+    visibility = ["//visibility:public"],
+)
+
+load(":compiler_config_setting.bzl", "create_msvc_config")
+
+create_msvc_config()
+
+STRICT_C_OPTIONS = select({
+    ":msvc": [],
+    "//conditions:default": [
+        "--pedantic-errors",
+        "-Wall",
+        "-Wconversion",
+        "-Werror",
+        "-Wextra",
+        "-Wlong-long",
+        "-Wmissing-declarations",
+        "-Wmissing-prototypes",
+        "-Wno-strict-aliasing",
+        "-Wshadow",
+        "-Wsign-compare",
+    ],
+})
+
+filegroup(
+    name = "public_headers",
+    srcs = glob(["c/include/brotli/*.h"]),
+)
+
+filegroup(
+    name = "common_headers",
+    srcs = glob(["c/common/*.h"]),
+)
+
+filegroup(
+    name = "common_sources",
+    srcs = glob(["c/common/*.c"]),
+)
+
+filegroup(
+    name = "dec_headers",
+    srcs = glob(["c/dec/*.h"]),
+)
+
+filegroup(
+    name = "dec_sources",
+    srcs = glob(["c/dec/*.c"]),
+)
+
+filegroup(
+    name = "enc_headers",
+    srcs = glob(["c/enc/*.h"]),
+)
+
+filegroup(
+    name = "enc_sources",
+    srcs = glob(["c/enc/*.c"]),
+)
+
+cc_library(
+    name = "brotli_inc",
+    hdrs = [":public_headers"],
+    copts = STRICT_C_OPTIONS,
+    strip_include_prefix = "c/include",
+)
+
+cc_library(
+    name = "brotlicommon",
+    srcs = [":common_sources"],
+    hdrs = [":common_headers"],
+    copts = STRICT_C_OPTIONS,
+    deps = [":brotli_inc"],
+)
+
+cc_library(
+    name = "brotlidec",
+    srcs = [":dec_sources"],
+    hdrs = [":dec_headers"],
+    copts = STRICT_C_OPTIONS,
+    deps = [":brotlicommon"],
+)
+
+cc_library(
+    name = "brotlienc",
+    srcs = [":enc_sources"],
+    hdrs = [":enc_headers"],
+    copts = STRICT_C_OPTIONS,
+    linkopts = ["-lm"],
+    deps = [":brotlicommon"],
+)
+
+cc_binary(
+    name = "brotli",
+    srcs = ["c/tools/brotli.c"],
+    copts = STRICT_C_OPTIONS,
+    linkstatic = 1,
+    deps = [
+        ":brotlidec",
+        ":brotlienc",
+    ],
+)
+
+filegroup(
+    name = "dictionary",
+    srcs = ["c/common/dictionary.bin"],
+)