Print this page
5262 libm needs to be carefully unifdef'd
5268 libm doesn't need to hide symbols which are already local

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libm/common/C/ilogb.c
          +++ new/usr/src/lib/libm/common/C/ilogb.c
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  24   24   */
  25   25  /*
  26   26   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  27   27   * Use is subject to license terms.
  28   28   */
  29   29  
  30      -#if defined(ELFOBJ)
  31   30  #pragma weak ilogb = __ilogb
  32      -#endif
  33   31  
  34   32  #include "libm.h"
  35   33  #include "xpg6.h"       /* __xpg6 */
  36   34  
  37      -#if defined(USE_FPSCALE) || defined(__x86)
       35 +#if defined(__x86)
  38   36  static const double two52 = 4503599627370496.0;
  39   37  #else
  40   38  /*
  41   39   * v: high part of a non-zero subnormal |x|; w: low part of |x|
  42   40   */
  43   41  static int
  44   42  ilogb_subnormal(unsigned v, unsigned w) {
  45   43          int r = -1022 - 52;
  46   44  
  47   45          if (v)
↓ open down ↓ 2 lines elided ↑ open up ↑
  50   48                  v = w;
  51   49          if (v & 0xffff0000)
  52   50                  r += 16, v >>= 16;
  53   51          if (v & 0xff00)
  54   52                  r += 8, v >>= 8;
  55   53          if (v & 0xf0)
  56   54                  r += 4, v >>= 4;
  57   55          v <<= 1;
  58   56          return (r + ((0xffffaa50 >> v) & 0x3));
  59   57  }
  60      -#endif  /* defined(USE_FPSCALE) */
       58 +#endif  /* defined(__x86) */
  61   59  
  62   60  static int
  63   61  raise_invalid(int v) {  /* SUSv3 requires ilogb(0,+/-Inf,NaN) raise invalid */
  64   62  #ifndef lint
  65   63          if ((__xpg6 & _C99SUSv3_ilogb_0InfNaN_raises_invalid) != 0) {
  66   64                  static const double zero = 0.0;
  67   65                  volatile double dummy;
  68   66  
  69   67                  dummy = zero / zero;
  70   68          }
↓ open down ↓ 2 lines elided ↑ open up ↑
  73   71  }
  74   72  
  75   73  int
  76   74  ilogb(double x) {
  77   75          int *px = (int *) &x, k = px[HIWORD] & ~0x80000000;
  78   76  
  79   77          if (k < 0x00100000) {
  80   78                  if ((px[LOWORD] | k) == 0)
  81   79                          return (raise_invalid(0x80000001));
  82   80                  else {
  83      -#if defined(USE_FPSCALE) || defined(__x86)
       81 +#if defined(__x86)
  84   82                          x *= two52;
  85   83                          return (((px[HIWORD] & 0x7ff00000) >> 20) - 1075);
  86   84  #else
  87   85                          return (ilogb_subnormal(k, px[LOWORD]));
  88   86  #endif
  89   87                  }
  90   88          } else if (k < 0x7ff00000)
  91   89                  return ((k >> 20) - 1023);
  92   90          else
  93   91                  return (raise_invalid(0x7fffffff));
  94   92  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX