Fix WebAssembly.instantiate() handling

Qwokka · Feb 6, 2024 · 7f7b851 · 7f7b851
1 parent 7d2a3a0
commit 7f7b851
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/content/init.js b/content/init.js
@@ -1134,8 +1134,10 @@ const webAssemblyInstantiateHook = function(inObject, importObject = {}) {
         importObject.env = {};
     }
 
-    importObject.env.readWatchCallback = readWatchCallback;
-    importObject.env.writeWatchCallback = writeWatchCallback;
+    const cetusIdentifier = cetusInstances.reserveIdentifier();
+
+    importObject.env.readWatchCallback = function() { readWatchCallback(cetusIdentifier) };
+    importObject.env.writeWatchCallback = function() { writeWatchCallback(cetusIdentifier) };
 
     return new Promise(function(resolve, reject) {
         oldWebAssemblyInstantiate(instrumentedObject, importObject).then(function(instanceObject) {
@@ -1159,8 +1161,6 @@ const webAssemblyInstantiateHook = function(inObject, importObject = {}) {
                 colorError("WebAssembly.instantiate() failed to retrieve a WebAssembly.Memory object");
             }
 
-            const cetusIdentifier = cetusInstances.reserveIdentifier();
-
             const watchpointExports = [];
 
             for (let i = 0; i < cetusOptions.wpCount; i++) {
@@ -1235,12 +1235,12 @@ const webAssemblyInstanceProxy = new Proxy(WebAssembly.Instance, {
             importObject.env = {};
         }
 
-        importObject.env.readWatchCallback = readWatchCallback;
-        importObject.env.writeWatchCallback = writeWatchCallback;
+        const cetusIdentifier = cetusInstances.reserveIdentifier();
 
-        const result = new target(module, importObject);
+        importObject.env.readWatchCallback = function() { readWatchCallback(cetusIdentifier) };
+        importObject.env.writeWatchCallback = function() { writeWatchCallback(cetusIdentifier) };
 
-        const cetusIdentifier = cetusInstances.reserveIdentifier();
+        const result = new target(module, importObject);
 
         const watchpointExports = [];