diff --git a/include/cln/dfloat_class.h b/include/cln/dfloat_class.h index c189f39..9d0b9c7 100644 --- a/include/cln/dfloat_class.h +++ b/include/cln/dfloat_class.h @@ -52,7 +52,15 @@ inline cl_DF::operator struct cl_heap_dfloat * () const extern const cl_DF cl_DF_0; inline cl_DF::cl_DF () : cl_F ((cl_private_thing) (struct cl_heap_dfloat *) cl_DF_0) {} -CL_REQUIRE(cl_DF_globals) +class cl_DF_globals_init_helper +{ + static int count; +public: + cl_DF_globals_init_helper(); + ~cl_DF_globals_init_helper(); +}; +static cl_DF_globals_init_helper cl_DF_globals_init_helper_instance; + #if 0 // see cl_DF.h inline cl_DF::cl_DF (struct cl_heap_dfloat * ptr) : cl_F ((cl_private_thing) ptr) {} diff --git a/src/float/dfloat/elem/cl_DF_globals.cc b/src/float/dfloat/elem/cl_DF_globals.cc index 985299c..b959c76 100644 --- a/src/float/dfloat/elem/cl_DF_globals.cc +++ b/src/float/dfloat/elem/cl_DF_globals.cc @@ -3,8 +3,6 @@ // General includes. #include "cl_sysdep.h" -CL_PROVIDE(cl_DF_globals) - // Specification. #include "cl_DF.h" @@ -13,24 +11,32 @@ CL_PROVIDE(cl_DF_globals) namespace cln { -#if (cl_word_size==64) - -const cl_DF cl_DF_0 = allocate_dfloat(0); // 0.0d0 +const cl_DF cl_DF_0 = cl_DF_0; +const cl_DF cl_DF_1 = cl_DF_1; +const cl_DF cl_DF_minus1 = cl_DF_minus1; -const cl_DF cl_DF_1 = encode_DF(0,1,bit(DF_mant_len)); // 1.0d0 - -const cl_DF cl_DF_minus1 = encode_DF(-1,1,bit(DF_mant_len)); // -1.0d0 +int cl_DF_globals_init_helper::count = 0; +cl_DF_globals_init_helper::cl_DF_globals_init_helper() +{ + if (count++ == 0) { +#if (cl_word_size == 64) + new ((void *)&cl_DF_0) cl_DF(allocate_dfloat(0)); // 0.0d0 + new ((void *)&cl_DF_1) cl_DF(encode_DF(0, 1, bit(DF_mant_len))); // 1.0d0 + new ((void *)&cl_DF_minus1) cl_DF(encode_DF(-1,1,bit(DF_mant_len))); // -1.0d0 #else - -const cl_DF cl_DF_0 = allocate_dfloat(0,0); // 0.0d0 - -const cl_DF cl_DF_1 = encode_DF(0,1,bit(DF_mant_len-32),0); // 1.0d0 - -const cl_DF cl_DF_minus1 = encode_DF(-1,1,bit(DF_mant_len-32),0); // -1.0d0 - + new ((void *)&cl_DF_0) cl_DF(allocate_dfloat(0, 0)); // 0.0d0 + new ((void *)&cl_DF_1) cl_DF(encode_DF(0, 1, bit(DF_mant_len - 32), 0)); // 1.0d0 + new ((void *)&cl_DF_minus1) cl_DF(encode_DF(-1, 1, bit(DF_mant_len - 32), 0)); // -1.0d0 #endif + } +} +cl_DF_globals_init_helper::~cl_DF_globals_init_helper() +{ + if (--count == 0) { + // Nothing to clean up + } +} } // namespace cln -CL_PROVIDE_END(cl_DF_globals)