Rename atomic.notify and *.atomic.wait (#3353)

- atomic.notify -> memory.atomic.notify
- i32.atomic.wait -> memory.atomic.wait32
- i64.atomic.wait -> memory.atomic.wait64

See WebAssembly/threads#149.

This renames instruction name printing but not the internal data
structure names, such as `AtomicNotify`, which are not always the same
as printed instruction names anyway. This also does not modify C API.
But this fixes interface functions in binaryen.js because it seems
binaryen.js's interface functions all follow the corresponding
instruction names.

6 files changed, 18 insertions, 18 deletions

diff --git a/test/binaryen.js/atomics.js b/test/binaryen.js/atomics.js
index bd4b898bd..ce68656e0 100644
--- a/test/binaryen.js/atomics.js
+++ b/test/binaryen.js/atomics.js
@@ -59,21 +59,21 @@ module.addFunction("main", binaryen.none, binaryen.none, [], module.block("", [
   ),
   // wait and notify
   module.drop(
-    module.i32.atomic.wait(
+    module.memory.atomic.wait32(
       module.i32.const(0),
       module.i32.const(0),
       module.i64.const(0)
     )
   ),
   module.drop(
-    module.i64.atomic.wait(
+    module.memory.atomic.wait64(
       module.i32.const(0),
       module.i64.const(0),
       module.i64.const(0)
     )
   ),
   module.drop(
-    module.atomic.notify(
+    module.memory.atomic.notify(
       module.i32.const(0),
       module.i32.const(0)
     )
diff --git a/test/binaryen.js/atomics.js.txt b/test/binaryen.js/atomics.js.txt
index a58647617..091298d57 100644
--- a/test/binaryen.js/atomics.js.txt
+++ b/test/binaryen.js/atomics.js.txt
@@ -45,21 +45,21 @@
    )
   )
   (drop
-   (i32.atomic.wait
+   (memory.atomic.wait32
     (i32.const 0)
     (i32.const 0)
     (i64.const 0)
    )
   )
   (drop
-   (i64.atomic.wait
+   (memory.atomic.wait64
     (i32.const 0)
     (i64.const 0)
     (i64.const 0)
    )
   )
   (drop
-   (atomic.notify
+   (memory.atomic.notify
     (i32.const 0)
     (i32.const 0)
    )
diff --git a/test/binaryen.js/expressions.js b/test/binaryen.js/expressions.js
index 0d48e5551..a340adcbe 100644
--- a/test/binaryen.js/expressions.js
+++ b/test/binaryen.js/expressions.js
@@ -901,7 +901,7 @@ console.log("# AtomicWait");
   var ptr = module.i32.const(2);
   var expected = module.i32.const(3);
   var timeout = module.i64.const(4);
-  const theAtomicWait = binaryen.AtomicWait(module.i32.atomic.wait(ptr, expected, timeout));
+  const theAtomicWait = binaryen.AtomicWait(module.memory.atomic.wait32(ptr, expected, timeout));
   assert(theAtomicWait instanceof binaryen.AtomicWait);
   assert(theAtomicWait instanceof binaryen.Expression);
   assert(theAtomicWait.ptr === ptr);
@@ -926,7 +926,7 @@ console.log("# AtomicWait");
   assert(
     theAtomicWait.toText()
     ==
-    "(i64.atomic.wait\n (i32.const 5)\n (i32.const 6)\n (i64.const 7)\n)\n"
+    "(memory.atomic.wait64\n (i32.const 5)\n (i32.const 6)\n (i64.const 7)\n)\n"
   );
 
   module.dispose();
@@ -938,7 +938,7 @@ console.log("# AtomicNotify");
 
   var ptr = module.i32.const(1);
   var notifyCount = module.i32.const(2);
-  const theAtomicNotify = binaryen.AtomicNotify(module.atomic.notify(ptr, notifyCount));
+  const theAtomicNotify = binaryen.AtomicNotify(module.memory.atomic.notify(ptr, notifyCount));
   assert(theAtomicNotify instanceof binaryen.AtomicNotify);
   assert(theAtomicNotify instanceof binaryen.Expression);
   assert(theAtomicNotify.ptr === ptr);
@@ -957,7 +957,7 @@ console.log("# AtomicNotify");
   assert(
     theAtomicNotify.toText()
     ==
-    "(atomic.notify\n (i32.const 3)\n (i32.const 4)\n)\n"
+    "(memory.atomic.notify\n (i32.const 3)\n (i32.const 4)\n)\n"
   );
 
   module.dispose();
diff --git a/test/binaryen.js/expressions.js.txt b/test/binaryen.js/expressions.js.txt
index e2b34e501..ba946b296 100644
--- a/test/binaryen.js/expressions.js.txt
+++ b/test/binaryen.js/expressions.js.txt
@@ -128,14 +128,14 @@
 )
 
 # AtomicWait
-(i64.atomic.wait
+(memory.atomic.wait64
  (i32.const 5)
  (i32.const 6)
  (i64.const 7)
 )
 
 # AtomicNotify
-(atomic.notify
+(memory.atomic.notify
  (i32.const 3)
  (i32.const 4)
 )
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
index 769b1a7e0..836b7ab17 100644
--- a/test/binaryen.js/kitchen-sink.js
+++ b/test/binaryen.js/kitchen-sink.js
@@ -570,14 +570,14 @@ function test_core() {
       )
     ),
     module.drop(
-      module.i32.atomic.wait(
+      module.memory.atomic.wait32(
         module.i32.const(0),
         module.i32.const(0),
         module.i64.const(0)
       )
     ),
     module.drop(
-      module.atomic.notify(
+      module.memory.atomic.notify(
         module.i32.const(0),
         module.i32.const(0)
       )
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index 6c32962a7..4990c0abd 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -1896,14 +1896,14 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
        )
       )
       (drop
-       (i32.atomic.wait
+       (memory.atomic.wait32
         (i32.const 0)
         (i32.const 0)
         (i64.const 0)
        )
       )
       (drop
-       (atomic.notify
+       (memory.atomic.notify
         (i32.const 0)
         (i32.const 0)
        )
@@ -3778,14 +3778,14 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7}
        )
       )
       (drop
-       (i32.atomic.wait
+       (memory.atomic.wait32
         (i32.const 0)
         (i32.const 0)
         (i64.const 0)
        )
       )
       (drop
-       (atomic.notify
+       (memory.atomic.notify
         (i32.const 0)
         (i32.const 0)
        )