[MERGE #5341 @Cellule] WASM: Update wabt & spectests

Merge pull request #5341 from Cellule:wasm_tests

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;

lib/wabt/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015 the repository authors, see AUTHORS file.
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

lib/wabt/README.md

@@ -205,6 +205,10 @@ You can use `-h` to get additional help:
 $ out/wasm-interp -h
 ```
 
+## Running wasm2c
+
+See [wasm2c.md](wasm2c/README.md)
+
 ## Running the test suite
 
 See [test/README.md](test/README.md).

lib/wabt/chakra/wabtapi.cc

@@ -24,7 +24,7 @@ class MyErrorHandler : public ErrorHandler
 public:
     MyErrorHandler() : ErrorHandler(Location::Type::Text) {}
 
-    virtual bool OnError(const Location& loc, const std::string& error, const std::string& source_line, size_t source_line_column_offset) override
+    virtual bool OnError(ErrorLevel level, const Location& loc, const std::string& error, const std::string& source_line, size_t source_line_column_offset) override
     {
         int colStart = loc.first_column - 1 - (int)source_line_column_offset;
         int sourceErrorLength = (loc.last_column - loc.first_column) - 2;
@@ -34,7 +34,8 @@ class MyErrorHandler : public ErrorHandler
             sourceErrorLength = 0;
         }
         char buf[4096];
-        wabt_snprintf(buf, 4096, "Wast Parsing error:%u:%u:\n%s\n%s\n%*s^%*s^",
+        wabt_snprintf(buf, 4096, "Wast Parsing %s:%u:%u:\n%s\n%s\n%*s^%*s^",
+            GetErrorLevelName(level),
             loc.line,
             loc.first_column,
             error.c_str(),
@@ -80,6 +81,9 @@ Features GetWabtFeatures(const ChakraContext& ctx)
     {
         features.enable_sat_float_to_int();
     }
+
+    // Enable wabt features that have made it into the spec
+    features.enable_mutable_globals();
     return features;
 }
 

lib/wabt/chakra/windows/config.h

@@ -38,7 +38,7 @@
 #define HAVE_STRCASECMP 0
 
 /* Whether ENABLE_VIRTUAL_TERMINAL_PROCESSING is defined by windows.h */
-#define HAVE_WIN32_VT100 0
+#define HAVE_WIN32_VT100 1
 
 #define COMPILER_IS_CLANG 0
 #define COMPILER_IS_GNU 0