interpreter support for f32.min/max

Author: commonlisp

lib/Backend/IRBuilderAsmJs.cpp

@@ -2872,6 +2872,14 @@ IRBuilderAsmJs::BuildFloat3(Js::OpCodeAsmJs newOpcode, uint32 offset, Js::RegSlo
         instr = IR::Instr::New(Js::OpCode::Div_A, dstOpnd, src1Opnd, src2Opnd, m_func);
         break;
 
+    case Js::OpCodeAsmJs::Min_Flt:
+        instr = IR::Instr::New(Js::OpCode::InlineMathMin, dstOpnd, src1Opnd, src2Opnd, m_func);
+        break;
+
+    case Js::OpCodeAsmJs::Max_Flt:
+        instr = IR::Instr::New(Js::OpCode::InlineMathMax, dstOpnd, src1Opnd, src2Opnd, m_func);
+        break;
+
     default:
         Assume(UNREACHED);
     }

lib/Runtime/ByteCode/OpCodesAsmJs.h

@@ -208,8 +208,8 @@ MACRO_WMS   ( Abs_Flt                   , Float2        , None           )
 MACRO_WMS   ( Atan2_Db                  , Double3       , None           )
 MACRO_WMS   ( Min_Db                    , Double3       , None           )
 MACRO_WMS   ( Max_Db                    , Double3       , None           )
-MACRO_WMS   ( Min_Flt                   , Float2        , None           )
-MACRO_WMS   ( Max_Flt                   , Float2        , None           )
+MACRO_WMS   ( Min_Flt                   , Float3        , None           )
+MACRO_WMS   ( Max_Flt                   , Float3        , None           )
 
 // Fround
 MACRO_WMS   ( Fround_Flt                , Float2        , None           )

lib/Runtime/Language/AsmJsEncoderHandler.inl

@@ -193,6 +193,7 @@ EXDEF3    ( CUSTOM     , NopEx             , OP_Empty                , Empty
   DEF3_WMS( CALLDOUBLE3, Min_Db            , AsmJsMath::Min<double>  , false         )
   DEF3_WMS( CALLDOUBLE3, Max_Db            , AsmJsMath::Max<double>  , false         )
 
+
   DEF3_WMS( CUSTOM     , Fround_Flt        , OP_SetFroundFlt         , Float2        )
   DEF3_WMS( CUSTOM     , Fround_Db         , OP_SetFroundDb          , Float1Double1 )
   DEF3_WMS( CUSTOM     , Fround_Int        , OP_SetFroundInt         , Float1Int1    )

lib/Runtime/Language/InterpreterHandlerAsmJs.inl

@@ -160,9 +160,9 @@ EXDEF2    (NOPASMJS          , NopEx        , Empty
   DEF2_WMS( F1toF1Mem        , Abs_Flt      , ::fabsf                                            )
   DEF2_WMS( D2toD1Mem        , Atan2_Db     , Math::Atan2                                        )
   DEF2_WMS( D2toD1Mem        , Min_Db       , AsmJsMath::Min<double>                             )
-  DEF2_WMS( D2toD1Mem        , Min_Flt      , AsmJsMath::Min<float>                              )
+  DEF2_WMS( F2toF1Mem        , Min_Flt      , AsmJsMath::Min<float>                              )
   DEF2_WMS( D2toD1Mem        , Max_Db       , AsmJsMath::Max<double>                             )
-  DEF2_WMS( D2toD1Mem        , Max_Flt      , AsmJsMath::Max<float>                              )
+  DEF2_WMS( F2toF1Mem        , Max_Flt      , AsmJsMath::Max<float>                              )
 
 
   DEF2_WMS( F1toF1Mem        , Fround_Flt   , (float)                                            )

lib/Runtime/Math/AsmJsMath.inl

@@ -15,21 +15,21 @@ namespace Js
     {
         if (NumberUtilities::IsNan(aLeft) || NumberUtilities::IsNan(aRight))
         {
-            return NumberConstants::NaN;
+            return (T)NumberConstants::NaN;
         }
         return aLeft < aRight ? aLeft : aRight;
     }
 
     template<>
     __inline double AsmJsMath::Min<double>(double aLeft, double aRight)
     {
-        return minCheckNan<double>(aLeft, aRight);
+        return minCheckNan(aLeft, aRight);
     }
 
     template<>
     __inline float AsmJsMath::Min<float>(float aLeft, float aRight)
     {
-        return minCheckNan<float>(aLeft, aRight);
+        return minCheckNan(aLeft, aRight);
     }
 
     template<typename T>
@@ -43,21 +43,21 @@ namespace Js
     {
         if (NumberUtilities::IsNan(aLeft) || NumberUtilities::IsNan(aRight))
         {
-            return NumberConstants::NaN;
+            return (T)NumberConstants::NaN;
         }
         return aLeft > aRight ? aLeft : aRight;
     }
 
     template<>
     __inline double AsmJsMath::Max<double>(double aLeft, double aRight)
     {
-        maxCheckNan<double>(aLeft, aRight);
+        return maxCheckNan(aLeft, aRight);
     }
 
     template<>
-    __inline float AsmJsMath::Min<float>(float aLeft, float aRight)
+    __inline float AsmJsMath::Max<float>(float aLeft, float aRight)
     {
-        maxCheckNan<float>(aLeft, aRight);
+        return maxCheckNan(aLeft, aRight);
     }
 
     template<typename T>

lib/WasmReader/WasmKeywords.h

@@ -107,12 +107,10 @@ WASM_KEYWORD_BIN_MATH_I(DIVU, divu, Div_UInt)
 WASM_KEYWORD_BIN_MATH_I(MODU, modu, Rem_UInt)
 
 WASM_KEYWORD_BIN_MATH_FD(DIV, div, Div)
-WASM_KEYWORD_BIN_MATH_FD(MIN, min, Min_Flt)
-WASM_KEYWORD_BIN_MATH_FD(MAX, max, Max_Flt)
+WASM_KEYWORD_BIN_MATH_FD(MIN, min, Min)
+WASM_KEYWORD_BIN_MATH_FD(MAX, max, Max)
 
 WASM_KEYWORD_BIN_MATH_D(MOD, mod, Rem_Db)
-WASM_KEYWORD_BIN_MATH_D(MIN, min, Min_Db)
-WASM_KEYWORD_BIN_MATH_D(MAX, max, Max_Db)
 
 
 // compare ops