Merge pull request #678 from WebAssembly/stack

Stack machine + 0xc update

2 files changed, 10 insertions, 3 deletions

diff --git a/scripts/fuzz_relooper.py b/scripts/fuzz_relooper.py
index 53a16c8bd..52c296e58 100644
--- a/scripts/fuzz_relooper.py
+++ b/scripts/fuzz_relooper.py
@@ -114,7 +114,8 @@ int main() {
       BinaryenLoad(module, 4, 0, 0, 0, BinaryenInt32(),
                    BinaryenConst(module, BinaryenLiteralInt32(4))),
       BinaryenConst(module, BinaryenLiteralInt32(4))
-    )
+    ),
+    BinaryenInt32()
   );
 
   // optionally, print the return value
@@ -252,7 +253,8 @@ int main() {
       full[i] = BinaryenStore(module,
         4, 0, 0,
         BinaryenConst(module, BinaryenLiteralInt32(8 + 4 * i)),
-        BinaryenConst(module, BinaryenLiteralInt32(decisions[i]))
+        BinaryenConst(module, BinaryenLiteralInt32(decisions[i])),
+        BinaryenInt32()
       );
     }
   }
diff --git a/scripts/support.py b/scripts/support.py
index 2d4318980..7b61d5a03 100755
--- a/scripts/support.py
+++ b/scripts/support.py
@@ -100,7 +100,12 @@ def split_wast(wast):
     depth = 1
     while depth > 0 and j < len(wast):
       if wast[j] == '"':
-        j = wast.find('"', j + 1)
+        while 1:
+          j = wast.find('"', j + 1)
+          if wast[j - 1] == '\\':
+            continue
+          break
+        assert j > 0
       elif wast[j] == '(':
         depth += 1
       elif wast[j] == ')':