Print this page


Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libm/common/m9x/fmaxl.c
          +++ new/usr/src/lib/libm/common/m9x/fmaxl.c
↓ open down ↓ 43 lines elided ↑ open up ↑
  44   44  #error Unknown architecture
  45   45  #endif
  46   46                  long double ld;
  47   47          } xx, yy;
  48   48          unsigned s;
  49   49  
  50   50          /* if y is nan, replace it by x */
  51   51          if (y != y)
  52   52                  y = x;
  53   53  
  54      -        /* if x is less than y or x and y are unordered, replace x by y */
  55      -#if defined(COMPARISON_MACRO_BUG)
  56      -        if (x != x || x < y)
  57      -#else
  58      -        if (!isgreaterequal(x, y))
  59      -#endif
       54 +        /* if x is nan, replace it by y */
       55 +        if (x != x)
       56 +                x = y;
       57 +
       58 +        /* At this point, x and y are either both numeric, or both NaN */
       59 +        if (!isnan(x) && !isgreaterequal(x, y))
  60   60                  x = y;
  61   61  
  62   62          /*
  63      -         * now x and y are either both NaN or both numeric; clear the
  64      -         * sign of the result if either x or y has its sign clear
       63 +         * clear the sign of the result if either x or y has its sign clear
  65   64           */
  66   65          xx.ld = x;
  67   66          yy.ld = y;
  68   67  #if defined(__sparc)
  69   68          s = ~(xx.i[0] & yy.i[0]) & 0x80000000;
  70   69          xx.i[0] &= ~s;
  71   70  #elif defined(__x86)
  72   71          s = ~(xx.i[2] & yy.i[2]) & 0x8000;
  73   72          xx.i[2] &= ~s;
  74   73  #else
  75   74  #error Unknown architecture
  76   75  #endif
  77   76  
  78   77          return (xx.ld);
  79   78  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX