Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / include / math-emu / op-common.h

diff --git a/include/math-emu/op-common.h b/include/math-emu/op-common.h
index cc1ec39..fd88226 100644 (file)
--- a/include/math-emu/op-common.h
+++ b/include/math-emu/op-common.h
@@ -29,7 +29,7 @@
   _FP_FRAC_DECL_##wc(X)
 
 /*
- * Finish truely unpacking a native fp value by classifying the kind
+ * Finish truly unpacking a native fp value by classifying the kind
  * of fp value and normalizing both the exponent and the fraction.
  */
 
@@ -139,18 +139,27 @@ do {                                                              \
        if (X##_e <= _FP_WFRACBITS_##fs)                        \
          {                                                     \
            _FP_FRAC_SRS_##wc(X, X##_e, _FP_WFRACBITS_##fs);    \
-           _FP_ROUND(wc, X);                                   \
            if (_FP_FRAC_HIGH_##fs(X)                           \
                & (_FP_OVERFLOW_##fs >> 1))                     \
              {                                                 \
                X##_e = 1;                                      \
                _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);        \
-               FP_SET_EXCEPTION(FP_EX_INEXACT);                \
              }                                                 \
            else                                                \
              {                                                 \
-               X##_e = 0;                                      \
-               _FP_FRAC_SRL_##wc(X, _FP_WORKBITS);             \
+               _FP_ROUND(wc, X);                               \
+               if (_FP_FRAC_HIGH_##fs(X)                       \
+                  & (_FP_OVERFLOW_##fs >> 1))                  \
+                 {                                             \
+                   X##_e = 1;                                  \
+                   _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);    \
+                   FP_SET_EXCEPTION(FP_EX_INEXACT);            \
+                 }                                             \
+               else                                            \
+                 {                                             \
+                   X##_e = 0;                                  \
+                   _FP_FRAC_SRL_##wc(X, _FP_WORKBITS);         \
+                 }                                             \
              }                                                 \
            if ((FP_CUR_EXCEPTIONS & FP_EX_INEXACT) ||          \
                (FP_TRAPPING_EXCEPTIONS & FP_EX_UNDERFLOW))     \
@@ -494,6 +503,8 @@ do {                                                        \
     R##_c = FP_CLS_NAN;                                        \
     _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);            \
     FP_SET_EXCEPTION(FP_EX_INVALID | FP_EX_INVALID_IDI);\
+    break;                                             \
+                                                       \
   case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):       \
     R##_s = _FP_NANSIGN_##fs;                          \
     R##_c = FP_CLS_NAN;                                        \