Author: das
Date: Mon Jan 9 04:57:06 2012
New Revision: 229841
URL: http://svn.freebsd.org/changeset/base/229841
Log:
MFC r226594:
Bugfix: feenableexcept() and fedisableexcept() should just return the
old exception mask, not mask | ~FE_ALL_EXCEPT.
Modified:
stable/9/lib/msun/amd64/fenv.c
stable/9/lib/msun/i387/fenv.c
Directory Properties:
stable/9/lib/msun/ (props changed)
Modified: stable/9/lib/msun/amd64/fenv.c
==============================================================================
--- stable/9/lib/msun/amd64/fenv.c Mon Jan 9 04:55:55 2012
(r229840)
+++ stable/9/lib/msun/amd64/fenv.c Mon Jan 9 04:57:06 2012
(r229841)
@@ -120,12 +120,12 @@ __feenableexcept(int mask)
mask &= FE_ALL_EXCEPT;
__fnstcw(&control);
__stmxcsr(&mxcsr);
- omask = (control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
+ omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control &= ~mask;
__fldcw(control);
mxcsr &= ~(mask << _SSE_EMASK_SHIFT);
__ldmxcsr(mxcsr);
- return (~omask);
+ return (omask);
}
int
@@ -137,12 +137,12 @@ __fedisableexcept(int mask)
mask &= FE_ALL_EXCEPT;
__fnstcw(&control);
__stmxcsr(&mxcsr);
- omask = (control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
+ omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control |= mask;
__fldcw(control);
mxcsr |= mask << _SSE_EMASK_SHIFT;
__ldmxcsr(mxcsr);
- return (~omask);
+ return (omask);
}
__weak_reference(__feenableexcept, feenableexcept);
Modified: stable/9/lib/msun/i387/fenv.c
==============================================================================
--- stable/9/lib/msun/i387/fenv.c Mon Jan 9 04:55:55 2012
(r229840)
+++ stable/9/lib/msun/i387/fenv.c Mon Jan 9 04:57:06 2012
(r229841)
@@ -177,14 +177,14 @@ __feenableexcept(int mask)
__stmxcsr(&mxcsr);
else
mxcsr = 0;
- omask = (control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
+ omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control &= ~mask;
__fldcw(control);
if (__HAS_SSE()) {
mxcsr &= ~(mask << _SSE_EMASK_SHIFT);
__ldmxcsr(mxcsr);
}
- return (~omask);
+ return (omask);
}
int
@@ -199,14 +199,14 @@ __fedisableexcept(int mask)
__stmxcsr(&mxcsr);
else
mxcsr = 0;
- omask = (control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
+ omask = ~(control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
control |= mask;
__fldcw(control);
if (__HAS_SSE()) {
mxcsr |= mask << _SSE_EMASK_SHIFT;
__ldmxcsr(mxcsr);
}
- return (~omask);
+ return (omask);
}
__weak_reference(__feenableexcept, feenableexcept);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
