From a4cc8543513f9835b0c4f9c7e47e65d6c9cdd8dd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 27 May 2018 16:24:22 -0400 Subject: [PATCH] Interpreter_FPUtils: Set FPSCR.VXSNAN if any operand to NI_msub is a signaling NaN If any operand is a signaling NaN, we need to signify this by setting the VXSNAN bit. Fixes NaN flag setting for fmsub, fmsubs, fnmsub, fnmsubs, ps_msub, and ps_nmsub instructions. --- .../Core/PowerPC/Interpreter/Interpreter_FPUtils.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h index 30340b0bb9..843b580fdd 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h @@ -227,26 +227,37 @@ inline double NI_madd(double a, double c, double b) inline double NI_msub(double a, double c, double b) { double t = a * c; + if (std::isnan(t)) { + if (Common::IsSNAN(a) || Common::IsSNAN(b) || Common::IsSNAN(c)) + SetFPException(FPSCR_VXSNAN); + if (std::isnan(a)) return MakeQuiet(a); if (std::isnan(b)) return MakeQuiet(b); // ! if (std::isnan(c)) return MakeQuiet(c); + SetFPException(FPSCR_VXIMZ); return PPC_NAN; } t -= b; + if (std::isnan(t)) { + if (Common::IsSNAN(b)) + SetFPException(FPSCR_VXSNAN); + if (std::isnan(b)) return MakeQuiet(b); + SetFPException(FPSCR_VXISI); return PPC_NAN; } + return t; }