From e0023d29a8beade034a219b060ddf00b7c4302e9 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Wed, 4 Nov 2015 19:55:28 -0800
Subject: more conversion ops

---
 src/wasm-s-parser.h | 10 ++++++++++
 src/wasm.h          | 20 ++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index d90c10ca6..4bc2c9f10 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -298,10 +298,12 @@ public:
             if (op[3] == '_') return makeBinary(s, op[4] == 'u' ? BinaryOp::DivU : BinaryOp::DivS, type);
             if (op[3] == 0) return makeBinary(s, BinaryOp::Div, type);
           }
+          if (op[1] == 'e') return makeConvert(s,  ConvertOp::DemoteFloat64, type);
           abort_on(op);
         }
         case 'e': {
           if (op[1] == 'q') return makeCompare(s, RelationalOp::Eq, type);
+          if (op[1] == 'x') return makeConvert(s, op[7] == 'u' ? ConvertOp::ExtendUInt32 : ConvertOp::ExtendSInt32, type);
           abort_on(op);
         }
         case 'f': {
@@ -348,6 +350,10 @@ public:
           if (op[1] == 'r') return makeBinary(s, BinaryOp::Or, type);
           abort_on(op);
         }
+        case 'p': {
+          if (op[1] == 'r') return makeConvert(s,  ConvertOp::PromoteFloat32, type);
+          abort_on(op);
+        }
         case 'r': {
           if (op[1] == 'e') {
             return makeBinary(s, op[4] == 'u' ? BinaryOp::RemU : BinaryOp::RemS, type);
@@ -367,6 +373,10 @@ public:
           if (op[1] == 'r') return makeConvert(s, ConvertOp::TruncSFloat64, type);
           abort_on(op);
         }
+        case 'w': {
+          if (op[1] == 'r') return makeConvert(s,  ConvertOp::WrapInt64, type);
+          abort_on(op);
+        }
         case 'x': {
           if (op[1] == 'o') return makeBinary(s, BinaryOp::Xor, type);
           abort_on(op);
diff --git a/src/wasm.h b/src/wasm.h
index a91a1bd7f..a69e6ba1c 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -678,11 +678,23 @@ public:
 
   std::ostream& doPrint(std::ostream &o, unsigned indent) {
     o << '(';
-    prepareColor(o);
+    prepareColor(o) << printWasmType(type);
     switch (op) {
-      case ConvertUInt32: o << "f64.convert_u/i32"; break;
-      case ConvertSInt32: o << "f64.convert_s/i32"; break;
-      case TruncSFloat64: o << "i32.trunc_s/f64";   break;
+      case ExtendSInt32:     o << "extend_s/i32"; break;
+      case ExtendUInt32:     o << "extend_u/i32"; break;
+      case WrapInt64:        o << "wrap/i64"; break;
+      case TruncSFloat32:    o << "trunc_s/f32"; break;
+      case TruncUFloat32:    o << "trunc_u/f32"; break;
+      case TruncSFloat64:    o << "trunc_s/f64"; break;
+      case TruncUFloat64:    o << "trunc_u/f64"; break;
+      case ReinterpretFloat: o << "reinterpret/f64"; break;
+      case ConvertUInt32:    o << "convert_u/i32"; break;
+      case ConvertSInt32:    o << "convert_s/i32"; break;
+      case ConvertUInt64:    o << "convert_u/i64"; break;
+      case ConvertSInt64:    o << "convert_s/i64"; break;
+      case PromoteFloat32:   o << "promote/f32"; break;
+      case DemoteFloat64:    o << "demote/f64"; break;
+      case ReinterpretInt:   o << "reinterpret/i64"; break;
       default: abort();
     }
     restoreNormalColor(o);
-- 
cgit v1.2.3