From 1a3c1a58cc7e97a846f612baf7f74a370980458f Mon Sep 17 00:00:00 2001
From: Heejin Ahn <aheejin@gmail.com>
Date: Tue, 21 May 2019 13:25:14 -0700
Subject: Reflect instruction renaming in code (#2128)

- Reflected new renamed instruction names in code and tests:
  - `get_local` -> `local.get`
  - `set_local` -> `local.set`
  - `tee_local` -> `local.tee`
  - `get_global` -> `global.get`
  - `set_global` -> `global.set`
  - `current_memory` -> `memory.size`
  - `grow_memory` -> `memory.grow`

- Removed APIs related to old instruction names in Binaryen.js and added
  APIs with new names if they are missing.

- Renamed `typedef SortedVector LocalSet` to `SetsOfLocals` to prevent
  name clashes.

- Resolved several TODO renaming items in wasm-binary.h:
  - `TableSwitch` -> `BrTable`
  - `I32ConvertI64` -> `I32WrapI64`
  - `I64STruncI32` -> `I64SExtendI32`
  - `I64UTruncI32` -> `I64UExtendI32`
  - `F32ConvertF64` -> `F32DemoteI64`
  - `F64ConvertF32` -> `F64PromoteF32`

- Renamed `BinaryenGetFeatures` and `BinaryenSetFeatures` to
  `BinaryenModuleGetFeatures` and `BinaryenModuleSetFeatures` for
  consistency.
---
 test/wasm2js/grow-memory-tricky.2asm.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/wasm2js/grow-memory-tricky.2asm.js')

diff --git a/test/wasm2js/grow-memory-tricky.2asm.js b/test/wasm2js/grow-memory-tricky.2asm.js
index ed69a4a43..0e92bc100 100644
--- a/test/wasm2js/grow-memory-tricky.2asm.js
+++ b/test/wasm2js/grow-memory-tricky.2asm.js
@@ -23,7 +23,7 @@ function asmFunc(global, env, buffer) {
  var infinity = global.Infinity;
  function $0() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_grow_memory(1 | 0)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_memory_grow(1 | 0)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return HEAP32[0 >> 2] | 0 | 0;
  }
  
@@ -34,13 +34,13 @@ function asmFunc(global, env, buffer) {
  }
  
  function grow() {
-  return __wasm_grow_memory(1 | 0) | 0;
+  return __wasm_memory_grow(1 | 0) | 0;
  }
  
  var FUNCTION_TABLE = [];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -60,14 +60,14 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
  return {
   "memory": Object.create(Object.prototype, {
    "grow": {
-    "value": __wasm_grow_memory
+    "value": __wasm_memory_grow
    }, 
    "buffer": {
     "get": function () {
-- 
cgit v1.2.3