Rename more CurrentMemory to MemorySize and fix unittest

Author: Cellule

lib/Backend/IRBuilderAsmJs.cpp

@@ -1909,7 +1909,7 @@ IRBuilderAsmJs::BuildAsmReg1(Js::OpCodeAsmJs newOpcode, uint32 offset)
 void
 IRBuilderAsmJs::BuildAsmReg1(Js::OpCodeAsmJs newOpcode, uint32 offset, Js::RegSlot dstReg)
 {
-    Assert(newOpcode == Js::OpCodeAsmJs::CurrentMemory_Int);
+    Assert(newOpcode == Js::OpCodeAsmJs::MemorySize_Int);
     Js::RegSlot dstRegSlot = GetRegSlotFromIntReg(dstReg);
     IR::RegOpnd * dstOpnd = BuildDstOpnd(dstRegSlot, TyInt32);
     IR::IntConstOpnd* constZero = IR::IntConstOpnd::New(0, TyInt32, m_func);

lib/Runtime/ByteCode/OpCodesAsmJs.h

@@ -302,7 +302,7 @@ MACRO_EXTEND_WMS( Trunc_Db                   , Double2         , None
 MACRO_EXTEND_WMS( Trunc_Flt                  , Float2          , None            )
 MACRO_EXTEND_WMS( Nearest_Db                 , Double2         , None            )
 MACRO_EXTEND_WMS( Nearest_Flt                , Float2          , None            )
-MACRO_EXTEND_WMS( CurrentMemory_Int          , AsmReg1         , None            )
+MACRO_EXTEND_WMS( MemorySize_Int             , AsmReg1         , None            )
 MACRO_EXTEND_WMS( GrowMemory                 , Int2            , None            )
 MACRO_EXTEND    ( Unreachable_Void           , Empty           , OpNoFallThrough )
 MACRO_EXTEND_WMS( Conv_Check_DTI             , Int1Double1     , None            )

lib/Runtime/Language/InterpreterHandlerAsmJs.inl

@@ -256,7 +256,7 @@ EXDEF2_WMS( F1toF1Mem        , Trunc_Flt        , Wasm::WasmMath::Trunc<float>
 EXDEF2_WMS( F1toF1Mem        , Nearest_Flt      , Wasm::WasmMath::Nearest<float>                     )
 EXDEF2_WMS( D1toD1Mem        , Trunc_Db         , Wasm::WasmMath::Trunc<double>                      )
 EXDEF2_WMS( D1toD1Mem        , Nearest_Db       , Wasm::WasmMath::Nearest<double>                    )
-EXDEF2_WMS( VtoI1Mem         , CurrentMemory_Int, OP_GetMemorySize                                   )
+EXDEF2_WMS( VtoI1Mem         , MemorySize_Int   , OP_GetMemorySize                                   )
 EXDEF2_WMS( I1toI1Mem        , GrowMemory       , OP_GrowMemory                                      )
 EXDEF2    ( EMPTYASMJS       , Unreachable_Void , OP_Unreachable                                     )
 EXDEF2_WMS( D1toI1Ctx        , Conv_Check_DTI   , Wasm::WasmMath::F64ToI32<false /* saturating */>  )

lib/WasmReader/WasmBinaryOpCodes.h

@@ -169,8 +169,8 @@ WASM_MEMSTORE_OPCODE(I64StoreMem8,  0x3c, L_IL, true, Js::ArrayBufferView::TYPE_
 WASM_MEMSTORE_OPCODE(I64StoreMem16, 0x3d, L_IL, true, Js::ArrayBufferView::TYPE_INT16_TO_INT64, "i64.store16")
 WASM_MEMSTORE_OPCODE(I64StoreMem32, 0x3e, L_IL, true, Js::ArrayBufferView::TYPE_INT32_TO_INT64, "i64.store32")
 
-WASM_MISC_OPCODE(CurrentMemory, 0x3f, I_I, true, "current_memory")
-WASM_MISC_OPCODE(GrowMemory,    0x40, I_I, true, "grow_memory")
+WASM_MISC_OPCODE(MemorySize, 0x3f, I_I, true, "memory.size")
+WASM_MISC_OPCODE(MemoryGrow,    0x40, I_I, true, "memory.grow")
 
 // Constants
 WASM_MISC_OPCODE(I32Const,     0x41, Limit, true, "i32.const")

lib/WasmReader/WasmBinaryReader.cpp

@@ -437,16 +437,16 @@ WasmOp WasmBinaryReader::ReadExpr()
         break;
     case wbNop:
         break;
-    case wbCurrentMemory:
-    case wbGrowMemory:
+    case wbMemorySize:
+    case wbMemoryGrow:
     {
         // Reserved value currently unused
         uint8 reserved = ReadConst<uint8>();
         if (reserved != 0)
         {
-            ThrowDecodingError(op == wbCurrentMemory
-                ? _u("current_memory reserved value must be 0")
-                : _u("grow_memory reserved value must be 0")
+            ThrowDecodingError(op == wbMemorySize
+                ? _u("memory.size reserved value must be 0")
+                : _u("memory.grow reserved value must be 0")
             );
         }
         break;

lib/WasmReader/WasmByteCodeGenerator.cpp

@@ -770,15 +770,15 @@ void WasmBytecodeGenerator::EmitExpr(WasmOp op)
         break;
     case wbNop:
         return;
-    case wbCurrentMemory:
+    case wbMemorySize:
     {
         SetUsesMemory(0);
         Js::RegSlot tempReg = GetRegisterSpace(WasmTypes::I32)->AcquireTmpRegister();
         info = EmitInfo(tempReg, WasmTypes::I32);
-        m_writer->AsmReg1(Js::OpCodeAsmJs::CurrentMemory_Int, tempReg);
+        m_writer->AsmReg1(Js::OpCodeAsmJs::MemorySize_Int, tempReg);
         break;
     }
-    case wbGrowMemory:
+    case wbMemoryGrow:
     {
         info = EmitGrowMemory();
         break;

test/wasm/binary.js

@@ -30,7 +30,7 @@ function makeReservedTest(name, body, msg) {
 
 const tests = [
   makeReservedTest("memory.size reserved", [kExprMemorySize, 1], "memory.size reserved value must be 0"),
-  makeReservedTest("memory.grow reserved", [kExprGrowMemory, 1], "memory.grow reserved value must be 0"),
+  makeReservedTest("memory.grow reserved", [kExprMemoryGrow, 1], "memory.grow reserved value must be 0"),
   makeReservedTest("call_indirect reserved", [kExprCallIndirect, 1], "call_indirect reserved value must be 0"),
 ];