diff options
| author |  Subv | 2017-05-09 00:22:53 -0500 |
|---|---|---|
| committer | Subv | 2017-05-09 00:36:23 -0500 |
| commit | 11fe85f129201c912c454f46b62f84475fde1f20 (patch) | |
| tree | 49a42d12d938972e519716e07ca4818c8a3080a8 /src | |
| parent | Revert "Remove `exceptions` parameter from `normaliseround` VFP functions" (diff) | |
| download | yuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar.gz yuzu-11fe85f129201c912c454f46b62f84475fde1f20.tar.xz yuzu-11fe85f129201c912c454f46b62f84475fde1f20.zip | |
Dyncom/VFP: Strip the VFP_NAN_FLAG sentinel value when setting vfp exceptions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpdouble.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpsingle.cpp | 2 |
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) { | |||
| 1216 | except = fop->fn(state, dest, dn, dm, fpscr); | 1216 | except = fop->fn(state, dest, dn, dm, fpscr); |
| 1217 | LOG_TRACE(Core_ARM11, "VFP: itr%d: exceptions=%08x", vecitr >> FPSCR_LENGTH_BIT, except); | 1217 | LOG_TRACE(Core_ARM11, "VFP: itr%d: exceptions=%08x", vecitr >> FPSCR_LENGTH_BIT, except); |
| 1218 | 1218 | ||
| 1219 | exceptions |= except; | 1219 | exceptions |= except & ~VFP_NAN_FLAG; |
| 1220 | 1220 | ||
| 1221 | /* | 1221 | /* |
| 1222 | * CHECK: It appears to be undefined whether we stop when | 1222 | * 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) { | |||
| 1231 | except = fop->fn(state, dest, sn, m, fpscr); | 1231 | except = fop->fn(state, dest, sn, m, fpscr); |
| 1232 | LOG_TRACE(Core_ARM11, "itr%d: exceptions=%08x", vecitr >> FPSCR_LENGTH_BIT, except); | 1232 | LOG_TRACE(Core_ARM11, "itr%d: exceptions=%08x", vecitr >> FPSCR_LENGTH_BIT, except); |
| 1233 | 1233 | ||
| 1234 | exceptions |= except; | 1234 | exceptions |= except & ~VFP_NAN_FLAG; |
| 1235 | 1235 | ||
| 1236 | /* | 1236 | /* |
| 1237 | * CHECK: It appears to be undefined whether we stop when | 1237 | * CHECK: It appears to be undefined whether we stop when |