Print this page
11210 libm should be cstyle(1ONBLD) clean

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libm/common/m9x/fenv.c
          +++ new/usr/src/lib/libm/common/m9x/fenv.c
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  24   24   */
       25 +
  25   26  /*
  26   27   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  27   28   * Use is subject to license terms.
  28   29   */
  29   30  
  30   31  #pragma weak __fex_merge_flags = fex_merge_flags
  31   32  
  32   33  #pragma weak __feholdexcept = feholdexcept
  33   34  #pragma weak __feupdateenv = feupdateenv
  34   35  #pragma weak __fegetenv = fegetenv
↓ open down ↓ 4 lines elided ↑ open up ↑
  39   40  #pragma weak fesetenv96 = fesetenv
  40   41  
  41   42  #include <fenv.h>
  42   43  #include <ucontext.h>
  43   44  #include <thread.h>
  44   45  #include "fex_handler.h"
  45   46  #include "fenv_inlines.h"
  46   47  
  47   48  const fenv_t __fenv_dfl_env = {
  48   49          {
  49      -                { FEX_NONSTOP, (void(*)())0 },
  50      -                { FEX_NONSTOP, (void(*)())0 },
  51      -                { FEX_NONSTOP, (void(*)())0 },
  52      -                { FEX_NONSTOP, (void(*)())0 },
  53      -                { FEX_NONSTOP, (void(*)())0 },
  54      -                { FEX_NONSTOP, (void(*)())0 },
  55      -                { FEX_NONSTOP, (void(*)())0 },
  56      -                { FEX_NONSTOP, (void(*)())0 },
  57      -                { FEX_NONSTOP, (void(*)())0 },
  58      -                { FEX_NONSTOP, (void(*)())0 },
  59      -                { FEX_NONSTOP, (void(*)())0 },
  60      -                { FEX_NONSTOP, (void(*)())0 },
       50 +                { FEX_NONSTOP, (void (*)()) 0 },
       51 +                { FEX_NONSTOP, (void (*)()) 0 },
       52 +                { FEX_NONSTOP, (void (*)()) 0 },
       53 +                { FEX_NONSTOP, (void (*)()) 0 },
       54 +                { FEX_NONSTOP, (void (*)()) 0 },
       55 +                { FEX_NONSTOP, (void (*)()) 0 },
       56 +                { FEX_NONSTOP, (void (*)()) 0 },
       57 +                { FEX_NONSTOP, (void (*)()) 0 },
       58 +                { FEX_NONSTOP, (void (*)()) 0 },
       59 +                { FEX_NONSTOP, (void (*)()) 0 },
       60 +                { FEX_NONSTOP, (void (*)()) 0 },
       61 +                { FEX_NONSTOP, (void (*)()) 0 },
  61   62          },
  62   63  #ifdef __x86
  63   64          0x13000000
  64   65  #else
  65   66          0
  66   67  #endif
  67   68  };
  68   69  
  69      -int feholdexcept(fenv_t *p)
       70 +int
       71 +feholdexcept(fenv_t *p)
  70   72  {
  71   73          (void) fegetenv(p);
  72   74          (void) feclearexcept(FE_ALL_EXCEPT);
  73      -        return !fex_set_handling(FEX_ALL, FEX_NONSTOP, NULL);
       75 +        return (!fex_set_handling(FEX_ALL, FEX_NONSTOP, NULL));
  74   76  }
  75   77  
  76      -int feholdexcept96(fenv_t *p)
       78 +int
       79 +feholdexcept96(fenv_t *p)
  77   80  {
  78   81          (void) fegetenv(p);
  79   82          (void) feclearexcept(FE_ALL_EXCEPT);
  80      -        return fex_set_handling(FEX_ALL, FEX_NONSTOP, NULL);
       83 +        return (fex_set_handling(FEX_ALL, FEX_NONSTOP, NULL));
  81   84  }
  82   85  
  83      -int feupdateenv(const fenv_t *p)
       86 +int
       87 +feupdateenv(const fenv_t *p)
  84   88  {
  85      -        unsigned long   fsr;
       89 +        unsigned long fsr;
  86   90  
  87   91          __fenv_getfsr(&fsr);
  88   92          (void) fesetenv(p);
  89   93          (void) feraiseexcept((int)__fenv_get_ex(fsr));
  90      -        return 0;
       94 +        return (0);
  91   95  }
  92   96  
  93      -int fegetenv(fenv_t *p)
       97 +int
       98 +fegetenv(fenv_t *p)
  94   99  {
  95  100          fex_getexcepthandler(&p->__handlers, FEX_ALL);
  96  101          __fenv_getfsr(&p->__fsr);
  97      -        return 0;
      102 +        return (0);
  98  103  }
  99  104  
 100      -int fesetenv(const fenv_t *p)
      105 +int
      106 +fesetenv(const fenv_t *p)
 101  107  {
 102  108          __fenv_setfsr(&p->__fsr);
 103  109          fex_setexcepthandler(&p->__handlers, FEX_ALL);
 104      -        return 0;
      110 +        return (0);
 105  111  }
 106  112  
 107      -void fex_merge_flags(const fenv_t *p)
      113 +void
      114 +fex_merge_flags(const fenv_t *p)
 108  115  {
 109      -        unsigned long   fsr;
      116 +        unsigned long fsr;
 110  117  
 111  118          __fenv_getfsr(&fsr);
 112  119          __fenv_set_ex(fsr, __fenv_get_ex(fsr) | __fenv_get_ex(p->__fsr));
 113  120          __fenv_setfsr(&fsr);
      121 +
 114  122          if (fex_get_log())
 115  123                  __fex_update_te();
 116  124  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX