 @@ -1,14 +1,14 @@
-/* $NetBSD: softfloat.c,v 1.13 2013/11/22 17:04:24 martin Exp $ */
+/* $NetBSD: softfloat.c,v 1.14 2016/03/29 18:42:29 martin Exp $ */
 /*
  * This version hacked for use with gcc -msoft-float by bjh21.
  * (Mostly a case of #ifdefing out things GCC doesn't need or provides
  *  itself).
  */
 /*
  * Things you may want to define:
+ *
  * SOFTFLOAT_FOR_GCC - build only those functions necessary for GCC (with
  *   -msoft-float) to work.  Include "softfloat-for-gcc.h" to get them
  *   properly renamed.
 @@ -36,27 +36,27 @@ TIMES RESULT IN INCORRECT BEHAVIOR.  USE
 PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
 AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
 Derivative works are acceptable, even for commercial purposes, so long as
 (1) they include prominent notice that the work is derivative, and (2) they
 include prominent notice akin to these four paragraphs for those parts of
 this code that are retained.
 ===============================================================================
 */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: softfloat.c,v 1.13 2013/11/22 17:04:24 martin Exp $");
+__RCSID("$NetBSD: softfloat.c,v 1.14 2016/03/29 18:42:29 martin Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifdef SOFTFLOAT_FOR_GCC
 #include "softfloat-for-gcc.h"
 #endif
 #include "milieu.h"
 #include "softfloat.h"
 /*
  * Conversions between floats as stored in memory and floats as
  * SoftFloat uses them
  */
 @@ -651,27 +651,27 @@ format.
 significand is not normalized, `zExp' must be 0; in that case, the result
 returned is a subnormal number, and it must not require rounding.  The
 handling of underflow and overflow follows the IEC/IEEE Standard for Binary
 Floating-Point Arithmetic.
 -------------------------------------------------------------------------------
 */
 static floatx80
  roundAndPackFloatx80(
      int8 roundingPrecision, flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1
+ )
+{
     int8 roundingMode;
     flag roundNearestEven, increment, isTiny;
-    int64 roundIncrement, roundMask, roundBits;
+    uint64 roundIncrement, roundMask, roundBits;
     roundingMode = float_rounding_mode;
     roundNearestEven = ( roundingMode == float_round_nearest_even );
     if ( roundingPrecision == 80 ) goto precision80;
     if ( roundingPrecision == 64 ) {
         roundIncrement = LIT64( 0x0000000000000400 );
         roundMask = LIT64( 0x00000000000007FF );
+    }
     else if ( roundingPrecision == 32 ) {
         roundIncrement = LIT64( 0x0000008000000000 );
         roundMask = LIT64( 0x000000FFFFFFFFFF );
+    }
     else {
 @@ -3928,38 +3928,38 @@ floatx80 floatx80_div( floatx80 a, float
             floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
+}
 /*
 -------------------------------------------------------------------------------
 Returns the remainder of the extended double-precision floating-point value
 `a' with respect to the corresponding value `b'.  The operation is performed
 according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
 -------------------------------------------------------------------------------
 */
 floatx80 floatx80_rem( floatx80 a, floatx80 b )
+{
-    flag aSign, bSign, zSign;
+    flag aSign, zSign;
     int32 aExp, bExp, expDiff;
     bits64 aSig0, aSig1, bSig;
     bits64 q, term0, term1, alternateASig0, alternateASig1;
     floatx80 z;
     aSig0 = extractFloatx80Frac( a );
     aExp = extractFloatx80Exp( a );
     aSign = extractFloatx80Sign( a );
     bSig = extractFloatx80Frac( b );
     bExp = extractFloatx80Exp( b );
     bSign = extractFloatx80Sign( b );
     if ( aExp == 0x7FFF ) {
         if (    (bits64) ( aSig0<<1 )
              || ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
             return propagateFloatx80NaN( a, b );
+        }
         goto invalid;
+    }
     if ( bExp == 0x7FFF ) {
         if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
         return a;
+    }
     if ( bExp == 0 ) {
         if ( bSig == 0 ) {