Merge pull request #6966 from lioncash/fmul

Interpreter_FPUtils: Set FPSCR.VXSNAN if either operand to NI_mul() is a signaling NaN
dolphin-emu · May 26, 2018 · 98e288c · 98e288c
2 parents f64cbc8 + 3da751f
commit 98e288c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h
@@ -94,13 +94,17 @@ inline double MakeQuiet(double d)
 
 inline double NI_mul(double a, double b)
 {
-  double t = a * b;
+  const double t = a * b;
   if (std::isnan(t))
   {
+    if (Common::IsSNAN(a) || Common::IsSNAN(b))
+      SetFPException(FPSCR_VXSNAN);
+
     if (std::isnan(a))
       return MakeQuiet(a);
     if (std::isnan(b))
       return MakeQuiet(b);
+
     SetFPException(FPSCR_VXIMZ);
     return PPC_NAN;
   }