Browse Source
Extend the exponent range from 32 bits to 64 bits on selected platforms.
Extend the exponent range from 32 bits to 64 bits on selected platforms.
* include/cln/number.h: Add signatures for operations with long long.
* include/cln/complex_class.h: Likewise.
* include/cln/real_class.h: Likewise.
* include/cln/real.h: Likewise.
* include/cln/rational_class.h: Likewise.
* include/cln/rational.h: Likewise.
* include/cln/integer_class.h: Likewise.
* include/cln/integer.h: Likewise.
* include/cln/float.h: Likewise.
* include/cln/lfloat.h: Likewise.
* include/cln/types.h (sintE and uintE): New types for exponents.
* include/cln/*float.h: Use the new types for exponents.
* include/cln/floatformat.h (float_format_t): Make underlying type
compatible with sintE.
* doc/cln.tex: Document changed float_exponent return value.
* src/float/cl_F.h: Likewise.
* src/float/ffloat/misc/cl_FF_exponent.cc: Likewise.
* src/float/input/cl_F_read.cc: Likewise.
* src/float/lfloat/cl_LF.h: Likewise.
* src/float/lfloat/cl_LF_impl.h: Likewise.
* src/float/lfloat/algebraic/cl_LF_sqrt.cc: Likewise.
* src/float/lfloat/elem/cl_LF_1plus.cc: Likewise.
* src/float/lfloat/elem/cl_LF_I_div.cc: Likewise.
* src/float/lfloat/elem/cl_LF_I_mul.cc: Likewise.
* src/float/lfloat/elem/cl_LF_compare.cc: Likewise.
* src/float/lfloat/elem/cl_LF_div.cc: Likewise.
* src/float/lfloat/elem/cl_LF_from_I.cc: Likewise.
* src/float/lfloat/elem/cl_LF_fround.cc: Likewise.
* src/float/lfloat/elem/cl_LF_ftrunc.cc: Likewise.
* src/float/lfloat/elem/cl_LF_futrunc.cc: Likewise.
* src/float/lfloat/elem/cl_LF_mul.cc: Likewise.
* src/float/lfloat/elem/cl_LF_scale.cc: Likewise.
* src/float/lfloat/elem/cl_LF_scale_I.cc: Likewise.
* src/float/lfloat/elem/cl_LF_square.cc: Likewise.
* src/float/lfloat/elem/cl_LF_to_I.cc: Likewise.
* src/float/lfloat/misc/cl_LF_decode.cc: Likewise.
* src/float/lfloat/misc/cl_LF_exponent.cc: Likewise.
* src/float/lfloat/misc/cl_LF_idecode.cc: Likewise.
* src/float/lfloat/misc/cl_LF_shortenrel.cc: Likewise.
* src/float/lfloat/misc/cl_LF_shortenwith.cc: Likewise.
* src/float/misc/cl_F_decode.cc: Likewise.
* src/float/misc/cl_F_exponent.cc: Likewise.
* src/float/misc/cl_F_shortenrel.cc: Likewise.
* src/float/misc/cl_float_format.cc: Likewise.
* src/float/output/cl_F_dprint.cc: Likewise.
* src/float/sfloat/misc/cl_SF_exponent.cc: Likewise.
* src/float/transcendental/cl_F_atanhx.cc: Likewise.
* src/float/transcendental/cl_F_atanx.cc: Likewise.
* src/float/transcendental/cl_F_cosh.cc: Likewise.
* src/float/transcendental/cl_F_expx.cc: Likewise.
* src/float/transcendental/cl_F_lnx.cc: Likewise.
* src/float/transcendental/cl_F_sinhx.cc: Likewise.
* src/float/transcendental/cl_F_sinx.cc: Likewise.
* src/float/transcendental/cl_LF_pi.cc: Likewise.
* src/integer/cl_I.h: Likewise.
* src/complex/algebraic/cl_LF_hypot.cc: Likewise.
* src/complex/elem/division/cl_C_LF_recip.cc: Likewise.
* src/float/dfloat/misc/cl_DF_exponent.cc: Likewise.
* src/integer/conv/cl_I_from_Q2.cc: Added.
* src/base/cl_low.h (isqrtC): New function, for 64 bit falls back to...
* src/base/low/cl_low_isqrt.cc (isqrt): ...this new implementation.
* src/base/cl_macros.h (bitc): Make sure 64 bit is used if required by
exponent operations.
* examples/pi.cc: Support more than 646456614 decimal digits.
master
Richard Kreckel
19 years ago
66 changed files with 963 additions and 184 deletions
-
68ChangeLog
-
29NEWS
-
4doc/cln.tex
-
4examples/pi.cc
-
13include/cln/complex_class.h
-
2include/cln/dfloat.h
-
2include/cln/ffloat.h
-
52include/cln/float.h
-
3include/cln/floatformat.h
-
44include/cln/integer.h
-
12include/cln/integer_class.h
-
26include/cln/lfloat.h
-
43include/cln/number.h
-
56include/cln/rational.h
-
12include/cln/rational_class.h
-
76include/cln/real.h
-
12include/cln/real_class.h
-
2include/cln/sfloat.h
-
12include/cln/types.h
-
25src/base/cl_low.h
-
2src/base/cl_macros.h
-
35src/base/low/cl_low_isqrt.cc
-
18src/complex/algebraic/cl_LF_hypot.cc
-
18src/complex/elem/division/cl_C_LF_recip.cc
-
2src/float/cl_F.h
-
2src/float/dfloat/misc/cl_DF_exponent.cc
-
2src/float/ffloat/misc/cl_FF_exponent.cc
-
4src/float/input/cl_F_read.cc
-
4src/float/lfloat/algebraic/cl_LF_sqrt.cc
-
10src/float/lfloat/cl_LF.h
-
22src/float/lfloat/cl_LF_impl.h
-
14src/float/lfloat/elem/cl_LF_1plus.cc
-
4src/float/lfloat/elem/cl_LF_I_div.cc
-
4src/float/lfloat/elem/cl_LF_I_mul.cc
-
8src/float/lfloat/elem/cl_LF_compare.cc
-
6src/float/lfloat/elem/cl_LF_div.cc
-
6src/float/lfloat/elem/cl_LF_from_I.cc
-
12src/float/lfloat/elem/cl_LF_fround.cc
-
12src/float/lfloat/elem/cl_LF_ftrunc.cc
-
12src/float/lfloat/elem/cl_LF_futrunc.cc
-
6src/float/lfloat/elem/cl_LF_mul.cc
-
8src/float/lfloat/elem/cl_LF_scale.cc
-
4src/float/lfloat/elem/cl_LF_scale_I.cc
-
6src/float/lfloat/elem/cl_LF_square.cc
-
2src/float/lfloat/elem/cl_LF_to_I.cc
-
4src/float/lfloat/misc/cl_LF_decode.cc
-
6src/float/lfloat/misc/cl_LF_exponent.cc
-
2src/float/lfloat/misc/cl_LF_idecode.cc
-
6src/float/lfloat/misc/cl_LF_shortenrel.cc
-
6src/float/lfloat/misc/cl_LF_shortenwith.cc
-
4src/float/misc/cl_F_decode.cc
-
2src/float/misc/cl_F_exponent.cc
-
6src/float/misc/cl_F_shortenrel.cc
-
19src/float/misc/cl_float_format.cc
-
65src/float/output/cl_F_dprint.cc
-
2src/float/sfloat/misc/cl_SF_exponent.cc
-
10src/float/transcendental/cl_F_atanhx.cc
-
8src/float/transcendental/cl_F_atanx.cc
-
2src/float/transcendental/cl_F_cosh.cc
-
16src/float/transcendental/cl_F_expx.cc
-
8src/float/transcendental/cl_F_lnx.cc
-
14src/float/transcendental/cl_F_sinhx.cc
-
14src/float/transcendental/cl_F_sinx.cc
-
4src/float/transcendental/cl_LF_pi.cc
-
33src/integer/cl_I.h
-
196src/integer/conv/cl_I_from_Q2.cc
@ -0,0 +1,196 @@ |
|||
// Q2_to_I() helper.
|
|||
|
|||
// General includes.
|
|||
#include "cl_sysdep.h"
|
|||
|
|||
// Specification.
|
|||
#include "cl_I.h"
|
|||
|
|||
|
|||
// Implementation.
|
|||
|
|||
#include "cln/number.h"
|
|||
|
|||
#ifdef intQsize
|
|||
|
|||
#include "cl_DS.h"
|
|||
|
|||
namespace cln { |
|||
|
|||
cl_private_thing cl_I_constructor_from_Q2 (sint64 wert_hi, uint64 wert_lo) |
|||
{ |
|||
if (wert_hi == 0) { |
|||
if ((wert_lo & minus_bit(cl_value_len-1)) == 0) |
|||
return (cl_private_thing)(cl_combine(cl_FN_tag,wert_lo)); |
|||
} |
|||
elif (wert_hi == ~(sint64)0) { |
|||
if ((~wert_lo & minus_bit(cl_value_len-1)) == 0) |
|||
return (cl_private_thing)(cl_combine(cl_FN_tag,(sint64)wert_lo)); |
|||
} |
|||
// Create bignum with length n, where:
|
|||
// bn_minlength <= n <= ceiling(128/intDsize)
|
|||
#define FILL_1_DIGIT(l,i,from) \
|
|||
arrayLSref(ptr->data,l,i) = (uintD)from; |
|||
#define FILL_2_DIGIT(l,i,from) \
|
|||
arrayLSref(ptr->data,l,i) = (uintD)from; \ |
|||
arrayLSref(ptr->data,l,i+1) = (uintD)(from>>intDsize); |
|||
#define FILL_3_DIGIT(l,i,from) \
|
|||
arrayLSref(ptr->data,l,i) = (uintD)from; from>>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+1) = (uintD)from; \ |
|||
arrayLSref(ptr->data,l,i+2) = (uintD)(from>>intDsize); |
|||
#define FILL_4_DIGIT(l,i,from) \
|
|||
arrayLSref(ptr->data,l,i) = (uintD)from; from>>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+1) = (uintD)from; from>>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+2) = (uintD)from; \ |
|||
arrayLSref(ptr->data,l,i+3) = (uintD)(from>>intDsize); |
|||
#define FILL_8_DIGIT(l,i,from) \
|
|||
arrayLSref(ptr->data,l,i) = (uintD)from; from >>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+1) = (uintD)from; from >>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+2) = (uintD)from; from >>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+3) = (uintD)from; from >>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+4) = (uintD)from; from >>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+5) = (uintD)from; from >>=intDsize; \ |
|||
arrayLSref(ptr->data,l,i+6) = (uintD)from; \ |
|||
arrayLSref(ptr->data,l,i+7) = (uintD)from>>intDsize; |
|||
#if (intDsize==64)
|
|||
#define FILL_1 FILL_1_DIGIT(1,0,wert_lo);
|
|||
#define FILL_2 FILL_1_DIGIT(2,1,wert_hi); FILL_1_DIGIT(2,0,wert_lo);
|
|||
#endif
|
|||
#if (32/intDsize==1)
|
|||
#define FILL_1 FILL_1_DIGIT(1,0,wert_lo);
|
|||
#define FILL_2 FILL_2_DIGIT(2,0,wert_lo);
|
|||
#define FILL_3 FILL_1_DIGIT(3,2,wert_hi); FILL_2_DIGIT(3,0,wert_lo);
|
|||
#define FILL_4 FILL_2_DIGIT(4,2,wert_hi); FILL_2_DIGIT(4,0,wert_lo);
|
|||
#endif
|
|||
#if (32/intDsize==2)
|
|||
#define FILL_1 FILL_1_DIGIT(1,0,wert_lo);
|
|||
#define FILL_2 FILL_2_DIGIT(2,0,wert_lo);
|
|||
#define FILL_3 FILL_3_DIGIT(3,0,wert_lo);
|
|||
#define FILL_4 FILL_4_DIGIT(4,0,wert_lo);
|
|||
#define FILL_5 FILL_1_DIGIT(5,4,wert_hi); FILL_4_DIGIT(5,0,wert_lo);
|
|||
#define FILL_6 FILL_2_DIGIT(6,4,wert_hi); FILL_4_DIGIT(6,0,wert_lo);
|
|||
#define FILL_7 FILL_3_DIGIT(7,4,wert_hi); FILL_4_DIGIT(7,0,wert_lo);
|
|||
#define FILL_8 FILL_4_DIGIT(8,4,wert_hi); FILL_4_DIGIT(8,0,wert_lo);
|
|||
#endif
|
|||
#if (32/intDsize==4)
|
|||
#define FILL_1 FILL_1_DIGIT(1,0,wert_lo);
|
|||
#define FILL_2 FILL_2_DIGIT(2,0,wert_lo);
|
|||
#define FILL_3 FILL_3_DIGIT(3,0,wert_lo);
|
|||
#define FILL_4 FILL_4_DIGIT(4,0,wert_lo);
|
|||
#define FILL_5 FILL_5_DIGIT(5,0,wert_lo);
|
|||
#define FILL_6 FILL_6_DIGIT(6,0,wert_lo);
|
|||
#define FILL_7 FILL_7_DIGIT(7,0,wert_lo);
|
|||
#define FILL_8 FILL_8_DIGIT(8,0,wert_lo);
|
|||
#define FILL_9 FILL_1_DIGIT(9,8,wert_hi); FILL_8_DIGIT(9,0,wert_lo);
|
|||
#define FILL_10 FILL_2_DIGIT(10,8,wert_hi); FILL_8_DIGIT(10,0,wert_lo);
|
|||
#define FILL_11 FILL_3_DIGIT(11,8,wert_hi); FILL_8_DIGIT(11,0,wert_lo);
|
|||
#define FILL_12 FILL_4_DIGIT(12,8,wert_hi); FILL_8_DIGIT(12,0,wert_lo);
|
|||
#define FILL_13 FILL_5_DIGIT(13,8,wert_hi); FILL_8_DIGIT(13,0,wert_lo);
|
|||
#define FILL_14 FILL_6_DIGIT(14,8,wert_hi); FILL_8_DIGIT(14,0,wert_lo);
|
|||
#define FILL_15 FILL_7_DIGIT(15,8,wert_hi); FILL_8_DIGIT(15,0,wert_lo);
|
|||
#define FILL_16 FILL_8_DIGIT(16,8,wert_hi); FILL_8_DIGIT(16,0,wert_lo);
|
|||
#endif
|
|||
if (wert_hi >= 0) { |
|||
#define IF_LENGTH(i) \
|
|||
if ((bn_minlength <= i) && (i*intDsize <= 128)) \ |
|||
if (!((i+1)*intDsize <= 128) \ |
|||
|| (i*intDsize-1 < 64 \ |
|||
? ((wert_hi == 0) && (wert_lo < (uint64)bitc(i*intDsize-1))) \ |
|||
: ((uint64)wert_hi < (uint64)bitc(i*intDsize-1-64)) \ |
|||
) ) |
|||
#define ALLOC(i) \
|
|||
var cl_heap_bignum* ptr = allocate_bignum(i); |
|||
#define OK \
|
|||
return (cl_private_thing)(ptr); |
|||
IF_LENGTH(1) |
|||
bignum1: { ALLOC(1); FILL_1; OK; } |
|||
IF_LENGTH(2) |
|||
bignum2: { ALLOC(2); FILL_2; OK; } |
|||
#if (intDsize <= 32)
|
|||
IF_LENGTH(3) |
|||
bignum3: { ALLOC(3); FILL_3; OK; } |
|||
IF_LENGTH(4) |
|||
bignum4: { ALLOC(4); FILL_4; OK; } |
|||
#if (intDsize <= 16)
|
|||
IF_LENGTH(5) |
|||
bignum5: { ALLOC(5); FILL_5; OK; } |
|||
IF_LENGTH(6) |
|||
bignum6: { ALLOC(6); FILL_6; OK; } |
|||
IF_LENGTH(7) |
|||
bignum7: { ALLOC(7); FILL_7; OK; } |
|||
IF_LENGTH(8) |
|||
bignum8: { ALLOC(8); FILL_8; OK; } |
|||
#if (intDsize <= 8)
|
|||
IF_LENGTH(9) |
|||
bignum9: { ALLOC(9); FILL_9; OK; } |
|||
IF_LENGTH(10) |
|||
bignum10: { ALLOC(10); FILL_10; OK; } |
|||
IF_LENGTH(11) |
|||
bignum11: { ALLOC(11); FILL_11; OK; } |
|||
IF_LENGTH(12) |
|||
bignum12: { ALLOC(12); FILL_12; OK; } |
|||
IF_LENGTH(13) |
|||
bignum13: { ALLOC(13); FILL_13; OK; } |
|||
IF_LENGTH(14) |
|||
bignum14: { ALLOC(14); FILL_14; OK; } |
|||
IF_LENGTH(15) |
|||
bignum15: { ALLOC(15); FILL_15; OK; } |
|||
IF_LENGTH(16) |
|||
bignum16: { ALLOC(16); FILL_16; OK; } |
|||
#endif
|
|||
#endif
|
|||
#endif
|
|||
#undef IF_LENGTH
|
|||
} else { |
|||
#define IF_LENGTH(i) \
|
|||
if ((bn_minlength <= i) && (i*intDsize <= 128)) \ |
|||
if (!((i+1)*intDsize <= 128) \ |
|||
|| (i*intDsize-1 < 64 \ |
|||
? ((wert_hi == ~(sint64)0) && (wert_lo >= (uint64)(-bitc(i*intDsize-1)))) \ |
|||
: ((uint64)wert_hi >= (uint64)(-bitc(i*intDsize-1-64))) \ |
|||
) ) |
|||
IF_LENGTH(1) |
|||
goto bignum1; |
|||
IF_LENGTH(2) |
|||
goto bignum2; |
|||
#if (intDsize <= 32)
|
|||
IF_LENGTH(3) |
|||
goto bignum3; |
|||
IF_LENGTH(4) |
|||
goto bignum4; |
|||
#if (intDsize <= 16)
|
|||
IF_LENGTH(5) |
|||
goto bignum5; |
|||
IF_LENGTH(6) |
|||
goto bignum6; |
|||
IF_LENGTH(7) |
|||
goto bignum7; |
|||
IF_LENGTH(8) |
|||
goto bignum8; |
|||
#if (intDsize <= 8)
|
|||
IF_LENGTH(9) |
|||
goto bignum9; |
|||
IF_LENGTH(10) |
|||
goto bignum10; |
|||
IF_LENGTH(11) |
|||
goto bignum11; |
|||
IF_LENGTH(12) |
|||
goto bignum12; |
|||
IF_LENGTH(13) |
|||
goto bignum13; |
|||
IF_LENGTH(14) |
|||
goto bignum14; |
|||
IF_LENGTH(15) |
|||
goto bignum15; |
|||
IF_LENGTH(16) |
|||
goto bignum16; |
|||
#endif
|
|||
#endif
|
|||
#endif
|
|||
#undef IF_LENGTH
|
|||
} |
|||
} |
|||
|
|||
} // namespace cln
|
|||
|
|||
#endif
|
|||
Reference in new issue
xxxxxxxxxx