 @@ -1,14 +1,14 @@
-/* $NetBSD: fenv.c,v 1.3.8.1 2012/08/12 18:53:11 martin Exp $ */
+/* $NetBSD: fenv.c,v 1.3.8.1.4.1 2013/06/14 02:37:53 msaitoh Exp $ */
 /*-
  * Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.3.8.1 2012/08/12 18:53:11 martin Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.3.8.1.4.1 2013/06/14 02:37:53 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <assert.h>
 #include <fenv.h>
 #include <stddef.h>
 #include <string.h>
 /* Load x87 Control Word */
 #define	__fldcw(__cw)		__asm__ __volatile__	\
 	("fldcw %0" : : "m" (__cw))
 /* No-Wait Store Control Word */
 @@ -500,15 +500,15 @@ fedisableexcept(int mask)
+}
 int
 fegetexcept(void)
+{
 	uint16_t control;
 	/*
 	 * We assume that the masks for the x87 and the SSE unit are
 	 * the same.
 	 */
 	__fnstcw(&control);
-	return (control & FE_ALL_EXCEPT);
+	return (~control & FE_ALL_EXCEPT);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: fenv.c,v 1.1.8.1 2012/08/12 18:53:11 martin Exp $ */
+/* $NetBSD: fenv.c,v 1.1.8.1.4.1 2013/06/14 02:37:53 msaitoh Exp $ */
 /*-
  * Copyright (c) 2004-2005 David Schultz <das (at) FreeBSD.ORG>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.1.8.1 2012/08/12 18:53:11 martin Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.1.8.1.4.1 2013/06/14 02:37:53 msaitoh Exp $");
 #include <assert.h>
 #include <fenv.h>
 #include <stddef.h>
 #include <string.h>
 /* Load x87 Control Word */
 #define	__fldcw(__cw)		__asm__ __volatile__ \
 	("fldcw %0" : : "m" (__cw))
 /* No-Wait Store Control Word */
 #define	__fnstcw(__cw)		__asm__ __volatile__ \
 	("fnstcw %0" : "=m" (*(__cw)))
 @@ -48,26 +48,30 @@ __RCSID("$NetBSD: fenv.c,v 1.1.8.1 2012/
 /* No-Wait Clear Exception Flags */
 #define	__fnclex()		__asm__ __volatile__ \
 	("fnclex")
 /* Load x87 Environment */
 #define	__fldenv(__env)		__asm__ __volatile__ \
 	("fldenv %0" : : "m" (__env))
 /* No-Wait Store x87 environment */
 #define	__fnstenv(__env)	__asm__ __volatile__ \
 	("fnstenv %0" : "=m" (*(__env)))
 /* Check for and handle pending unmasked x87 pending FPU exceptions */
 #define	__fwait(__env)		__asm__	__volatile__	\
 	("fwait")
 /* Load the MXCSR register */
 #define	__ldmxcsr(__mxcsr)	__asm__ __volatile__ \
 	("ldmxcsr %0" : : "m" (__mxcsr))
 /* Store the MXCSR register state */
 #define	__stmxcsr(__mxcsr)	__asm__ __volatile__ \
 	("stmxcsr %0" : "=m" (*(__mxcsr)))
 /*
  * The following constant represents the default floating-point environment
  * (that is, the one installed at program startup) and has type pointer to
  * const-qualified fenv_t.
+ *
 @@ -168,26 +172,27 @@ fegetexceptflag(fexcept_t *flagp, int ex
  * directly.
+ *
  * The validation of input is being deferred to fesetexceptflag().
  */
 int
 feraiseexcept(int excepts)
+{
 	int ex;
 	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
 	ex = excepts & FE_ALL_EXCEPT;
 	fesetexceptflag((unsigned int *)&excepts, excepts);
 	__fwait();
 	/* Success */
 	return (0);
+}
 /*
  * This function sets the floating-point status flags indicated by the argument
  * `excepts' to the states stored in the object pointed to by `flagp'. It does
  * NOT raise any floating-point exceptions, but only sets the state of the flags.
  */
 int
 fesetexceptflag(const fexcept_t *flagp, int excepts)
+{
 @@ -509,16 +514,16 @@ fedisableexcept(int mask)
+}
 int
 fegetexcept(void)
+{
 	uint16_t control;
 	/*
 	 * We assume that the masks for the x87 and the SSE unit are
 	 * the same.
 	 */
 	__fnstcw(&control);
-	return (control & FE_ALL_EXCEPT);
+	return (~control & FE_ALL_EXCEPT);
+}