summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2017-05-09 07:22:53 +0200
committerSubv <subv2112@gmail.com>2017-05-09 07:36:23 +0200
commit11fe85f129201c912c454f46b62f84475fde1f20 (patch)
tree49a42d12d938972e519716e07ca4818c8a3080a8 /src/core/arm
parentRevert "Remove `exceptions` parameter from `normaliseround` VFP functions" (diff)
downloadyuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar
yuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar.gz
yuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar.bz2
yuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar.lz
yuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar.xz
yuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar.zst
yuzu-11fe85f129201c912c454f46b62f84475fde1f20.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpdouble.cpp2
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpsingle.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
index 4b35455f6..7b035f56a 100644
--- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
@@ -1216,7 +1216,7 @@ u32 vfp_double_cpdo(ARMul_State* state, u32 inst, u32 fpscr) {
except = fop->fn(state, dest, dn, dm, fpscr);
LOG_TRACE(Core_ARM11, "VFP: itr%d: exceptions=%08x", vecitr >> FPSCR_LENGTH_BIT, except);
- exceptions |= except;
+ exceptions |= except & ~VFP_NAN_FLAG;
/*
* CHECK: It appears to be undefined whether we stop when
diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
index 2609d0714..ae5b325f0 100644
--- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
@@ -1231,7 +1231,7 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr) {
except = fop->fn(state, dest, sn, m, fpscr);
LOG_TRACE(Core_ARM11, "itr%d: exceptions=%08x", vecitr >> FPSCR_LENGTH_BIT, except);
- exceptions |= except;
+ exceptions |= except & ~VFP_NAN_FLAG;
/*
* CHECK: It appears to be undefined whether we stop when