 @@ -1,14 +1,14 @@
-/* $NetBSD: fenv.c,v 1.4 2018/11/07 06:47:38 riastradh Exp $ */
+/* $NetBSD: fenv.c,v 1.4.2.1 2019/12/08 13:37:46 martin Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND 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 FOUNDATION 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.4 2018/11/07 06:47:38 riastradh Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.4.2.1 2019/12/08 13:37:46 martin Exp $");
 #include "namespace.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <fenv.h>
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <aarch64/armreg.h>
 @@ -97,31 +97,29 @@ fegetexceptflag(fexcept_t *flagp, int ex
 /*
  * The feraiseexcept() function shall attempt to raise the supported
  * floating-point exceptions represented by the argument excepts. The order
  * in which these floating-point exceptions are raised is unspecified.
  */
 int
 feraiseexcept(int excepts)
+{
 #ifndef lint
 	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
 #endif
 	unsigned int fpsr = reg_fpsr_read();
-	fpsr = (fpsr & ~FPSR_CSUM) | __SHIFTIN(excepts, FPSR_CSUM);
+	excepts &= FE_ALL_EXCEPT; /* paranoia */
 	fpsr |= __SHIFTIN(excepts, FPSR_CSUM);
 	reg_fpsr_write(fpsr);
 	unsigned int fpcr = reg_fpcr_read();
 	fpcr = (fpcr & ~FPCR_ESUM) | __SHIFTIN(excepts, FPCR_ESUM);
 	reg_fpcr_write(fpcr);
 	return 0;
+}
 /*
  * The fesetexceptflag() function shall attempt to set the floating-point
  * status flags indicated by the argument excepts to the states stored in the
  * object pointed to by flagp. The value pointed to by flagp shall have been
  * set by a previous call to fegetexceptflag() whose second argument
  * represented at least those floating-point exceptions represented by the
  * argument excepts. This function does not raise floating-point exceptions,
  * but only sets the state of the flags.
  */
 int
 @@ -203,43 +201,43 @@ feholdexcept(fenv_t *envp)
 	return 0;
+}
 /*
  * The fesetenv() function shall attempt to establish the floating-point
  * environment represented by the object pointed to by envp. The fesetenv()
  * function does not raise floating-point exceptions, but only installs the
  * state of the floating-point status flags represented through its argument.
  */
 int
 fesetenv(const fenv_t *envp)
+{
 	reg_fpsr_write(envp->__fpsr);
 	reg_fpcr_write(envp->__fpcr);
 	return 0;
+}
 /*
  * The feupdateenv() function shall attempt to save the currently raised
  * floating-point exceptions in its automatic storage, attempt to install the
  * floating-point environment represented by the object pointed to by envp,
  * and then attempt to raise the saved floating-point exceptions.
  */
 int
 feupdateenv(const fenv_t *envp)
+{
-#ifndef lint
+	int except = fetestexcept(FE_ALL_EXCEPT);
 	_DIAGASSERT(envp != NULL);
-#endif
+	fesetenv(envp);
-	reg_fpsr_write(envp->__fpsr);
+	feraiseexcept(except);
 	reg_fpcr_write(envp->__fpcr);
 	/* Success */
 	return 0;
+}
 int
 feenableexcept(int excepts)
+{
 	const uint32_t __fpcr = reg_fpcr_read();
 	reg_fpcr_write((__fpcr & ~FPCR_ESUM) | __SHIFTIN(excepts, FPCR_ESUM));
 	return __SHIFTOUT(__fpcr, FPCR_ESUM);
+}