tomasz.sowa
/
ttmath
1
0
Fork 0
Code Issues Pull Requests Releases Activity

added: UInt::PrintLog(const char * msg, std::ostream & output) 

used for debugging purposes by macro TTMATH_LOG(msg)
         (it is used in nearly all methods in UInt class)
added:   macro TTMATH_DEBUG_LOG: when defined then TTMATH_LOG() 
         put some debug information (to std::cout)



git-svn-id: svn://ttmath.org/publicrep/ttmath/trunk@125 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2009-05-01 14:53:21 +00:00
parent d8b829f4c5
commit 1efe39686b
7 changed files with 273 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,3 +1,10 @@
Version 0.8.4 prerelease (2009.05.01):
* added: UInt::PrintLog(const char * msg, std::ostream & output)
used for debugging purposes by macro TTMATH_LOG(msg)
(it is used in nearly all methods in UInt class)
* added: macro TTMATH_DEBUG_LOG: when defined then TTMATH_LOG()
put some debug information (to std::cout)
Version 0.8.3 (2009.04.06):
* fixed: RclMoveAllWords() and RcrMoveAllWords() sometimes didn't return
the proper carry, (when 'bits' was greater than or equal to 'value_size')

7
ttmath/ttmath.h
View File

@ -53,6 +53,13 @@
namespace ttmath
{
/*
*
* functions defined here are used only with Big<> types
*
*
*/
/*
*

7
ttmath/ttmathbig.h
View File

@ -2255,7 +2255,7 @@ public:
a constructor for converting 'uint' to this class
*/
Big(uint value)
{
{
FromUInt(value);
}
@ -3367,10 +3367,9 @@ private:
// we don't remove any white characters here
// this is only to avoid getting a warning about an uninitialized object
// gcc 4.1.2 reports: 'old_value.info' may be used uninitialized in this function
// this is only to avoid getting a warning about an uninitialized object 'old_value' which GCC reports
// (in fact we will initialize it later when the condition 'testing' is fulfilled)
old_value.info = 0;
old_value.SetZero();
power.SetOne();

5
ttmath/ttmathint.h
View File

@ -647,7 +647,7 @@ public:
return 0;
}
// converting from Int
/*!
the default assignment operator
@ -714,7 +714,6 @@ public:
}
// converting from UInt
/*!
this operator converts an UInt<another_size> type to this class
@ -759,8 +758,8 @@ public:
// look that 'size' we still set as 'value_size' and not as u.value_size
FromUInt(u);
}
//
#ifdef TTMATH_PLATFORM64

17
ttmath/ttmathtypes.h
View File

@ -64,8 +64,8 @@
*/
#define TTMATH_MAJOR_VER 0
#define TTMATH_MINOR_VER 8
#define TTMATH_REVISION_VER 3
#define TTMATH_PRERELEASE_VER 0
#define TTMATH_REVISION_VER 4
#define TTMATH_PRERELEASE_VER 1
/*!
@ -407,6 +407,19 @@ namespace ttmath
#endif
#ifdef TTMATH_DEBUG_LOG
#define TTMATH_LOG(msg) \
PrintLog(msg, std::cout);
#else
#define TTMATH_LOG(msg)
#endif
} // namespace

225
ttmath/ttmathuint.h
View File

@ -118,6 +118,14 @@ public:
}
void PrintLog(const char * msg, std::ostream & output) const
{
output << msg << std::endl;
for(uint i=0 ; i<value_size ; ++i)
output << " table[" << i << "]: " << table[i] << std::endl;
}
/*!
this method returns the size of the table
@ -137,6 +145,8 @@ public:
for(uint i=0 ; i<value_size ; ++i)
table[i] = 0;
TTMATH_LOG("UInt::SetZero")
}
@ -147,6 +157,8 @@ public:
{
SetZero();
table[0] = 1;
TTMATH_LOG("UInt::SetOne")
}
@ -158,6 +170,8 @@ public:
{
for(uint i=0 ; i<value_size ; ++i)
table[i] = TTMATH_UINT_MAX_VALUE;
TTMATH_LOG("UInt::SetMax")
}
@ -168,6 +182,8 @@ public:
void SetMin()
{
SetZero();
TTMATH_LOG("UInt::SetMin")
}
@ -220,6 +236,9 @@ public:
// cleaning the rest of the mantissa
for( ; i>=0 ; --i)
table[i] = 0;
TTMATH_LOG("UInt32::SetFromTable")
}
@ -326,7 +345,8 @@ public:
#endif
TTMATH_LOG("UInt32::Add")
return c;
}
@ -427,8 +447,9 @@ public:
: "cc", "memory" );
#endif
TTMATH_LOG("UInt32::AddInt")
return c;
}
@ -550,6 +571,7 @@ public:
#endif
TTMATH_LOG("UInt32::AddTwoInts")
return c;
}
@ -646,6 +668,7 @@ public:
#endif
TTMATH_LOG("UInt32::Sub")
return c;
}
@ -745,7 +768,8 @@ public:
: "cc", "memory" );
#endif
TTMATH_LOG("UInt32::SubInt")
return c;
}
@ -856,6 +880,7 @@ private:
#endif
TTMATH_LOG("UInt32::Rcl2_one")
return c;
}
@ -931,6 +956,7 @@ private:
#endif
TTMATH_LOG("UInt32::Rcr2_one")
return c;
}
@ -1056,6 +1082,7 @@ private:
#endif
TTMATH_LOG("UInt32::Rcl2")
return c;
}
@ -1187,6 +1214,7 @@ private:
#endif
TTMATH_LOG("UInt32::Rcr2")
return c;
}
@ -1234,6 +1262,8 @@ private:
for( ; first>=0 ; --first )
table[first] = mask;
}
TTMATH_LOG("UInt::RclMoveAllWords")
}
public:
@ -1260,7 +1290,10 @@ public:
RclMoveAllWords(rest_bits, last_c, bits, c);
if( rest_bits == 0 )
{
TTMATH_LOG("UInt::Rcl")
return last_c;
}
// rest_bits is from 1 to TTMATH_BITS_PER_UINT-1 now
if( rest_bits == 1 )
@ -1278,6 +1311,7 @@ public:
last_c = Rcl2(rest_bits, c);
}
TTMATH_LOG("UInt::Rcl")
return last_c;
}
@ -1323,6 +1357,8 @@ private:
for( ; first<value_size ; ++first )
table[first] = mask;
}
TTMATH_LOG("UInt::RcrMoveAllWords")
}
public:
@ -1349,7 +1385,10 @@ public:
RcrMoveAllWords(rest_bits, last_c, bits, c);
if( rest_bits == 0 )
{
TTMATH_LOG("UInt::Rcr")
return last_c;
}
// rest_bits is from 1 to TTMATH_BITS_PER_UINT-1 now
if( rest_bits == 1 )
@ -1367,6 +1406,8 @@ public:
last_c = Rcr2(rest_bits, c);
}
TTMATH_LOG("UInt::Rcr")
return last_c;
}
@ -1386,6 +1427,7 @@ public:
if( a < 0 )
{
// there's a value zero
TTMATH_LOG("UInt::CompensationToLeft")
return moving;
}
@ -1410,6 +1452,8 @@ public:
moving2 = TTMATH_BITS_PER_UINT - moving2 - 1;
Rcl(moving2);
TTMATH_LOG("UInt::CompensationToLeft")
return moving + moving2;
}
@ -1456,7 +1500,6 @@ public:
#endif
return result;
}
@ -1484,12 +1527,16 @@ public:
// is zero
index = 0;
TTMATH_LOG("UInt::FindLeadingBit")
return false;
}
// table[table_id] != 0
index = FindLeadingBitInWord( table[table_id] );
TTMATH_LOG("UInt::FindLeadingBit")
return true;
}
@ -1572,8 +1619,11 @@ public:
uint bit = bit_index % TTMATH_BITS_PER_UINT;
uint temp = table[index];
return SetBitInWord(temp, bit);
uint res = SetBitInWord(temp, bit);
TTMATH_LOG("UInt::GetBit")
return res;
}
@ -1589,8 +1639,11 @@ public:
uint index = bit_index / TTMATH_BITS_PER_UINT;
uint bit = bit_index % TTMATH_BITS_PER_UINT;
uint res = SetBitInWord(table[index], bit);
return SetBitInWord(table[index], bit);
TTMATH_LOG("UInt::SetBit")
return res;
}
@ -1601,6 +1654,8 @@ public:
{
for(uint x=0 ; x<value_size ; ++x)
table[x] &= ss2.table[x];
TTMATH_LOG("UInt::BitAnd")
}
@ -1611,6 +1666,8 @@ public:
{
for(uint x=0 ; x<value_size ; ++x)
table[x] |= ss2.table[x];
TTMATH_LOG("UInt::BitOr")
}
@ -1621,6 +1678,8 @@ public:
{
for(uint x=0 ; x<value_size ; ++x)
table[x] ^= ss2.table[x];
TTMATH_LOG("UInt::BitXor")
}
@ -1631,6 +1690,8 @@ public:
{
for(uint x=0 ; x<value_size ; ++x)
table[x] = ~table[x];
TTMATH_LOG("UInt::BitNot")
}
@ -1660,6 +1721,9 @@ public:
}
else
table[0] = 1;
TTMATH_LOG("UInt::BitNot2")
}
@ -1773,6 +1837,8 @@ public:
}
}
TTMATH_LOG("UInt::MulInt(uint)")
return 0;
}
@ -1802,7 +1868,10 @@ public:
for(x1size=value_size ; x1size>0 && table[x1size-1]==0 ; --x1size);
if( x1size==0 )
{
TTMATH_LOG("UInt::MulInt(uint, UInt<>)")
return 0;
}
for(x1start=0 ; x1start<x1size && table[x1start]==0 ; ++x1start);
}
@ -1813,6 +1882,9 @@ public:
result.AddTwoInts(r2,r1,x1);
}
TTMATH_LOG("UInt::MulInt(uint, UInt<>)")
return 0;
}
@ -1877,13 +1949,21 @@ public:
for(uint i=0; i < value_size*TTMATH_BITS_PER_UINT ; ++i)
{
if( Add(*this) )
{
TTMATH_LOG("UInt::Mul1")
return 1;
}
if( ss1.Rcl(1) )
if( Add(ss2) )
{
TTMATH_LOG("UInt::Mul1")
return 1;
}
}
TTMATH_LOG("UInt::Mul1")
return 0;
}
@ -1916,6 +1996,8 @@ public:
// multiply
// (there will not be a carry)
result.Mul1( ss2 );
TTMATH_LOG("UInt::Mul1Big")
}
@ -1947,6 +2029,8 @@ public:
if( result.table[i] != 0 )
return 1;
TTMATH_LOG("UInt::Mul2")
return 0;
}
@ -1974,7 +2058,10 @@ public:
for(x2size=value_size ; x2size>0 && ss2.table[x2size-1]==0 ; --x2size);
if( x1size==0 || x2size==0 )
{
TTMATH_LOG("UInt::Mul2Big")
return;
}
for(x1start=0 ; x1start<x1size && table[x1start]==0 ; ++x1start);
for(x2start=0 ; x2start<x2size && ss2.table[x2start]==0 ; ++x2start);
@ -1989,6 +2076,8 @@ public:
// here will never be a carry
}
}
TTMATH_LOG("UInt::Mul2Big")
}
@ -2060,6 +2149,7 @@ public:
*r = r_;
*rest = rest_;
}
#endif
@ -2076,6 +2166,8 @@ public:
if( remainder )
*remainder = 0;
TTMATH_LOG("UInt::DivInt")
return 0;
}
@ -2094,6 +2186,8 @@ public:
if( remainder )
*remainder = r;
TTMATH_LOG("UInt::DivInt")
return 0;
}
@ -2157,6 +2251,7 @@ private:
remainder->SetZero();
SetOne();
TTMATH_LOG("UInt::Div_StandardTest")
return 0;
case 3: // 'this' is smaller than v
@ -2164,6 +2259,7 @@ private:
*remainder = *this;
SetZero();
TTMATH_LOG("UInt::Div_StandardTest")
return 0;
case 2: // 'this' is zero
@ -2171,12 +2267,16 @@ private:
remainder->SetZero();
SetZero();
TTMATH_LOG("UInt::Div_StandardTest")
return 0;
case 1: // v is zero
TTMATH_LOG("UInt::Div_StandardTest")
return 1;
}
TTMATH_LOG("UInt::Div_StandardTest")
return 2;
}
@ -2282,6 +2382,7 @@ private:
goto div_a;
c = Rcl(1, c);
TTMATH_LOG("UInt::Div1_Calculate")
return 0;
@ -2302,6 +2403,8 @@ private:
c = Rcl(1, c);
c = rest.Add(divisor);
TTMATH_LOG("UInt::Div1_Calculate")
return 0;
}
@ -2339,6 +2442,8 @@ public:
SetBit(bits_diff);
}
TTMATH_LOG("UInt::Div2")
return 0;
}
@ -2369,7 +2474,10 @@ private:
divisor_table_id, divisor_index);
if( status < 2 )
{
TTMATH_LOG("UInt::Div2_Calculate")
return status;
}
// here we know that 'this' is greater than divisor
// then 'index' is greater or equal 'divisor_index'
@ -2386,6 +2494,8 @@ private:
Sub(divisor_copy, 0);
TTMATH_LOG("UInt::Div2_Calculate")
return 2;
}
@ -2402,8 +2512,11 @@ private:
uint & divisor_table_id, uint & divisor_index)
{
if( !divisor.FindLeadingBit(divisor_table_id, divisor_index) )
{
// division by zero
TTMATH_LOG("UInt::Div2_FindLeadingBitsAndCheck")
return 1;
}
if( !FindLeadingBit(table_id, index) )
{
@ -2414,6 +2527,8 @@ private:
if( remainder )
remainder->SetZero();
TTMATH_LOG("UInt::Div2_FindLeadingBitsAndCheck")
return 0;
}
@ -2433,6 +2548,8 @@ private:
remainder->table[0] = r;
}
TTMATH_LOG("UInt::Div2_FindLeadingBitsAndCheck")
return 0;
}
@ -2440,9 +2557,14 @@ private:
if( Div2_DivisorGreaterOrEqual( divisor, remainder,
table_id, index,
divisor_table_id, divisor_index) )
{
TTMATH_LOG("UInt::Div2_FindLeadingBitsAndCheck")
return 0;
}
TTMATH_LOG("UInt::Div2_FindLeadingBitsAndCheck")
return 2;
}
@ -2465,6 +2587,8 @@ private:
SetZero();
TTMATH_LOG("UInt::Div2_DivisorGreaterOrEqual")
return true;
}
@ -2484,6 +2608,8 @@ private:
SetZero();
TTMATH_LOG("UInt::Div2_DivisorGreaterOrEqual")
return true;
}
else
@ -2496,10 +2622,14 @@ private:
SetOne();
TTMATH_LOG("UInt::Div2_DivisorGreaterOrEqual")
return true;
}
}
TTMATH_LOG("UInt::Div2_DivisorGreaterOrEqual")
return false;
}
@ -2534,6 +2664,8 @@ public:
remainder->table[0] = r;
}
TTMATH_LOG("UInt::Div3")
return 0;
}
@ -2545,6 +2677,8 @@ public:
m = m - n;
Div3_Division(v, remainder, m, n);
TTMATH_LOG("UInt::Div3")
return 0;
}
@ -2599,6 +2733,8 @@ private:
Div3_Unnormalize(remainder, n, d);
*this = q;
TTMATH_LOG("UInt::Div3_Division")
}
@ -2615,6 +2751,8 @@ private:
for( ++i ; i<value_size+1 ; ++i)
uu.table[i] = 0;
TTMATH_LOG("UInt::Div3_MakeNewU")
}
@ -2627,6 +2765,8 @@ private:
if( i+j < value_size )
table[i+j] = uu.table[i];
TTMATH_LOG("UInt::Div3_CopyNewU")
}
@ -2640,6 +2780,8 @@ private:
vv.table[i] = v.table[i];
vv.table[value_size] = 0;
TTMATH_LOG("UInt::Div3_MakeBiggerV")
}
@ -2672,6 +2814,8 @@ private:
res = 0;
}
TTMATH_LOG("UInt::Div3_Normalize")
return res;
}
@ -2684,6 +2828,8 @@ private:
Rcr(d,0);
*remainder = *this;
TTMATH_LOG("UInt::Div3_Unnormalize")
}
@ -2731,6 +2877,7 @@ private:
}
while( next_test );
TTMATH_LOG("UInt::Div3_Calculate")
return u_temp.table[0];
}
@ -2754,6 +2901,8 @@ private:
--qp;
uu.Add(vv);
}
TTMATH_LOG("UInt::Div3_MultiplySubtract")
}
@ -2787,18 +2936,26 @@ public:
{
if( pow.table[0] & 1 )
if( result.Mul(start) )
{
TTMATH_LOG("UInt::Pow(UInt<>)")
return 1;
}
start_temp = start;
// in the second Mul algorithm we can use start.Mul(start) directly (there is no TTMATH_ASSERT_REFERENCE there)
if( start.Mul(start_temp) )
{
TTMATH_LOG("UInt::Pow(UInt<>)")
return 1;
}
pow.Rcr2_one(0);
}
*this = result;
TTMATH_LOG("UInt::Pow(UInt<>)")
return 0;
}
@ -2815,6 +2972,7 @@ public:
if( n >= value_size*TTMATH_BITS_PER_UINT )
{
SetZero();
TTMATH_LOG("UInt::ClearFirstBits")
return;
}
@ -2828,7 +2986,10 @@ public:
}
if( n == 0 )
{
TTMATH_LOG("UInt::ClearFirstBits")
return;
}
// and then we're clearing one word which has left
// mask -- all bits are set to one
@ -2837,6 +2998,8 @@ public:
mask = mask << n;
(*p) &= mask;
TTMATH_LOG("UInt::ClearFirstBits")
}
@ -2986,9 +3149,14 @@ public:
{
for( ; i<argument_size ; ++i)
if( p.table[i] != 0 )
{
TTMATH_LOG("UInt::FromUInt(UInt<>)")
return 1;
}
}
TTMATH_LOG("UInt::FromUInt(UInt<>)")
return 0;
}
@ -3002,6 +3170,8 @@ public:
table[i] = 0;
table[0] = value;
TTMATH_LOG("UInt::FromUInt(uint)")
}
@ -3015,6 +3185,8 @@ public:
{
FromUInt(p);
TTMATH_LOG("UInt::operator=(UInt<argument_size>)")
return *this;
}
@ -3025,6 +3197,8 @@ public:
{
FromUInt(p);
TTMATH_LOG("UInt::operator=(UInt<>)")
return *this;
}
@ -3036,6 +3210,8 @@ public:
{
FromUInt(i);
TTMATH_LOG("UInt::operator=(uint)")
return *this;
}
@ -3046,6 +3222,8 @@ public:
UInt(uint i)
{
FromUInt(i);
TTMATH_LOG("UInt::UInt(uint)")
}
@ -3066,6 +3244,8 @@ public:
{
FromUInt(uint(i));
TTMATH_LOG("UInt::operator=(sint)")
return *this;
}
@ -3078,6 +3258,8 @@ public:
UInt(sint i)
{
FromUInt(uint(i));
TTMATH_LOG("UInt::UInt(sint)")
}
/*!
@ -3086,6 +3268,8 @@ public:
UInt(const char * s)
{
FromString(s);
TTMATH_LOG("UInt::UInt(const char *)")
}
@ -3113,6 +3297,8 @@ public:
UInt(const UInt<value_size> & u)
{
FromUInt(u);
TTMATH_LOG("UInt::UInt(UInt<>)")
}
@ -3125,6 +3311,8 @@ public:
{
// look that 'size' we still set as 'value_size' and not as u.value_size
FromUInt(u);
TTMATH_LOG("UInt::UInt(UInt<argument_size>)")
}
@ -3243,6 +3431,7 @@ public:
if( after_source )
*after_source = s;
TTMATH_LOG("UInt::FromString")
return (c==0)? 0 : 1;
}
@ -3268,6 +3457,8 @@ public:
{
FromString(s);
TTMATH_LOG("UInt::operator=(const char *)")
return *this;
}
@ -3493,6 +3684,8 @@ public:
{
Sub(p2);
TTMATH_LOG("UInt::operator-=")
return *this;
}
@ -3509,6 +3702,8 @@ public:
{
Add(p2);
TTMATH_LOG("UInt::operator+=")
return *this;
}
@ -3527,6 +3722,8 @@ public:
{
Mul(p2);
TTMATH_LOG("UInt::operator*=")
return *this;
}
@ -3545,6 +3742,8 @@ public:
{
Div(p2);
TTMATH_LOG("UInt::operator/=")
return *this;
}
@ -3569,6 +3768,8 @@ public:
operator=(remainder);
TTMATH_LOG("UInt::operator%=")
return *this;
}
@ -3580,6 +3781,8 @@ public:
{
AddOne();
TTMATH_LOG("UInt::operator++")
return *this;
}
@ -3592,6 +3795,8 @@ public:
AddOne();
TTMATH_LOG("UInt::operator++(int)")
return temp;
}
@ -3600,6 +3805,8 @@ public:
{
SubOne();
TTMATH_LOG("UInt::operator--")
return *this;
}
@ -3610,6 +3817,8 @@ public:
SubOne();
TTMATH_LOG("UInt::operator--(int)")
return temp;
}
@ -3660,6 +3869,8 @@ public:
l.FromString(ss);
TTMATH_LOG("UInt::operator>>")
return s;
}

24
ttmath/ttmathuint64.h
View File

@ -81,6 +81,8 @@ namespace ttmath
{
FromUInt(uint(i));
TTMATH_LOG("UInt64::operator=(unsigned int)")
return *this;
}
@ -95,6 +97,8 @@ namespace ttmath
UInt<value_size>::UInt(unsigned int i)
{
FromUInt(uint(i));
TTMATH_LOG("UInt64::UInt(unsigned int)")
}
@ -111,6 +115,8 @@ namespace ttmath
{
FromUInt(uint(i));
TTMATH_LOG("UInt64::operator=(signed int)")
return *this;
}
@ -127,6 +133,8 @@ namespace ttmath
UInt<value_size>::UInt(signed int i)
{
FromUInt(uint(i));
TTMATH_LOG("UInt64::UInt(signed int)")
}
@ -189,6 +197,8 @@ namespace ttmath
// cleaning the rest of the mantissa
for( ; i >= 0 ; --i)
table[i] = 0;
TTMATH_LOG("UInt64::SetFromTable")
}
@ -249,7 +259,7 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::Add")
return c;
}
@ -320,6 +330,7 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::AddInt")
return c;
}
@ -405,7 +416,8 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::AddTwoInts")
return c;
}
@ -467,6 +479,7 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::Sub")
return c;
}
@ -534,7 +547,8 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::SubInt")
return c;
}
@ -592,6 +606,7 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::Rcl2_one")
return c;
}
@ -646,6 +661,7 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::Rcr2_one")
return c;
}
@ -725,6 +741,7 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::Rcl2")
return c;
}
@ -807,6 +824,7 @@ namespace ttmath
#endif
TTMATH_LOG("UInt64::Rcr2")
return c;
}