koffi 1.0.1 → 1.0.2

package/qemu/registry/machines.json

@@ -0,0 +1,415 @@
+{
+    "debian_arm32": {
+        "name": "Debian ARM32",
+
+        "qemu": {
+            "binary": "qemu-system-arm",
+            "arguments": ["-M", "virt", "-cpu", "cortex-a15", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-armmp-lpae", "-initrd", "initrd.img-5.10.0-12-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", "-vnc", "127.0.0.1:11"]
+        },
+
+        "info": {
+            "version": 3,
+            "platform": "linux",
+            "arch": "arm",
+
+            "ssh_port": 22201,
+            "vnc_port": 5911,
+
+            "username": "debian",
+            "password": "debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "builds": {
+            "Linux ARM32": {
+                "directory": "/home/debian/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "Linux ARM32": {
+                "directory": "/home/debian/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/raylib.js",
+                    "Test Misc": "node test/misc.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "debian_arm64": {
+        "name": "Debian ARM64",
+
+        "qemu": {
+            "binary": "qemu-system-aarch64",
+            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-arm64", "-initrd", "initrd.img-5.10.0-12-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", "-vnc", "127.0.0.1:12"]
+        },
+
+        "info": {
+            "version": 3,
+            "platform": "linux",
+            "arch": "arm64",
+
+            "ssh_port": 22202,
+            "vnc_port": 5912,
+
+            "username": "debian",
+            "password": "debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "builds": {
+            "Linux ARM64": {
+                "directory": "/home/debian/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "Linux ARM64": {
+                "directory": "/home/debian/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/raylib.js",
+                    "Test Misc": "node test/misc.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "debian_i386": {
+        "name": "Debian i386",
+
+        "qemu": {
+            "binary": "qemu-system-i386",
+            "arguments": ["-cpu", "max", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-686-pae", "-initrd", "initrd.img-5.10.0-12-686-pae", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22203-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:13"]
+        },
+
+        "info": {
+            "version": 3,
+            "platform": "linux",
+            "arch": "ia32",
+
+            "ssh_port": 22203,
+            "vnc_port": 5913,
+
+            "username": "debian",
+            "password": "debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "builds": {
+            "Linux i386": {
+                "directory": "/home/debian/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "Linux i386": {
+                "directory": "/home/debian/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/raylib.js",
+                    "Test Misc": "node test/misc.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "debian_x64": {
+        "name": "Debian x64",
+
+        "qemu": {
+            "binary": "qemu-system-x86_64",
+            "arguments": ["-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-amd64", "-initrd", "initrd.img-5.10.0-12-amd64", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22204-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:14"]
+        },
+
+        "info": {
+            "version": 3,
+            "platform": "linux",
+            "arch": "x64",
+
+            "ssh_port": 22204,
+            "vnc_port": 5914,
+
+            "username": "debian",
+            "password": "debian",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "builds": {
+            "Linux x64": {
+                "directory": "/home/debian/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "Linux x64": {
+                "directory": "/home/debian/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/raylib.js",
+                    "Test Misc": "node test/misc.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "windows": {
+        "name": "Windows",
+
+        "qemu": {
+            "binary": "qemu-system-x86_64",
+            "arguments": ["-m", "3G", "-smp", 4, "-rtc", "clock=host,base=localtime", "-bios", "bios.bin", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22205-:22", "-device", "e1000,netdev=mynet", "-vga", "std", "-device", "qemu-xhci", "-device", "usb-tablet", "-vnc", "127.0.0.1:15"]
+        },
+
+        "info": {
+            "version": 7,
+            "platform": "win32",
+            "arch": "x64",
+
+            "ssh_port": 22205,
+            "vnc_port": 5915,
+
+            "username": "windows",
+            "password": "windows",
+
+            "shutdown": "shutdown -s -t 0"
+        },
+
+        "builds": {
+            "Windows i386": {
+                "arch": "ia32",
+                "directory": "C:/Users/windows/Desktop/luigi32",
+                "build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js"
+            },
+
+            "Windows x64": {
+                "arch": "x64",
+                "directory": "C:/Users/windows/Desktop/luigi64",
+                "build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "Windows i386": {
+                "directory": "C:/Users/windows/Desktop/luigi32",
+                "build": {
+                    "Build": "C:\\Node32\\node32.cmd node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "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"
+                }
+            },
+
+            "Windows x64": {
+                "directory": "C:/Users/windows/Desktop/luigi64",
+                "build": {
+                    "Build": "C:\\Node64\\node64.cmd node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "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"
+                }
+            }
+        }
+    },
+
+    "freebsd_x64": {
+        "name": "FreeBSD x64",
+
+        "qemu": {
+            "binary": "qemu-system-x86_64",
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22206-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:16"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "freebsd",
+            "arch": "x64",
+
+            "ssh_port": 22206,
+            "vnc_port": 5916,
+
+            "username": "freebsd",
+            "password": "freebsd",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "builds": {
+            "FreeBSD x64": {
+                "directory": "/home/freebsd/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "FreeBSD x64": {
+                "directory": "/home/freebsd/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/raylib.js",
+                    "Test Misc": "node test/misc.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "freebsd_i386": {
+        "name": "FreeBSD i386",
+
+        "qemu": {
+            "binary": "qemu-system-i386",
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22207-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:17"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "freebsd",
+            "arch": "ia32",
+
+            "ssh_port": 22207,
+            "vnc_port": 5917,
+
+            "username": "freebsd",
+            "password": "freebsd",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "builds": {
+            "FreeBSD i386": {
+                "directory": "/home/freebsd/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "FreeBSD i386": {
+                "directory": "/home/freebsd/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/raylib.js",
+                    "Test Misc": "node test/misc.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "freebsd_arm64": {
+        "name": "FreeBSD ARM64",
+
+        "qemu": {
+            "binary": "qemu-system-aarch64",
+            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-drive", "if=pflash,format=raw,file=QEMU_EFI.img", "-drive", "if=pflash,file=varstore.img", "-drive", "if=virtio,file=disk.qcow2,format=qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22208-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:18"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "freebsd",
+            "arch": "arm64",
+
+            "ssh_port": 22208,
+            "vnc_port": 5918,
+
+            "username": "freebsd",
+            "password": "freebsd",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "builds": {
+            "FreeBSD ARM64": {
+                "directory": "/home/freebsd/luigi",
+                "build": "node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "FreeBSD ARM64": {
+                "directory": "/home/freebsd/luigi",
+                "build": {
+                    "Build": "node ../cnoke/cnoke.js -C test"
+                },
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/raylib.js",
+                    "Test Misc": "node test/misc.js",
+                    "Test SQLite": "node test/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "macos_x64": {
+        "name": "macOS x64",
+
+        "qemu": {
+            "binary": "qemu-system-x86_64",
+            "arguments": ["-m", "3G", "-machine", "q35", "-smp", 2, "-cpu", "Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc", "-device", "isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc", "-smbios", "type=2", "-drive", "if=pflash,format=raw,readonly=on,file=OVMF_CODE.fd", "-drive", "if=pflash,format=raw,file=OVMF_VARS-1024x768.fd", "-vga", "qxl", "-device", "ich9-intel-hda", "-device", "hda-output", "-usb", "-device", "usb-kbd", "-device", "usb-tablet", "-netdev", "user,id=net0,hostfwd=tcp::22209-:22", "-device", "e1000-82545em,netdev=net0,id=net0,mac=52:54:00:c9:18:27", "-device", "ich9-ahci,id=sata", "-drive", "id=ESP,if=none,format=qcow2,file=ESP.qcow2", "-device", "ide-hd,bus=sata.2,drive=ESP", "-drive", "id=SystemDisk,if=none,file=macOS.qcow2", "-device", "ide-hd,bus=sata.4,drive=SystemDisk", "-vnc", "127.0.0.1:19"]
+        },
+
+        "info": {
+            "version": 2,
+            "platform": "darwin",
+            "arch": "x64",
+
+            "ssh_port": 22209,
+            "vnc_port": 5919,
+
+            "username": "macos",
+            "password": "macos",
+
+            "shutdown": "sudo shutdown -h now"
+        },
+
+        "builds": {
+            "macOS x64": {
+                "directory": "/Users/macos/luigi",
+                "build": "PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk node ../cnoke/cnoke.js"
+            }
+        },
+
+        "tests": {
+            "macOS x64": {
+                "directory": "/Users/macos/luigi",
+                "build": {
+                    "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 SQLite": "PATH=/usr/local/bin:/usr/bin:/bin node test/sqlite.js"
+                }
+            }
+        }
+    }
+}

package/qemu/registry/sha256sum.txt

@@ -0,0 +1,45 @@
+10159baf262b43a92d95db59dae1f72c645127301661e0a3ce4e38b295a97c58 *qemu/windows/VERSION
+eb30b5652a0b7962710c72cb2ba79626347eee84ebe3fc5482a93ec8b8fe8b02 *qemu/windows/install.sh
+f8c9a1638a3fc2cdd214f2cbcad6fee0e3b2c9383942bbd49b3915bb4c3da102 *qemu/windows/bios.bin
+23792b98aef4d169a9a0382a474b279d24dc0757698870f16b950f44dd7c2c2c *qemu/windows/disk.qcow2
+1121cfccd5913f0a63fec40a6ffd44ea64f9dc135c66634ba001d10bcf4302a2 *qemu/debian_x64/VERSION
+ba418d2d602981fe324ae7a1a608b0f2d8d7c6113d03a429cc402e24ddc81311 *qemu/debian_x64/vmlinuz-5.10.0-12-amd64
+4d44622e8ce058017c08051d694b8e5afe9ff406b6ad91c17ebc4ec43d205c42 *qemu/debian_x64/install.sh
+e349fd503c943541f24a91198ef29c1df26f120fd294a4a01426bbf46d7423f1 *qemu/debian_x64/initrd.img-5.10.0-12-amd64
+c84dc75dcfcd9ceeb969d6d1d2d4c37ef9c5edfa3c5dd93c6073588a2b02be63 *qemu/debian_x64/disk.qcow2
+1121cfccd5913f0a63fec40a6ffd44ea64f9dc135c66634ba001d10bcf4302a2 *qemu/debian_arm64/VERSION
+79c324a3901d8864628e804ac6490ca372782f836c6ea7d9e9843bd066247274 *qemu/debian_arm64/install.sh
+d05326434988381b4048a2e4aeac08497487d17f0cddb3b5ab69123a5d7be9ea *qemu/debian_arm64/vmlinuz-5.10.0-12-arm64
+b582530fdfbcd347f9a371e059a93b42e68258b2526d7ac1f9facefb89f3194d *qemu/debian_arm64/initrd.img-5.10.0-12-arm64
+272d3d5d8b9a8d9505f0c236c92fbcdab4a118127b18727ca91fdc955927124f *qemu/debian_arm64/disk.qcow2
+1121cfccd5913f0a63fec40a6ffd44ea64f9dc135c66634ba001d10bcf4302a2 *qemu/debian_arm32/VERSION
+1b3784d44757394f8b318b85c2afda659ead4487e31600e635d0512eb41ce718 *qemu/debian_arm32/vmlinuz-5.10.0-12-armmp-lpae
+bb37ce287d9d262f467a4b88d0c45220f0d1abfa8e579511322c0c4572dd7774 *qemu/debian_arm32/install.sh
+fbbc2ed94c4a7bb22341f621e0226b71b8c3498f9a2cf4f7028af1c5c2b95006 *qemu/debian_arm32/initrd.img-5.10.0-12-armmp-lpae
+f52cd3988a0b8a5cd74f0cc3b3a36231f53618309d8ea9e98e056205bd1f8afb *qemu/debian_arm32/disk.qcow2
+ed05b84b7759ec945bb5422305a3a3c5b61d89e231844656ea31e07d89451a20 *qemu/debian_i386/vmlinuz-5.10.0-12-686-pae
+1121cfccd5913f0a63fec40a6ffd44ea64f9dc135c66634ba001d10bcf4302a2 *qemu/debian_i386/VERSION
+292a61c415a99a9c63a9337f1e074bea6c5df594e16bc40ded76141963c67ea4 *qemu/debian_i386/install.sh
+8dc1360e1c23ea21931f5eb94461d15fac6bcec00cf42bf1e590b7fb937e80c1 *qemu/debian_i386/initrd.img-5.10.0-12-686-pae
+338602d969f953cd88c2df736b9f8f7ee53029d233c83c7398258ae5bcb4e286 *qemu/debian_i386/disk.qcow2
+6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_arm64/VERSION
+5daea533330eb8d2f8df946561680e09f8dacc467fbf03d28caa2115d94386b5 *qemu/freebsd_arm64/QEMU_EFI.img
+a083e4e1f58f477e4a9e8ae30f75660e82275b88f77b5e2c7f5d6ee1deb43b41 *qemu/freebsd_arm64/varstore.img
+53a4dc48317e1c9de4a088cd45ba39a1810f0bafad75c7f810e18d4e3eb340e3 *qemu/freebsd_arm64/install.sh
+a19ad06aec7972f3b95a56fb9bb8ac8a6afcd61b586f398691d58c704e8c466e *qemu/freebsd_arm64/disk.qcow2
+10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_arm64/xvfb-run.sh
+6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_x64/VERSION
+06eef544fe9c61d3905b0e588c306d1dedac7ee7d4c01df154ff6ed64e25ef77 *qemu/freebsd_x64/install.sh
+060b66901313ddfcd434c20a7b13052b3e5126e43c4e44884b85191560bd99eb *qemu/freebsd_x64/disk.qcow2
+10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_x64/xvfb-run.sh
+6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_i386/VERSION
+bdeac2cca1d22d70c2d388a50709d5cba3069bbd4bd1bcb102955b0ee12ca3e9 *qemu/freebsd_i386/install.sh
+8191cea63d738cdca6df0b2d2d6953675e1dd33cac4d98fff88ba4367b182b64 *qemu/freebsd_i386/disk.qcow2
+10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_i386/xvfb-run.sh
+16a4f09b3e70b97f5cfb1cf9b913d67d0ec45c4342d202cc9a2b2cfee852a8de *qemu/macos_x64/ESP.qcow2
+5d2ac383371b408398accee7ec27c8c09ea5b74a0de0ceea6513388b15be5d1e *qemu/macos_x64/OVMF_VARS.fd
+d79538ac489f1948b04b65f12c5618c28e4a5de0be062f5cf1d73e422a091a37 *qemu/macos_x64/install.txt
+5bb918652a31eb2059450c8b0b9b2fdf51fb600a9bd892f4e6f66b4080e3e764 *qemu/macos_x64/macOS.qcow2
+5cc2d42949c7e4e763db0abeb88299972bafef991d87dbf744a5108ef9190f6f *qemu/macos_x64/OVMF_VARS-1024x768.fd
+53c234e5e8472b6ac51c1ae1cab3fe06fad053beb8ebfd8977b010655bfdd3c3 *qemu/macos_x64/VERSION
+2a247500e8ad9aa479994097ba5976bd881fde4de1516abd14491f3dba9fe060 *qemu/macos_x64/OVMF_CODE.fd

package/src/{call_arm32.cc → abi_arm32.cc}

@@ -84,6 +84,7 @@ bool AnalyseFunction(InstanceData *, FunctionInfo *func)
             case PrimitiveKind::Int32:
             case PrimitiveKind::UInt32:
             case PrimitiveKind::String:
+            case PrimitiveKind::String16:
             case PrimitiveKind::Pointer: {
                 if (gpr_avail) {
                     param.gpr_count = 1;
@@ -220,11 +221,8 @@ static Napi::Object PopHFA(napi_env env, const uint8_t *ptr, const TypeInfo *typ
     return obj;
 }
 
-Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, const Napi::CallbackInfo &info)
+Napi::Value CallData::Execute(const Napi::CallbackInfo &info)
 {
-    Napi::Env env = info.Env();
-    CallData call(env, instance, func);
-
     // Sanity checks
     if (info.Length() < (uint32_t)func->parameters.len) {
         ThrowError<Napi::TypeError>(env, "Expected %1 arguments, got %2", func->parameters.len, info.Length());
@@ -240,14 +238,14 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
     // registers just before the stack (so behind the vector ones).
     // In the armv7hf calling convention, some arguments can end up
     // partially in GPR, partially in the stack.
-    if (RG_UNLIKELY(!call.AllocStack(func->args_size, 16, &args_ptr)))
+    if (RG_UNLIKELY(!AllocStack(func->args_size, 16, &args_ptr)))
         return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(4 * 4, 8, &gpr_ptr)))
+    if (RG_UNLIKELY(!AllocStack(4 * 4, 8, &gpr_ptr)))
         return env.Null();
-    if (RG_UNLIKELY(!call.AllocStack(8 * 8, 8, &vec_ptr)))
+    if (RG_UNLIKELY(!AllocStack(8 * 8, 8, &vec_ptr)))
         return env.Null();
     if (func->ret.use_memory) {
-        if (RG_UNLIKELY(!call.AllocHeap(func->ret.type->size, 16, &return_ptr)))
+        if (RG_UNLIKELY(!AllocHeap(func->ret.type->size, 16, &return_ptr)))
             return env.Null();
         *(uint8_t **)(gpr_ptr++) = return_ptr;
     }
@@ -357,7 +355,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
-                    str = call.PushString(value);
+                    str = PushString(value);
                     if (RG_UNLIKELY(!str))
                         return env.Null();
                 } else if (IsNullOrUndefined(value)) {
@@ -374,6 +372,26 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     args_ptr += 4;
                 }
             } break;
+            case PrimitiveKind::String16: {
+                const char16_t *str16;
+                if (RG_LIKELY(value.IsString())) {
+                    str16 = PushString16(value);
+                    if (RG_UNLIKELY(!str16))
+                        return env.Null();
+                } 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();
+                }
+
+                if (RG_LIKELY(param.gpr_count)) {
+                    *(gpr_ptr++) = (uint64_t)str16;
+                } else {
+                    *(const char16_t **)args_ptr = str16;
+                    args_ptr += 4;
+                }
+            } break;
             case PrimitiveKind::Pointer: {
                 uint8_t *ptr;
 
@@ -382,11 +400,11 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 } else if (IsObject(value) && param.type->ref->primitive == PrimitiveKind::Record) {
                     Napi::Object obj = value.As<Napi::Object>();
 
-                    if (RG_UNLIKELY(!call.AllocHeap(param.type->ref->size, 16, &ptr)))
+                    if (RG_UNLIKELY(!AllocHeap(param.type->ref->size, 16, &ptr)))
                         return env.Null();
 
                     if (param.directions & 1) {
-                        if (!call.PushObject(obj, param.type->ref, ptr))
+                        if (!PushObject(obj, param.type->ref, ptr))
                             return env.Null();
                     } else {
                         memset(ptr, 0, param.type->size);
@@ -426,7 +444,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                     if (param.gpr_count) {
                         RG_ASSERT(param.type->align <= 8);
 
-                        if (!call.PushObject(obj, param.type, (uint8_t *)gpr_ptr))
+                        if (!PushObject(obj, param.type, (uint8_t *)gpr_ptr))
                             return env.Null();
 
                         gpr_ptr += param.gpr_count;
@@ -435,7 +453,7 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                         int16_t align = (param.type->align <= 4) ? 4 : 8;
 
                         args_ptr = AlignUp(args_ptr, align);
-                        if (!call.PushObject(obj, param.type, args_ptr))
+                        if (!PushObject(obj, param.type, args_ptr))
                             return env.Null();
                         args_ptr += AlignLen(param.type->size, 4);
                     }
@@ -445,30 +463,69 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
     }
 
     if (instance->debug) {
-        call.DumpDebug();
+        DumpDebug();
     }
 
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
-            auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, call.GetSP()) \
-                                         : ForwardCall ## Suffix(func->func, call.GetSP())); \
+            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: {
+            uint32_t r0 = (uint32_t)PERFORM_CALL(GG);
+            return Napi::Boolean::New(env, r0);
+        } break;
+        case PrimitiveKind::Int8: 
+        case PrimitiveKind::UInt8:
+        case PrimitiveKind::Int16:
+        case PrimitiveKind::UInt16:
+        case PrimitiveKind::Int32:
+        case PrimitiveKind::UInt32: {
+            uint32_t r0 = (uint32_t)PERFORM_CALL(GG);
+            return Napi::Number::New(env, (double)r0);
+        } break;
+        case PrimitiveKind::Int64: {
+            uint64_t ret = PERFORM_CALL(GG);
+            return Napi::BigInt::New(env, (int64_t)ret);
+        } break;
+        case PrimitiveKind::UInt64: {
+            uint64_t ret = PERFORM_CALL(GG);
+            return Napi::BigInt::New(env, ret);
+        } 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: {
+            uint32_t r0 = (uint32_t)PERFORM_CALL(GG);
+            return Napi::String::New(env, (const char *)r0);
+        } break;
+        case PrimitiveKind::String16: {
+            uint32_t r0 = (uint32_t)PERFORM_CALL(GG);
+            return Napi::String::New(env, (const char16_t *)r0);
+        } break;
+        case PrimitiveKind::Pointer: {
+            uint32_t r0 = (uint32_t)PERFORM_CALL(GG);
+            void *ptr = (void *)r0;
+
+            Napi::External<void> external = Napi::External<void>::New(env, ptr);
+            SetValueTag(instance, external, func->ret.type);
+
+            return external;
+        } break;
 
         case PrimitiveKind::Record: {
             if (func->ret.gpr_count) {
@@ -500,37 +557,6 @@ Napi::Value TranslateCall(InstanceData *instance, const FunctionInfo *func, cons
                 return obj;
             }
         } break;
-
-        default: {
-            uint64_t ret = PERFORM_CALL(GG);
-            uint32_t r0 = (uint32_t)ret;
-
-            switch (func->ret.type->primitive) {
-                case PrimitiveKind::Void: return env.Null();
-                case PrimitiveKind::Bool: return Napi::Boolean::New(env, r0);
-                case PrimitiveKind::Int8: return Napi::Number::New(env, (double)r0);
-                case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)r0);
-                case PrimitiveKind::Int16: return Napi::Number::New(env, (double)r0);
-                case PrimitiveKind::UInt16: return Napi::Number::New(env, (double)r0);
-                case PrimitiveKind::Int32: return Napi::Number::New(env, (double)r0);
-                case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)r0);
-                case PrimitiveKind::Int64: return Napi::BigInt::New(env, (int64_t)ret);
-                case PrimitiveKind::UInt64: return Napi::BigInt::New(env, ret);
-                case PrimitiveKind::Float32: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::Float64: { RG_UNREACHABLE(); } break;
-                case PrimitiveKind::String: return Napi::String::New(env, (const char *)r0);
-                case PrimitiveKind::Pointer: {
-                    void *ptr = (void *)r0;
-
-                    Napi::External<void> external = Napi::External<void>::New(env, ptr);
-                    SetValueTag(instance, external, func->ret.type);
-
-                    return external;
-                } break;
-
-                case PrimitiveKind::Record: { RG_UNREACHABLE(); } break;
-            }
-        } break;
     }
 
 #undef PERFORM_CALL