nan

2 files changed, 11 insertions, 1 deletions

diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index a22a631b1..f72dc524e 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -361,6 +361,7 @@ public:
           case WrapInt64:        return Flow(Literal(int32_t(value.geti64())));
           case TruncSFloat32:    {
             float val = value.getf32();
+            if (isnan(val)) instance.externalInterface->trap();
             if (val > (double)INT_MAX || val < (double)INT_MIN) instance.externalInterface->trap();
             return Flow(Literal(int32_t(val)));
           }
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 26abdec8e..81c0e73b4 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -33,7 +33,8 @@ IString MODULE("module"),
         CALL_IMPORT("call_import"),
         CALL_INDIRECT("call_indirect"),
         INFINITY_("infinity"),
-        NEG_INFINITY("-infinity");
+        NEG_INFINITY("-infinity"),
+        NAN_("nan");
 
 //
 // An element in an S-Expression: a list or a string
@@ -517,6 +518,14 @@ private:
         }
         return ret;
       }
+      if (s[1]->str() == NAN_) {
+        switch (type) {
+          case f32: ret->value.f32 = std::nan(""); break;
+          case f64: ret->value.f64 = std::nan(""); break;
+          default: abort();
+        }
+        return ret;
+      }
     }
     const char *str = s[1]->c_str();
     std::istringstream istr(str);