koffi 1.0.4 → 1.1.0-beta.1

package/README.md

@@ -2,6 +2,10 @@
 
 - [Introduction](#introduction)
 - [Get started](#get-started)
+- [Extra features](#extra-features)
+  * [Variadic functions](#variadic-functions)
+  * [Asynchronous calls](#asynchronous-calls)
+  * [Callbacks](#callbacks)
 - [Benchmarks](#benchmarks)
   * [atoi results](#atoi-results)
   * [Raylib results](#raylib-results)
@@ -17,36 +21,36 @@ Koffi is a fast and easy-to-use FFI module for Node.js, with support for primiti
 After the release of version 1.0, the following features are planned:
 
 * 1.1: Asynchronous calls
-* 1.2: C to JS callbacks
-* 1.3: Unions and (fixed size) array types
+* 1.2: Fixed-size array types
+* 1.3: C to JS callbacks
 
 The following platforms __are officially supported and tested__ at the moment:
 
-Platoform | Architecture                     | JS to C  | C to JS (callback) | Pre-built binary
---------- | -------------------------------- | -------- | ------------------ | ----------------
-Windows   | x86 (cdecl, stdcall, fastcall)   | 🟩 Yes   | 🟥 No              | 🟩 Yes
-Windows   | x86_64                           | 🟩 Yes   | 🟥 No              | 🟩 Yes
-Linux     | x86                              | 🟩 Yes   | 🟥 No              | 🟩 Yes
-Linux     | x86_64                           | 🟩 Yes   | 🟥 No              | 🟩 Yes
-Linux     | ARM32+VFP Little Endian          | 🟩 Yes   | 🟥 No              | 🟩 Yes
-Linux     | ARM64 Little Endian              | 🟩 Yes   | 🟥 No              | 🟩 Yes
-FreeBSD   | x86                              | 🟩 Yes   | 🟥 No              | 🟩 Yes
-FreeBSD   | x86_64                           | 🟩 Yes   | 🟥 No              | 🟩 Yes
-FreeBSD   | ARM64 Little Endian              | 🟩 Yes   | 🟥 No              | 🟩 Yes
-macOS     | x86_64                           | 🟩 Yes   | 🟥 No              | 🟩 Yes
-macOS     | ARM64 (M1) Little Endian         | 🟩 Yes   | 🟥 No              | 🟥 No
-OpenBSD   | x86_64                           | 🟧 Maybe | 🟥 No              | 🟥 No
-OpenBSD   | x86                              | 🟧 Maybe | 🟥 No              | 🟥 No
-OpenBSD   | ARM64 Little Endian              | 🟧 Maybe | 🟥 No              | 🟥 No
-NetBSD    | x86_64                           | 🟧 Maybe | 🟥 No              | 🟥 No
-NetBSD    | x86                              | 🟧 Maybe | 🟥 No              | 🟥 No
-NetBSD    | ARM64 Little Endian              | 🟧 Maybe | 🟥 No              | 🟥 No
+Platform  | Architecture                     | Sync calls | Async calls | Callbacks | Pre-built binary
+--------- | -------------------------------- | ---------- | ----------- | --------- | ----------------
+Windows   | x86 (cdecl, stdcall, fastcall)   | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+Windows   | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+Linux     | x86                              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+Linux     | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+Linux     | ARM32+VFP Little Endian          | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+Linux     | ARM64 Little Endian              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+FreeBSD   | x86                              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+FreeBSD   | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+FreeBSD   | ARM64 Little Endian              | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+macOS     | x86_64                           | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟩 Yes
+macOS     | ARM64 (M1) Little Endian         | 🟩 Yes      | 🟩 Yes       | 🟥 No      | 🟥 No
+OpenBSD   | x86_64                           | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
+OpenBSD   | x86                              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
+OpenBSD   | ARM64 Little Endian              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
+NetBSD    | x86_64                           | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
+NetBSD    | x86                              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
+NetBSD    | ARM64 Little Endian              | 🟧 Maybe    | 🟧 Maybe     | 🟥 No      | 🟥 No
 
 🟩 Tested, fully operational
 🟧 May work, but not actively tested
 🟥 Does not work yet
 
-This is still in development, bugs are to expected. More tests will come in the near future.
+This is still in development, bugs are to be expected. More tests will come in the near future.
 
 # Get started
 
@@ -227,6 +231,31 @@ const printf = lib.func('printf', 'int', ['string', '...']);
 printf('Integer %d, double %g, string %s', 'int', 6, 'double', 8.5, 'string', 'THE END');
 ```
 
+## Asynchronous calls
+
+You can issue asynchronous calls by calling the function through its async member.
+In this case, you need to provide a callback function as the last argument, with
+`(err, res)` parameters.
+
+```js
+const koffi = require('koffi');
+const lib = koffi.load('libc.so.6');
+
+const atoi = lib.func('int atoi(const char *str)');
+
+atoi.async('1257', (err, res) => {
+    console.log('Result:', res);
+})
+console.log('Hello World!');
+
+// This program will print "Hello World!", and then "Result: 1257"
+```
+
+You can easily convert this callback-style async function with `util.promisify()` from the
+Node.js standard library.
+
+Variadic functions do not support async.
+
 ## Callbacks
 
 Koffi does not yet support passing JS functions as callbacks. This is planned for version 1.1.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "1.0.4",
+  "version": "1.1.0-beta.1",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",

package/qemu/qemu.js

@@ -430,16 +430,22 @@ async function copy(func) {
         let copied = true;
 
         for (let directory of func(machine)) {
-            try {
-                await machine.ssh.exec('rm', ['-rf', directory]);
-            } catch (err) {
-                // Fails often on Windows (busy directory or whatever), but rarely a problem
+            for (let i = 0; i < 10; i++) {
+                try {
+                    await machine.ssh.exec('rm', ['-rf', directory]);
+                    break;
+                } catch (err) {
+                    // Fails often on Windows (busy directory or whatever), but rarely a problem
+
+                    await wait(1000);
+                    continue;
+                }
             }
 
             try {
                 await machine.ssh.putDirectory(snapshot_dir, directory, {
                     recursive: true,
-                    concurrency: 4
+                    concurrency: (process.platform != 'win32') ? 4 : 1
                 });
             } catch (err) {
                 ignore.add(machine);

package/qemu/registry/machines.json

@@ -35,8 +35,9 @@
                     "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
                     "Test Raylib": "xvfb-run node test/raylib.js",
-                    "Test Misc": "node test/misc.js",
                     "Test SQLite": "node test/sqlite.js"
                 }
             }
@@ -79,8 +80,9 @@
                     "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
                     "Test Raylib": "xvfb-run node test/raylib.js",
-                    "Test Misc": "node test/misc.js",
                     "Test SQLite": "node test/sqlite.js"
                 }
             }
@@ -123,8 +125,9 @@
                     "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
                     "Test Raylib": "xvfb-run node test/raylib.js",
-                    "Test Misc": "node test/misc.js",
                     "Test SQLite": "node test/sqlite.js"
                 }
             }
@@ -167,8 +170,9 @@
                     "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
                     "Test Raylib": "xvfb-run node test/raylib.js",
-                    "Test Misc": "node test/misc.js",
                     "Test SQLite": "node test/sqlite.js"
                 }
             }
@@ -218,8 +222,9 @@
                     "Build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "C:\\Node32\\node32.cmd node test/sync.js",
+                    "Test Async": "C:\\Node32\\node32.cmd node test/async.js",
                     "Test Raylib": "seatsh C:\\Node32\\node32.cmd node test/raylib.js",
-                    "Test Misc": "C:\\Node32\\node32.cmd node test/misc.js",
                     "Test SQLite": "C:\\Node32\\node32.cmd node test/sqlite.js"
                 }
             },
@@ -230,8 +235,9 @@
                     "Build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "C:\\Node64\\node64.cmd node test/sync.js",
+                    "Test Async": "C:\\Node64\\node64.cmd node test/async.js",
                     "Test Raylib": "seatsh C:\\Node64\\node64.cmd node test/raylib.js",
-                    "Test Misc": "C:\\Node64\\node64.cmd node test/misc.js",
                     "Test SQLite": "C:\\Node64\\node64.cmd node test/sqlite.js"
                 }
             }
@@ -274,8 +280,9 @@
                     "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
                     "Test Raylib": "xvfb-run node test/raylib.js",
-                    "Test Misc": "node test/misc.js",
                     "Test SQLite": "node test/sqlite.js"
                 }
             }
@@ -318,8 +325,9 @@
                     "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
                     "Test Raylib": "xvfb-run node test/raylib.js",
-                    "Test Misc": "node test/misc.js",
                     "Test SQLite": "node test/sqlite.js"
                 }
             }
@@ -362,8 +370,9 @@
                     "Build": "node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
+                    "Test Sync": "node test/sync.js",
+                    "Test Async": "node test/async.js",
                     "Test Raylib": "xvfb-run node test/raylib.js",
-                    "Test Misc": "node test/misc.js",
                     "Test SQLite": "node test/sqlite.js"
                 }
             }
@@ -406,7 +415,8 @@
                     "Build": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js -C test"
                 },
                 "commands": {
-                    "Test Misc": "PATH=/usr/local/bin:/usr/bin:/bin node test/misc.js",
+                    "Test Sync": "PATH=/usr/local/bin:/usr/bin:/bin node test/sync.js",
+                    "Test Async": "PATH=/usr/local/bin:/usr/bin:/bin node test/async.js",
                     "Test SQLite": "PATH=/usr/local/bin:/usr/bin:/bin node test/sqlite.js"
                 }
             }

package/src/abi_arm32.cc

@@ -305,8 +305,11 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                         memset(ptr, 0, param.type->size);
                     }
                     if (param.directions & 2) {
-                        OutObject out = {obj, ptr, param.type->ref};
-                        out_objects.Append(out);
+                        OutObject *out = out_objects.AppendDefault();
+
+                        out->ref.Reset(obj, 1);
+                        out->ptr = ptr;
+                        out->type = param.type->ref;
                     }
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
@@ -391,6 +394,9 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+    stack = MakeSpan(mem->stack.end(), old_stack_mem.end() - mem->stack.end());
+    heap = MakeSpan(old_heap_mem.ptr, mem->heap.ptr - old_heap_mem.ptr);
+
     return true;
 }
 
@@ -398,8 +404,8 @@ void CallData::Execute()
 {
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, GetSP())); \
+            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, stack.ptr) \
+                                         : ForwardCall ## Suffix(func->func, stack.ptr)); \
             return ret; \
         })()
 
@@ -435,8 +441,9 @@ void CallData::Execute()
 
 Napi::Value CallData::Complete()
 {
-    for (const OutObject &obj: out_objects) {
-        PopObject(obj.obj, obj.ptr, obj.type);
+    for (const OutObject &out: out_objects) {
+        Napi::Object obj = out.ref.Value().As<Napi::Object>();
+        PopObject(obj, out.ptr, out.type);
     }
 
     switch (func->ret.type->primitive) {

package/src/abi_arm64.cc

@@ -384,8 +384,11 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                         memset(ptr, 0, param.type->size);
                     }
                     if (param.directions & 2) {
-                        OutObject out = {obj, ptr, param.type->ref};
-                        out_objects.Append(out);
+                        OutObject *out = out_objects.AppendDefault();
+
+                        out->ref.Reset(obj, 1);
+                        out->ptr = ptr;
+                        out->type = param.type->ref;
                     }
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
@@ -451,6 +454,9 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+    stack = MakeSpan(mem->stack.end(), old_stack_mem.end() - mem->stack.end());
+    heap = MakeSpan(old_heap_mem.ptr, mem->heap.ptr - old_heap_mem.ptr);
+
     return true;
 }
 
@@ -458,8 +464,8 @@ void CallData::Execute()
 {
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, GetSP())); \
+            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, stack.ptr) \
+                                         : ForwardCall ## Suffix(func->func, stack.ptr)); \
             return ret; \
         })()
 
@@ -498,8 +504,9 @@ void CallData::Execute()
 
 Napi::Value CallData::Complete()
 {
-    for (const OutObject &obj: out_objects) {
-        PopObject(obj.obj, obj.ptr, obj.type);
+    for (const OutObject &out: out_objects) {
+        Napi::Object obj = out.ref.Value().As<Napi::Object>();
+        PopObject(obj, out.ptr, out.type);
     }
 
     switch (func->ret.type->primitive) {

package/src/abi_x64_sysv.cc

@@ -308,8 +308,11 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                         memset(ptr, 0, param.type->size);
                     }
                     if (param.directions & 2) {
-                        OutObject out = {obj, ptr, param.type->ref};
-                        out_objects.Append(out);
+                        OutObject *out = out_objects.AppendDefault();
+
+                        out->ref.Reset(obj, 1);
+                        out->ptr = ptr;
+                        out->type = param.type->ref;
                     }
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
@@ -402,6 +405,9 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+    stack = MakeSpan(mem->stack.end(), old_stack_mem.end() - mem->stack.end());
+    heap = MakeSpan(old_heap_mem.ptr, mem->heap.ptr - old_heap_mem.ptr);
+
     return true;
 }
 
@@ -409,8 +415,8 @@ void CallData::Execute()
 {
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, GetSP())); \
+            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, stack.ptr) \
+                                         : ForwardCall ## Suffix(func->func, stack.ptr)); \
             return ret; \
         })()
 
@@ -453,8 +459,9 @@ void CallData::Execute()
 
 Napi::Value CallData::Complete()
 {
-    for (const OutObject &obj: out_objects) {
-        PopObject(obj.obj, obj.ptr, obj.type);
+    for (const OutObject &out: out_objects) {
+        Napi::Object obj = out.ref.Value().As<Napi::Object>();
+        PopObject(obj, out.ptr, out.type);
     }
 
     switch (func->ret.type->primitive) {

package/src/abi_x64_win.cc

@@ -148,8 +148,11 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                         memset(ptr, 0, param.type->size);
                     }
                     if (param.directions & 2) {
-                        OutObject out = {obj, ptr, param.type->ref};
-                        out_objects.Append(out);
+                        OutObject *out = out_objects.AppendDefault();
+
+                        out->ref.Reset(obj, 1);
+                        out->ptr = ptr;
+                        out->type = param.type->ref;
                     }
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
@@ -200,6 +203,9 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+    stack = MakeSpan(mem->stack.end(), old_stack_mem.end() - mem->stack.end());
+    heap = MakeSpan(old_heap_mem.ptr, mem->heap.ptr - old_heap_mem.ptr);
+
     return true;
 }
 
@@ -207,8 +213,8 @@ void CallData::Execute()
 {
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, GetSP())); \
+            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, stack.ptr) \
+                                         : ForwardCall ## Suffix(func->func, stack.ptr)); \
             return ret; \
         })()
 
@@ -236,8 +242,9 @@ void CallData::Execute()
 
 Napi::Value CallData::Complete()
 {
-    for (const OutObject &obj: out_objects) {
-        PopObject(obj.obj, obj.ptr, obj.type);
+    for (const OutObject &out: out_objects) {
+        Napi::Object obj = out.ref.Value().As<Napi::Object>();
+        PopObject(obj, out.ptr, out.type);
     }
 
     switch (func->ret.type->primitive) {

package/src/abi_x86.cc

@@ -192,8 +192,11 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                         memset(ptr, 0, param.type->size);
                     }
                     if (param.directions & 2) {
-                        OutObject out = {obj, ptr, param.type->ref};
-                        out_objects.Append(out);
+                        OutObject *out = out_objects.AppendDefault();
+
+                        out->ref.Reset(obj, 1);
+                        out->ptr = ptr;
+                        out->type = param.type->ref;
                     }
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
@@ -245,6 +248,9 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+    stack = MakeSpan(mem->stack.end(), old_stack_mem.end() - mem->stack.end());
+    heap = MakeSpan(old_heap_mem.ptr, mem->heap.ptr - old_heap_mem.ptr);
+
     return true;
 }
 
@@ -252,8 +258,8 @@ void CallData::Execute()
 {
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->convention == CallConvention::Fastcall ? ForwardCallR ## Suffix(func->func, GetSP()) \
-                                                                     : ForwardCall ## Suffix(func->func, GetSP())); \
+            auto ret = (func->convention == CallConvention::Fastcall ? ForwardCallR ## Suffix(func->func, stack.ptr) \
+                                                                     : ForwardCall ## Suffix(func->func, stack.ptr)); \
             return ret; \
         })()
 
@@ -282,8 +288,9 @@ void CallData::Execute()
 
 Napi::Value CallData::Complete()
 {
-    for (const OutObject &obj: out_objects) {
-        PopObject(obj.obj, obj.ptr, obj.type);
+    for (const OutObject &out: out_objects) {
+        Napi::Object obj = out.ref.Value().As<Napi::Object>();
+        PopObject(obj, out.ptr, out.type);
     }
 
     switch (func->ret.type->primitive) {

package/src/call.cc

@@ -20,19 +20,24 @@
 
 namespace RG {
 
-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)
+CallData::CallData(Napi::Env env, const FunctionInfo *func, InstanceMemory *mem, bool debug)
+    : env(env), instance(env.GetInstanceData<InstanceData>()), func(func), debug(debug),
+      mem(mem), old_stack_mem(mem->stack), old_heap_mem(mem->heap)
 {
-    RG_ASSERT(AlignUp(stack_mem->ptr, 16) == stack_mem->ptr);
-    RG_ASSERT(AlignUp(stack_mem->end(), 16) == stack_mem->end());
+    mem->depth++;
+
+    RG_ASSERT(AlignUp(mem->stack.ptr, 16) == mem->stack.ptr);
+    RG_ASSERT(AlignUp(mem->stack.end(), 16) == mem->stack.end());
 }
 
 CallData::~CallData()
 {
-    instance->stack_mem = old_stack_mem;
-    instance->heap_mem = old_heap_mem;
+    mem->stack = old_stack_mem;
+    mem->heap = old_heap_mem;
+
+    if (!--mem->depth && mem->temporary) {
+        delete mem;
+    }
 }
 
 const char *CallData::PushString(const Napi::Value &value)
@@ -45,8 +50,8 @@ const char *CallData::PushString(const Napi::Value &value)
     size_t len = 0;
     napi_status status;
 
-    buf.ptr = (char *)heap_mem->ptr;
-    buf.len = std::max((Size)0, heap_mem->len - Kibibytes(32));
+    buf.ptr = (char *)mem->heap.ptr;
+    buf.len = std::max((Size)0, mem->heap.len - Kibibytes(32));
 
     status = napi_get_value_string_utf8(env, value, buf.ptr, (size_t)buf.len, &len);
     RG_ASSERT(status == napi_ok);
@@ -54,15 +59,15 @@ const char *CallData::PushString(const Napi::Value &value)
     len++;
 
     if (RG_LIKELY(len < (size_t)buf.len)) {
-        heap_mem->ptr += (Size)len;
-        heap_mem->len -= (Size)len;
+        mem->heap.ptr += (Size)len;
+        mem->heap.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.ptr = (char *)Allocator::Allocate(&mem->big_alloc, (Size)len);
         buf.len = (Size)len;
 
         status = napi_get_value_string_utf8(env, value, buf.ptr, (size_t)buf.len, &len);
@@ -82,8 +87,8 @@ const char16_t *CallData::PushString16(const Napi::Value &value)
     size_t len = 0;
     napi_status status;
 
-    buf.ptr = (char16_t *)heap_mem->ptr;
-    buf.len = std::max((Size)0, heap_mem->len - Kibibytes(32)) / 2;
+    buf.ptr = (char16_t *)mem->heap.ptr;
+    buf.len = std::max((Size)0, mem->heap.len - Kibibytes(32)) / 2;
 
     status = napi_get_value_string_utf16(env, value, buf.ptr, (size_t)buf.len, &len);
     RG_ASSERT(status == napi_ok);
@@ -91,15 +96,15 @@ const char16_t *CallData::PushString16(const Napi::Value &value)
     len++;
 
     if (RG_LIKELY(len < (size_t)buf.len)) {
-        heap_mem->ptr += (Size)len * 2;
-        heap_mem->len -= (Size)len * 2;
+        mem->heap.ptr += (Size)len * 2;
+        mem->heap.len -= (Size)len * 2;
     } else {
         status = napi_get_value_string_utf16(env, value, nullptr, 0, &len);
         RG_ASSERT(status == napi_ok);
 
         len++;
 
-        buf.ptr = (char16_t *)Allocator::Allocate(&big_alloc, (Size)len * 2);
+        buf.ptr = (char16_t *)Allocator::Allocate(&mem->big_alloc, (Size)len * 2);
         buf.len = (Size)len;
 
         status = napi_get_value_string_utf16(env, value, buf.ptr, (size_t)buf.len, &len);
@@ -111,9 +116,6 @@ const char16_t *CallData::PushString16(const Napi::Value &value)
 
 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);
 
@@ -226,9 +228,6 @@ bool CallData::PushObject(const Napi::Object &obj, const TypeInfo *type, uint8_t
 
 void CallData::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) {
@@ -346,8 +345,8 @@ void CallData::DumpDebug() const
     }
     PrintLn(stderr, "Return: %1 (%2)", func->ret.type->name, FmtMemSize(func->ret.type->size));
 
-    DumpMemory("Stack", GetStack());
-    DumpMemory("Heap", GetHeap());
+    DumpMemory("Stack", stack);
+    DumpMemory("Heap", heap);
 }
 
 }