update tests, and update shift behavior for latest changes

3 files changed, 7 insertions, 7 deletions

diff --git a/build.sh b/build.sh
index 3bfbc0c1a..78c1798ca 100755
--- a/build.sh
+++ b/build.sh
@@ -4,5 +4,5 @@ echo "building interpreter/js"
 em++ -std=c++11 src/wasm-js.cpp src/emscripten-optimizer/parser.cpp src/emscripten-optimizer/simple_ast.cpp src/emscripten-optimizer/optimizer-shared.cpp -o bin/wasm.js -s MODULARIZE=1 -s 'EXPORT_NAME="WasmJS"' --memory-init-file 0 -s DEMANGLE_SUPPORT=1 -O3 -profiling -s TOTAL_MEMORY=67108864 -s SAFE_HEAP=1 -s ASSERTIONS=1  -Isrc/emscripten-optimizer #-DWASM_JS_DEBUG #-DWASM_INTERPRETER_DEBUG
 cat src/js/post.js >> bin/wasm.js
 echo "building wasm shell"
-g++ -O2 -std=c++11 src/wasm-shell.cpp -g -o bin/wasm-shell -Isrc/emscripten-optimizer
+#g++ -O2 -std=c++11 src/wasm-shell.cpp -g -o bin/wasm-shell -Isrc/emscripten-optimizer
 
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index a3fe78666..8aeab2e97 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -418,15 +418,15 @@ private:
             case Or:       return Literal(l | r);
             case Xor:      return Literal(l ^ r);
             case Shl: {
-              if (uint32_t(r) >= 32) return Literal(int32_t(0));
+              r = r & 31;
               return Literal(l << r);
             }
             case ShrU: {
-              if (uint32_t(r) >= 32) return Literal(int32_t(0));
+              r = r & 31;
               return Literal(int32_t(uint32_t(l) >> uint32_t(r)));
             }
             case ShrS: {
-              if (uint32_t(r) >= 32) return Literal(int32_t(l < 0 ? -1 : 0));
+              r = r & 31;
               return Literal(l >> r);
             }
             default: abort();
@@ -459,15 +459,15 @@ private:
             case Or:       return Literal(l | r);
             case Xor:      return Literal(l ^ r);
             case Shl: {
-              if (uint64_t(r) >= 64) return Literal(int64_t(0));
+              r = r & 63;
               return Literal(l << r);
             }
             case ShrU: {
-              if (uint64_t(r) >= 64) return Literal(int64_t(0));
+              r = r & 63;
               return Literal(int64_t(uint64_t(l) >> uint64_t(r)));
             }
             case ShrS: {
-              if (uint64_t(r) >= 64) return Literal(int64_t(l < 0 ? -1 : 0));
+              r = r & 63;
               return Literal(l >> r);
             }
             default: abort();
diff --git a/test/spec b/test/spec
-Subproject fcfe2eb008db850f3be5e09cfef2ab4d7d72215
+Subproject 71c66b4d208159aa24f261e3c4180611f6760f2