WIP

Author: kateinoigakukun

IntegrationTests/JavaScriptKitExec/Sources/JavaScriptKitExec/main.swift

@@ -71,7 +71,6 @@ Value_Construction: do {
     let globalObject1 = getJSValue(this: .global, name: "globalObject1")
     let globalObject1Ref = try expectObject(globalObject1)
     let prop_7 = getJSValue(this: globalObject1Ref, name: "prop_7")
-    print(prop_7)
     try expectEqual(Double.construct(from: prop_7), 3.14)
     try expectEqual(Float.construct(from: prop_7), 3.14)
 } catch {

IntegrationTests/index.js

@@ -9,6 +9,20 @@ const readFile = promisify(fs.readFile);
 const swift = new SwiftRuntime();
 // Instantiate a new WASI Instance
 const wasmFs = new WasmFs();
+// Output stdout and stderr to console
+const originalWriteSync = wasmFs.fs.writeSync;
+wasmFs.fs.writeSync = (fd, buffer, offset, length, position) => {
+  const text = new TextDecoder("utf-8").decode(buffer);
+  switch (fd) {
+  case 1:
+    console.log(text);
+    break;
+  case 2:
+    console.error(text);
+    break;
+  }
+  return originalWriteSync(fd, buffer, offset, length, position);
+};
 let wasi = new WASI({
   args: [],
   env: {},
@@ -39,7 +53,6 @@ global.globalObject1 = {
   },
   "prop_6": {
     "call_host_1": () => {
-      console.log(global.globalObject1.prop_6)
       return global.globalObject1.prop_6.host_func_1()
     }
   },
@@ -71,10 +84,6 @@ const startWasiTask = async () => {
   swift.setInsance(instance);
   // Start the WebAssembly WASI instance!
   wasi.start(instance);
-
-  // Output what's inside of /dev/stdout!
-  const stdout = await wasmFs.getStdOut();
-  console.log(stdout);
 };
 startWasiTask().catch(err => {
   console.log(err)

Runtime/src/index.ts

@@ -102,8 +102,8 @@ export class SwiftRuntime {
             const argv = exports.swjs_prepare_host_function_call(argc)
             for (let index = 0; index < args.length; index++) {
                 const argument = args[index]
-                const base = argv + 20 * index
-                writeValue(argument, base, base + 4, base + 8, base + 12)
+                const base = argv + 24 * index
+                writeValue(argument, base, base + 4, base + 8, base + 16)
             }
             let output: any;
             const callback_func_ref = this.heap.allocHeap(function (result: any) {
@@ -184,10 +184,6 @@ export class SwiftRuntime {
                     return undefined
                 }
                 case JavaScriptValueKind.Function: {
-                    // console.log("decoding function:")
-                    // console.log("  payload1: " + payload1)
-                    // console.log("Heap Contents:")
-                    // console.log(this.heap)
                     return this.heap.referenceHeap(payload1)
                 }
                 default:
@@ -203,6 +199,7 @@ export class SwiftRuntime {
                 writeUint32(kind_ptr, JavaScriptValueKind.Null);
                 writeUint32(payload1_ptr, 0);
                 writeUint32(payload2_ptr, 0);
+                return;
             }
             switch (typeof value) {
                 case "boolean": {
@@ -250,16 +247,16 @@ export class SwiftRuntime {
         }
 
         // Note:
-        // `decodeValues` assumes that the size of RawJSValue is 16
-        // and the alignment of it is 4
+        // `decodeValues` assumes that the size of RawJSValue is 24
+        // and the alignment of it is 8
         const decodeValues = (ptr: pointer, length: number) => {
             let result = []
             for (let index = 0; index < length; index++) {
-                const base = ptr + 16 * index
+                const base = ptr + 24 * index
                 const kind = readUInt32(base)
-                const payload1 = readFloat64(base + 4)
+                const payload1 = readUInt32(base + 4)
                 const payload2 = readUInt32(base + 8)
-                const payload3 = readUInt32(base + 12)
+                const payload3 = readFloat64(base + 16)
                 result.push(decodeValue(kind, payload1, payload2, payload3))
             }
             return result
@@ -272,13 +269,6 @@ export class SwiftRuntime {
                 payload1: number, payload2: number, payload3: number
             ) => {
                 const obj = this.heap.referenceHeap(ref);
-                // console.log("swjs_set_prop");
-                // console.log("  name: " + readString(name, length));
-                // console.log("  kind: " + kind)
-                // console.log("  payload1: " + payload1)
-                // console.log("  payload2: " + payload2)
-                // console.log("  payload3: " + payload3)
-                // console.log("  value: " + decodeValue(kind, payload1, payload2, payload3))
                 Reflect.set(obj, readString(name, length), decodeValue(kind, payload1, payload2, payload3))
             },
             swjs_get_prop: (

Sources/JavaScriptKit/JSFunction.swift

@@ -5,8 +5,8 @@ public class JSFunctionRef: JSObjectRef {
 
     @discardableResult
     public func dynamicallyCall(withArguments arguments: [JSValueConvertible]) -> JSValue {
-        let result = arguments.withRawJSValues { rawValues in
-            rawValues.withUnsafeBufferPointer { bufferPointer -> RawJSValue in
+        let result = arguments.withRawJSValues { rawValues -> RawJSValue in
+            return rawValues.withUnsafeBufferPointer { bufferPointer -> RawJSValue in
                 let argv = bufferPointer.baseAddress
                 let argc = bufferPointer.count
                 var result = RawJSValue()