koffi 0.9.4 → 0.9.7

package/src/util.cc

@@ -12,6 +12,7 @@
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
 #include "vendor/libcc/libcc.hh"
+#include "call.hh"
 #include "ffi.hh"
 #include "util.hh"
 
@@ -59,7 +60,22 @@ bool CheckValueTag(const InstanceData *instance, Napi::Value value, const void *
     return match;
 }
 
-const char *CopyNodeString(const Napi::Value &value, Allocator *alloc)
+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());
 
@@ -72,15 +88,18 @@ const char *CopyNodeString(const Napi::Value &value, Allocator *alloc)
 
     Span<char> buf;
     buf.len = (Size)len + 1;
-    buf.ptr = (char *)Allocator::Allocate(alloc, buf.len);
+    if (RG_UNLIKELY(!AllocHeap(buf.len, 1, &buf.ptr)))
+        return nullptr;
 
-    status = napi_get_value_string_utf8(env, value, buf.ptr, (size_t)buf.len, &len);
-    RG_ASSERT(status == napi_ok);
+    if (RG_UNLIKELY(napi_get_value_string_utf8(env, value, buf.ptr, (size_t)buf.len, &len) != napi_ok)) {
+        ThrowError<Napi::Error>(env, "Failed to convert string to UTF-8");
+        return nullptr;
+    }
 
     return buf.ptr;
 }
 
-bool PushObject(const Napi::Object &obj, const TypeInfo *type, Allocator *alloc, uint8_t *dest)
+bool CallData::PushObject(const Napi::Object &obj, const TypeInfo *type, uint8_t *dest)
 {
     Napi::Env env = obj.Env();
     InstanceData *instance = env.GetInstanceData<InstanceData>();
@@ -126,7 +145,7 @@ bool PushObject(const Napi::Object &obj, const TypeInfo *type, Allocator *alloc,
                     return false;
                 }
 
-                int64_t v = CopyNodeNumber<int64_t>(value);
+                int64_t v = CopyNumber<int64_t>(value);
                 memcpy(dest, &v, member.type->size); // Little Endian
             } break;
             case PrimitiveKind::Float32: {
@@ -135,7 +154,7 @@ bool PushObject(const Napi::Object &obj, const TypeInfo *type, Allocator *alloc,
                     return false;
                 }
 
-                float f = CopyNodeNumber<float>(value);
+                float f = CopyNumber<float>(value);
                 memcpy(dest, &f, 4);
             } break;
             case PrimitiveKind::Float64: {
@@ -144,7 +163,7 @@ bool PushObject(const Napi::Object &obj, const TypeInfo *type, Allocator *alloc,
                     return false;
                 }
 
-                double d = CopyNodeNumber<double>(value);
+                double d = CopyNumber<double>(value);
                 memcpy(dest, &d, 8);
             } break;
             case PrimitiveKind::String: {
@@ -153,7 +172,9 @@ bool PushObject(const Napi::Object &obj, const TypeInfo *type, Allocator *alloc,
                     return false;
                 }
 
-                const char *str = CopyNodeString(value, alloc);
+                const char *str = PushString(value);
+                if (RG_UNLIKELY(!str))
+                    return false;
                 *(const char **)dest = str;
             } break;
             case PrimitiveKind::Pointer: {
@@ -174,7 +195,7 @@ bool PushObject(const Napi::Object &obj, const TypeInfo *type, Allocator *alloc,
                 }
 
                 Napi::Object obj = value.As<Napi::Object>();
-                if (!PushObject(obj, member.type, alloc, dest))
+                if (!PushObject(obj, member.type, dest))
                     return false;
             } break;
         }
@@ -272,25 +293,38 @@ Napi::Object PopObject(Napi::Env env, const uint8_t *ptr, const TypeInfo *type)
     return obj;
 }
 
-void DumpStack(const FunctionInfo *func, Span<const uint8_t> sp)
+static void DumpMemory(const char *type, Span<const uint8_t> bytes)
 {
-    PrintLn(stderr, "%!..+---- %1 ----%!0", func->name);
-
-    PrintLn(stderr, "Parameters:");
-    for (Size i = 0; i < func->parameters.len; i++) {
-        const ParameterInfo &param = func->parameters[i];
-        PrintLn(stderr, "  %1 = %2", i, param.type->name);
+    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);
+        }
     }
+}
 
-    PrintLn(stderr, "Stack (%1 bytes) at 0x%2:", sp.len, sp.ptr);
-    for (const uint8_t *ptr = sp.begin(); ptr < sp.end();) {
-        Print(stderr, "  [0x%1 %2 %3]  ", FmtArg(ptr).Pad0(-16), FmtArg((ptr - sp.begin()) / 8).Pad(-4),
-                                                                 FmtArg(ptr - sp.begin()).Pad(-4));
-        for (int i = 0; ptr < sp.end() && i < 8; i++, ptr++) {
-            Print(stderr, " %1", FmtHex(*ptr).Pad0(-2));
+void CallData::DumpDebug() const
+{
+    PrintLn(stderr, "%!..+---- %1 ----%!0", func->name);
+
+    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);
     }
+    PrintLn(stderr, "Return: %1 (%2)", func->ret.type->name, FmtMemSize(func->ret.type->size));
+
+    DumpMemory("Stack", GetStack());
+    DumpMemory("Heap", GetHeap());
 }
 
 }

package/src/util.hh

@@ -21,30 +21,33 @@ namespace RG {
 
 struct InstanceData;
 
+template <typename T, typename... Args>
+void ThrowError(Napi::Env env, const char *msg, Args... args)
+{
+    char buf[1024];
+    Fmt(buf, msg, args...);
+
+    T::New(env, buf).ThrowAsJavaScriptException();
+}
+
 static inline Size AlignLen(Size len, Size align)
 {
     Size aligned = (len + align - 1) / align * align;
     return aligned;
 }
 
-static inline uint8_t *AlignUp(uint8_t *ptr, Size align)
+template <typename T>
+static inline T *AlignUp(T *ptr, Size align)
 {
     uint8_t *aligned = (uint8_t *)(((uintptr_t)ptr + align - 1) / align * align);
-    return aligned;
-}
-static inline const uint8_t *AlignUp(const uint8_t *ptr, Size align)
-{
-    const uint8_t *aligned = (const uint8_t *)(((uintptr_t)ptr + align - 1) / align * align);
-    return aligned;
+    return (T *)aligned;
 }
 
-template <typename T, typename... Args>
-static void ThrowError(Napi::Env env, const char *msg, Args... args)
+template <typename T>
+static inline T *AlignDown(T *ptr, Size align)
 {
-    char buf[1024];
-    Fmt(buf, msg, args...);
-
-    T::New(env, buf).ThrowAsJavaScriptException();
+    uint8_t *aligned = (uint8_t *)((uintptr_t)ptr / align * align);
+    return (T *)aligned;
 }
 
 // Can be slow, only use for error messages
@@ -53,8 +56,94 @@ const char *GetValueType(const InstanceData *instance, Napi::Value value);
 void SetValueTag(const InstanceData *instance, Napi::Value value, const void *marker);
 bool CheckValueTag(const InstanceData *instance, Napi::Value value, const void *marker);
 
+class CallData {
+    Napi::Env env;
+    InstanceData *instance;
+    const FunctionInfo *func;
+
+    Span<uint8_t> *stack_mem;
+    Span<uint8_t> *heap_mem;
+
+    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 = heap_mem->ptr;
+        Size len = ptr - old_heap_mem.ptr;
+
+        return MakeSpan(ptr, len);
+    }
+
+    template <typename T>
+    bool AllocStack(Size size, Size align, T **out_ptr);
+    template <typename T>
+    bool AllocHeap(Size size, Size align, T **out_ptr);
+
+    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>
-T CopyNodeNumber(const Napi::Value &value)
+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;
+
+    *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;
+
+    *out_ptr = (T *)ptr;
+    return true;
+}
+
+template <typename T>
+T CopyNumber(const Napi::Value &value)
 {
     RG_ASSERT(value.IsNumber() || value.IsBigInt());
 
@@ -70,11 +159,6 @@ T CopyNodeNumber(const Napi::Value &value)
     RG_UNREACHABLE();
 }
 
-const char *CopyNodeString(const Napi::Value &value, Allocator *alloc);
-
-bool PushObject(const Napi::Object &obj, const TypeInfo *type, Allocator *alloc, uint8_t *dest);
 Napi::Object PopObject(Napi::Env env, const uint8_t *ptr, const TypeInfo *type);
 
-void DumpStack(const FunctionInfo *func, Span<const uint8_t> sp);
-
 }

package/test/registry/machines.json

@@ -0,0 +1,112 @@
+{
+    "debian_arm32": {
+        "name": "Debian ARM32",
+        "qemu": "qemu-system-arm -M virt -cpu cortex-a15 -m 2G -smp 2 -kernel vmlinuz-5.10.0-11-armmp-lpae -initrd initrd.img-5.10.0-11-armmp-lpae -append \"root=/dev/vda2 apparmor=0\" -drive if=none,file=disk.qcow2,format=qcow2,id=hd -device virtio-blk-device,drive=hd -netdev user,id=mynet,hostfwd=tcp::22201-:22 -device virtio-net-device,netdev=mynet",
+
+        "info": {
+            "platform": "linux",
+            "arch": "arm",
+
+            "port": 22201,
+            "username": "debian",
+            "password": "debian",
+            "home": "/home/debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "commands": {
+            "Build": "npm install --production"
+        }
+    },
+
+    "debian_arm64": {
+        "name": "Debian ARM64",
+        "qemu": "qemu-system-aarch64 -M virt -cpu cortex-a53 -m 2G -smp 2 -kernel vmlinuz-5.10.0-11-arm64 -initrd initrd.img-5.10.0-11-arm64 -append \"root=/dev/vda2 apparmor=0\" -drive if=none,file=disk.qcow2,format=qcow2,id=hd -device virtio-blk-device,drive=hd -netdev user,id=mynet,hostfwd=tcp::22202-:22 -device virtio-net-device,netdev=mynet",
+
+        "info": {
+            "platform": "linux",
+            "arch": "arm64",
+
+            "port": 22202,
+            "username": "debian",
+            "password": "debian",
+            "home": "/home/debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "commands": {
+            "Build": "npm install --production"
+        }
+    },
+
+    "debian_i386": {
+        "name": "Debian i386",
+        "qemu": "qemu-system-i386 -cpu max -m 2G -smp 2 -kernel vmlinuz-5.10.0-11-686-pae -initrd initrd.img-5.10.0-11-686-pae -append \"root=/dev/sda1 apparmor=0\" -hda disk.qcow2 -netdev user,id=mynet,hostfwd=tcp::22203-:22 -device e1000,netdev=mynet",
+
+        "info": {
+            "platform": "linux",
+            "arch": "ia32",
+
+            "port": 22203,
+            "username": "debian",
+            "password": "debian",
+            "home": "/home/debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "commands": {
+            "Build": "npm install --production"
+        }
+    },
+
+    "debian_x64": {
+        "name": "Debian x64",
+        "qemu": "qemu-system-x86_64 -m 2G -smp 2 -kernel vmlinuz-5.10.0-11-amd64 -initrd initrd.img-5.10.0-11-amd64 -append \"root=/dev/sda1 apparmor=0\" -hda disk.qcow2 -netdev user,id=mynet,hostfwd=tcp::22204-:22 -device e1000,netdev=mynet",
+
+        "info": {
+            "platform": "linux",
+            "arch": "x64",
+
+            "port": 22204,
+            "username": "debian",
+            "password": "debian",
+            "home": "/home/debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "commands": {
+            "Build": "npm install --production"
+        }
+    },
+
+    "windows": {
+        "name": "Windows",
+        "qemu": "qemu-system-x86_64 -m 3G -smp 2 -rtc clock=host,base=localtime -drive if=pflash,format=raw,readonly=on,file=edk2-x86_64-code.fd -hda disk.qcow2 -netdev user,id=mynet,hostfwd=tcp::22205-:22 -device e1000,netdev=mynet -vga std",
+
+        "info": {
+            "platform": "win32",
+            "arch": "x64",
+
+            "port": 22205,
+            "username": "windows",
+            "password": "windows",
+            "home": "C:/Users/windows/Desktop",
+
+            "shutdown": "shutdown -s -t 0"
+        },
+
+        "uploads": {
+            "node32.cmd": "C:/Users/windows/Desktop/node32.cmd",
+            "node64.cmd": "C:/Users/windows/Desktop/node64.cmd"
+        },
+
+        "commands": {
+            "Build 32 bit": "rm -rf node_modules build && C:\\Users\\windows\\Desktop\\node32.cmd npm install --production",
+            "Build 64 bit": "rm -rf node_modules build && C:\\Users\\windows\\Desktop\\node64.cmd npm install --production"
+        }
+    }
+}

package/test/registry/sha256sum.txt

@@ -0,0 +1,21 @@
+917434189b3170e4d706ab5ea17d6e0d84156e53efe7b66dd819b3e5c5793ca7 *qemu/windows/node32.cmd
+9a5a32e409b29d4da5fb01926600b1e74929983a10c335076cea7c6da86afbdd *qemu/windows/install.sh
+9fa066ab45385a5b62f5999ed755f9b26e40ed4321183d5585015b1eae08a295 *qemu/windows/edk2-x86_64-code.fd
+6ad44ae3aba7135fbb04e6f140b655f75a96ee7614cec3d464ea456a0a4f7b6d *qemu/windows/node64.cmd
+1261924a280eaf7868fd80e8bc405623a2ff23dcf0d7d20aaf559cd82621acee *qemu/windows/disk.qcow2
+6905a7437eb14e56393380cb80f292a6e909a38edce4490725b75756d2d6abc2 *qemu/debian_x64/vmlinuz-5.10.0-11-amd64
+2dd90d98ad51038607c8c3ddf0bdb899d14e2663979f1ccf63571bce3201c23d *qemu/debian_x64/install.sh
+ca8f063e5e0ac76fac042a6b2d4979c65ceb499cb6a62dee43f2929a4021b5e9 *qemu/debian_x64/initrd.img-5.10.0-11-amd64
+adacb26f9b463ba862960ce3f262024be469e51b2acaf56af2d0663168dc72df *qemu/debian_x64/disk.qcow2
+d328d5f4d09df41d309a51c9d639fb0026a17923755aa6aa66ce95f43f4e8672 *qemu/debian_arm64/install.sh
+12c8ea20749f5b382b55f18fc867a8c193b7abaec47258333712c978053905f3 *qemu/debian_arm64/vmlinuz-5.10.0-11-arm64
+ff13f47dd707bd4575f28edc40192d9340ad40d83f7a626334bbf06b87b08150 *qemu/debian_arm64/initrd.img-5.10.0-11-arm64
+124ab1e697d53777f6ff0abd4d76841dce6495cdbe063be2aced9c72a2b54d2d *qemu/debian_arm64/disk.qcow2
+30a49257d22e3188a25f039288afcc3b83a0fb0bf33e99c838cd2031a152a64b *qemu/debian_arm32/install.sh
+5eec68312466d090772fe35be3ef89d6adf5def8e7b55f6fcdda5dfe8b8abb0a *qemu/debian_arm32/initrd.img-5.10.0-11-armmp-lpae
+9c3c30a7b2c063798c70f6b54c5161c3634fb8f4ec87f709c7c6f21c12d08eb6 *qemu/debian_arm32/vmlinuz-5.10.0-11-armmp-lpae
+cb751162b06e0d1a73d2384192b6d6ad5718aec65b1639874b4b16db0a67e35c *qemu/debian_arm32/disk.qcow2
+30e81c14b410de1dc210a3754779f8f00e5a6b2b29a94e757ace5fea725b85f5 *qemu/debian_i386/install.sh
+4ba8aaa59941c776cb10d8de37e531087878b05066191d97d96462901e838f21 *qemu/debian_i386/initrd.img-5.10.0-11-686-pae
+93716af14bf453ac9ea6bba629bec78c279a7598782a3a77276cd9b268f62987 *qemu/debian_i386/vmlinuz-5.10.0-11-686-pae
+03ad8625e934b3cb65be2c5ea6f5fdd4bf7c047fd921b320fee1d8be124d5814 *qemu/debian_i386/disk.qcow2