Browse Source

Get rid CL_REQUIRE/CL_PROVIDE(cl_F_mostpos), it is not really necessary.

Move static variables most_positive_[SFDL]F into most_positive_LF() function
(which is the only user of those variables) in order to avoid possible static
order initialization problems. While at it, make most_positive_LF() function
static.
master
Alexei Sheplyakov 16 years ago
parent
commit
03a227b734
  1. 1
      include/cln/float.h
  2. 35
      src/float/misc/cl_F_mostpos.cc

1
include/cln/float.h

@ -556,7 +556,6 @@ extern const cl_F signum (const cl_F& x);
// Returns the largest (most positive) floating point number in float format f. // Returns the largest (most positive) floating point number in float format f.
extern const cl_F most_positive_float (float_format_t f); extern const cl_F most_positive_float (float_format_t f);
//CL_REQUIRE(cl_F_mostpos)
// Returns the smallest (most negative) floating point number in float format f. // Returns the smallest (most negative) floating point number in float format f.
extern const cl_F most_negative_float (float_format_t f); extern const cl_F most_negative_float (float_format_t f);

35
src/float/misc/cl_F_mostpos.cc

@ -3,8 +3,6 @@
// General includes. // General includes.
#include "cl_sysdep.h" #include "cl_sysdep.h"
CL_PROVIDE(cl_F_mostpos)
// Specification. // Specification.
#include "cln/float.h" #include "cln/float.h"
@ -19,22 +17,7 @@ CL_PROVIDE(cl_F_mostpos)
namespace cln { namespace cln {
// Exponent so groß wie möglich, Mantisse 1...1, Vorzeichen +.
static const cl_SF most_positive_SF =
make_SF(0,SF_exp_high,bit(SF_mant_len+1)-1);
static const cl_FF most_positive_FF =
encode_FF(0,FF_exp_high-FF_exp_mid,bit(FF_mant_len+1)-1);
static const cl_DF most_positive_DF =
#if (cl_word_size==64)
encode_DF(0,DF_exp_high-DF_exp_mid,bit(DF_mant_len+1)-1);
#else
encode_DF(0,DF_exp_high-DF_exp_mid,bit(DF_mant_len-32+1)-1,bitm(32)-1);
#endif
inline const cl_LF most_positive_LF (uintC len)
static inline const cl_LF most_positive_LF (uintC len)
{ {
var Lfloat erg = allocate_lfloat(len,LF_exp_high,0); var Lfloat erg = allocate_lfloat(len,LF_exp_high,0);
fill_loop_up(&TheLfloat(erg)->data[0],len,~(uintD)0); fill_loop_up(&TheLfloat(erg)->data[0],len,~(uintD)0);
@ -43,6 +26,21 @@ inline const cl_LF most_positive_LF (uintC len)
const cl_F most_positive_float (float_format_t f) const cl_F most_positive_float (float_format_t f)
{ {
// Exponent so groß wie möglich, Mantisse 1...1, Vorzeichen +.
static const cl_SF most_positive_SF =
make_SF(0,SF_exp_high,bit(SF_mant_len+1)-1);
static const cl_FF most_positive_FF =
encode_FF(0,FF_exp_high-FF_exp_mid,bit(FF_mant_len+1)-1);
static const cl_DF most_positive_DF =
#if (cl_word_size==64)
encode_DF(0,DF_exp_high-DF_exp_mid,bit(DF_mant_len+1)-1);
#else
encode_DF(0,DF_exp_high-DF_exp_mid,bit(DF_mant_len-32+1)-1,bitm(32)-1);
#endif
floatformatcase((uintC)f floatformatcase((uintC)f
, return most_positive_SF; , return most_positive_SF;
, return most_positive_FF; , return most_positive_FF;
@ -53,4 +51,3 @@ const cl_F most_positive_float (float_format_t f)
} // namespace cln } // namespace cln
CL_PROVIDE_END(cl_F_mostpos)
Loading…
Cancel
Save