X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41acf5c0bd373d2dbe127fc6a64ac03b672b2431..9b69526274b023fa1460b29a92bea8bf82e4703f:/src/common/longlong.cpp?ds=sidebyside diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp index 0792e84902..a76f895033 100644 --- a/src/common/longlong.cpp +++ b/src/common/longlong.cpp @@ -26,10 +26,14 @@ #endif #if wxUSE_LONGLONG - #include "wx/longlong.h" +#if defined(__MWERKS__) && defined(__WXMSW__) +#include // for memset() +#else #include // for memset() +#endif + #include // for fabs() // ============================================================================ @@ -42,7 +46,7 @@ // misc // ---------------------------------------------------------------------------- -void *wxLongLongNative::asArray(void) const +void *wxLongLongNative::asArray() const { static unsigned char temp[8]; @@ -58,27 +62,22 @@ void *wxLongLongNative::asArray(void) const return temp; } -#if wxUSE_STD_IOSTREAM - -// input/output -ostream& operator<< (ostream& o, const wxLongLongNative& ll) +void *wxULongLongNative::asArray() const { - char result[65]; - - memset(result, 'A', 64); - - result[64] = '\0'; + static unsigned char temp[8]; - for (int i = 0; i < 64; i++) - { - result[63 - i] = '0' + (char) ((ll.m_ll >> i) & 1); - } + temp[0] = (m_ll >> 56) & 0xFF; + temp[1] = (m_ll >> 48) & 0xFF; + temp[2] = (m_ll >> 40) & 0xFF; + temp[3] = (m_ll >> 32) & 0xFF; + temp[4] = (m_ll >> 24) & 0xFF; + temp[5] = (m_ll >> 16) & 0xFF; + temp[6] = (m_ll >> 8) & 0xFF; + temp[7] = (m_ll >> 0) & 0xFF; - return o << result; + return temp; } -#endif // wxUSE_STD_IOSTREAM - #endif // wxUSE_LONGLONG_NATIVE // ============================================================================ @@ -90,110 +89,197 @@ ostream& operator<< (ostream& o, const wxLongLongNative& ll) // assignment wxLongLongWx& wxLongLongWx::Assign(double d) { - if ( fabs(d) <= LONG_MAX ) + bool positive = d >= 0; + d = fabs(d); + if ( d <= ULONG_MAX ) { - m_hi = d < 0 ? 1 << (8*sizeof(long) - 1) : 0l; + m_hi = 0; m_lo = (long)d; } else { - wxFAIL_MSG(_T("TODO")); + m_hi = (unsigned long)(d / (1.0 + (double)ULONG_MAX)); + m_lo = (unsigned long)(d - ((double)m_hi * (1.0 + (double)ULONG_MAX))); } +#ifdef wxLONGLONG_TEST_MODE + m_ll = (wxLongLong_t)d; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + if ( !positive ) + Negate(); + return *this; } wxLongLongWx wxLongLongWx::operator<<(int shift) const { - if (shift == 0) - return *this; + wxLongLongWx ll(*this); + ll <<= shift; - if (shift < 32) - return wxLongLongWx((m_hi << shift) | (m_lo >> (32 - shift)), - m_lo << shift); - else - return wxLongLongWx(m_lo << (shift - 32), - 0); + return ll; } -wxLongLongWx& wxLongLongWx::operator<<=(int shift) +wxULongLongWx wxULongLongWx::operator<<(int shift) const { - if (shift == 0) - return *this; + wxULongLongWx ll(*this); + ll <<= shift; + + return ll; +} - if (shift < 32) +wxLongLongWx& wxLongLongWx::operator<<=(int shift) +{ + if (shift != 0) { - m_hi <<= shift; - m_hi |= m_lo >> (32 - shift); - m_lo <<= shift; + if (shift < 32) + { + m_hi <<= shift; + m_hi |= m_lo >> (32 - shift); + m_lo <<= shift; + } + else + { + m_hi = m_lo << (shift - 32); + m_lo = 0; + } } - else + +#ifdef wxLONGLONG_TEST_MODE + m_ll <<= shift; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator<<=(int shift) +{ + if (shift != 0) { - m_hi = m_lo << (shift - 32); - m_lo = 0; + if (shift < 32) + { + m_hi <<= shift; + m_hi |= m_lo >> (32 - shift); + m_lo <<= shift; + } + else + { + m_hi = m_lo << (shift - 32); + m_lo = 0; + } } +#ifdef wxLONGLONG_TEST_MODE + m_ll <<= shift; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } wxLongLongWx wxLongLongWx::operator>>(int shift) const { - if (shift == 0) - return *this; + wxLongLongWx ll(*this); + ll >>= shift; - if (shift < 32) - return wxLongLongWx(m_hi >> shift, - (m_lo >> shift) | (m_hi << (32 - shift))); - else - return wxLongLongWx((m_hi < 0 ? -1l : 0), - m_hi >> (shift - 32)); + return ll; } -wxLongLongWx& wxLongLongWx::operator>>=(int shift) +wxULongLongWx wxULongLongWx::operator>>(int shift) const { - if (shift == 0) - return *this; + wxULongLongWx ll(*this); + ll >>= shift; + + return ll; +} - if (shift < 32) +wxLongLongWx& wxLongLongWx::operator>>=(int shift) +{ + if (shift != 0) { - m_lo >>= shift; - m_lo |= m_hi << (32 - shift); - m_hi >>= shift; + if (shift < 32) + { + m_lo >>= shift; + m_lo |= m_hi << (32 - shift); + m_hi >>= shift; + } + else + { + m_lo = m_hi >> (shift - 32); + m_hi = (m_hi < 0 ? -1L : 0); + } } - else + +#ifdef wxLONGLONG_TEST_MODE + m_ll >>= shift; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator>>=(int shift) +{ + if (shift != 0) { - m_lo = m_hi >> (shift - 32); - m_hi = (m_hi < 0 ? -1L : 0); + if (shift < 32) + { + m_lo >>= shift; + m_lo |= m_hi << (32 - shift); + m_hi >>= shift; + } + else + { + m_lo = m_hi >> (shift - 32); + m_hi = 0; + } } +#ifdef wxLONGLONG_TEST_MODE + m_ll >>= shift; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const { - wxLongLongWx temp; + wxLongLongWx res(*this); + res += ll; - temp.m_lo = m_lo + ll.m_lo; - temp.m_hi = m_hi + ll.m_hi; - if ((temp.m_lo < m_lo) || (temp.m_lo < ll.m_lo)) - temp.m_hi++; + return res; +} - return temp; +wxULongLongWx wxULongLongWx::operator+(const wxULongLongWx& ll) const +{ + wxULongLongWx res(*this); + res += ll; + + return res; } wxLongLongWx wxLongLongWx::operator+(long l) const { - wxLongLongWx temp; - - temp.m_lo = m_lo + l; + wxLongLongWx res(*this); + res += l; - if (l < 0) - temp.m_hi += -1l; + return res; +} - if ((temp.m_lo < m_lo) || (temp.m_lo < (unsigned long)l)) - temp.m_hi++; +wxULongLongWx wxULongLongWx::operator+(unsigned long l) const +{ + wxULongLongWx res(*this); + res += l; - return temp; + return res; } wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll) @@ -206,6 +292,31 @@ wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll) if ((m_lo < previous) || (m_lo < ll.m_lo)) m_hi++; +#ifdef wxLONGLONG_TEST_MODE + m_ll += ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator+=(const wxULongLongWx& ll) +{ + unsigned long previous = m_lo; + + m_lo += ll.m_lo; + m_hi += ll.m_hi; + + if ((m_lo < previous) || (m_lo < ll.m_lo)) + m_hi++; + +#ifdef wxLONGLONG_TEST_MODE + m_ll += ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } @@ -220,6 +331,30 @@ wxLongLongWx& wxLongLongWx::operator+=(long l) if ((m_lo < previous) || (m_lo < (unsigned long)l)) m_hi++; +#ifdef wxLONGLONG_TEST_MODE + m_ll += l; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator+=(unsigned long l) +{ + unsigned long previous = m_lo; + + m_lo += l; + + if ((m_lo < previous) || (m_lo < l)) + m_hi++; + +#ifdef wxLONGLONG_TEST_MODE + m_ll += l; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } @@ -230,44 +365,73 @@ wxLongLongWx& wxLongLongWx::operator++() if (m_lo == 0) m_hi++; +#ifdef wxLONGLONG_TEST_MODE + m_ll++; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } -// post increment -wxLongLongWx& wxLongLongWx::operator++(int) +wxULongLongWx& wxULongLongWx::operator++() { m_lo++; if (m_lo == 0) m_hi++; +#ifdef wxLONGLONG_TEST_MODE + m_ll++; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } // negation wxLongLongWx wxLongLongWx::operator-() const { - wxLongLongWx temp(~m_hi, ~m_lo); + wxLongLongWx res(*this); + res.Negate(); - temp.m_lo++; - if (temp.m_lo == 0) - temp.m_hi++; + return res; +} - return temp; +wxLongLongWx& wxLongLongWx::Negate() +{ + m_hi = ~m_hi; + m_lo = ~m_lo; + + m_lo++; + if ( m_lo == 0 ) + m_hi++; + +#ifdef wxLONGLONG_TEST_MODE + m_ll = -m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; } // subtraction wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const { - wxLongLongWx temp; + wxLongLongWx res(*this); + res -= ll; - temp.m_lo = m_lo - ll.m_lo; - temp.m_hi = m_hi - ll.m_hi; + return res; +} - if (m_lo < ll.m_lo) - temp.m_hi--; +wxULongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const +{ + wxULongLongWx res(*this); + res -= ll; - return temp; + return res; } wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll) @@ -280,7 +444,32 @@ wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll) if (previous < ll.m_lo) m_hi--; - return *this;; +#ifdef wxLONGLONG_TEST_MODE + m_ll -= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator-=(const wxULongLongWx& ll) +{ + unsigned long previous = m_lo; + + m_lo -= ll.m_lo; + m_hi -= ll.m_hi; + + if (previous < ll.m_lo) + m_hi--; + +#ifdef wxLONGLONG_TEST_MODE + m_ll -= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; } // pre decrement @@ -290,16 +479,27 @@ wxLongLongWx& wxLongLongWx::operator--() if (m_lo == 0xFFFFFFFF) m_hi--; +#ifdef wxLONGLONG_TEST_MODE + m_ll--; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } -// post decrement -wxLongLongWx& wxLongLongWx::operator--(int) +wxULongLongWx& wxULongLongWx::operator--() { m_lo--; if (m_lo == 0xFFFFFFFF) m_hi--; +#ifdef wxLONGLONG_TEST_MODE + m_ll--; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } @@ -315,6 +515,16 @@ bool wxLongLongWx::operator<(const wxLongLongWx& ll) const return FALSE; } +bool wxULongLongWx::operator<(const wxULongLongWx& ll) const +{ + if ( m_hi < ll.m_hi ) + return TRUE; + else if ( m_hi == ll.m_hi ) + return m_lo < ll.m_lo; + else + return FALSE; +} + bool wxLongLongWx::operator>(const wxLongLongWx& ll) const { if ( m_hi > ll.m_hi ) @@ -325,6 +535,16 @@ bool wxLongLongWx::operator>(const wxLongLongWx& ll) const return FALSE; } +bool wxULongLongWx::operator>(const wxULongLongWx& ll) const +{ + if ( m_hi > ll.m_hi ) + return TRUE; + else if ( m_hi == ll.m_hi ) + return m_lo > ll.m_lo; + else + return FALSE; +} + // bitwise operators wxLongLongWx wxLongLongWx::operator&(const wxLongLongWx& ll) const @@ -332,21 +552,56 @@ wxLongLongWx wxLongLongWx::operator&(const wxLongLongWx& ll) const return wxLongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo); } +wxULongLongWx wxULongLongWx::operator&(const wxULongLongWx& ll) const +{ + return wxULongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo); +} + wxLongLongWx wxLongLongWx::operator|(const wxLongLongWx& ll) const { return wxLongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo); } +wxULongLongWx wxULongLongWx::operator|(const wxULongLongWx& ll) const +{ + return wxULongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo); +} + wxLongLongWx wxLongLongWx::operator^(const wxLongLongWx& ll) const { return wxLongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo); } +wxULongLongWx wxULongLongWx::operator^(const wxULongLongWx& ll) const +{ + return wxULongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo); +} + wxLongLongWx& wxLongLongWx::operator&=(const wxLongLongWx& ll) { m_lo &= ll.m_lo; m_hi &= ll.m_hi; +#ifdef wxLONGLONG_TEST_MODE + m_ll &= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator&=(const wxULongLongWx& ll) +{ + m_lo &= ll.m_lo; + m_hi &= ll.m_hi; + +#ifdef wxLONGLONG_TEST_MODE + m_ll &= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } @@ -355,6 +610,26 @@ wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll) m_lo |= ll.m_lo; m_hi |= ll.m_hi; +#ifdef wxLONGLONG_TEST_MODE + m_ll |= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator|=(const wxULongLongWx& ll) +{ + m_lo |= ll.m_lo; + m_hi |= ll.m_hi; + +#ifdef wxLONGLONG_TEST_MODE + m_ll |= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } @@ -363,6 +638,26 @@ wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll) m_lo ^= ll.m_lo; m_hi ^= ll.m_hi; +#ifdef wxLONGLONG_TEST_MODE + m_ll ^= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator^=(const wxULongLongWx& ll) +{ + m_lo ^= ll.m_lo; + m_hi ^= ll.m_hi; + +#ifdef wxLONGLONG_TEST_MODE + m_ll ^= ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } @@ -371,42 +666,90 @@ wxLongLongWx wxLongLongWx::operator~() const return wxLongLongWx(~m_hi, ~m_lo); } +wxULongLongWx wxULongLongWx::operator~() const +{ + return wxULongLongWx(~m_hi, ~m_lo); +} + // multiplication wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const +{ + wxLongLongWx res(*this); + res *= ll; + + return res; +} + +wxULongLongWx wxULongLongWx::operator*(const wxULongLongWx& ll) const +{ + wxULongLongWx res(*this); + res *= ll; + + return res; +} + +wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll) { wxLongLongWx t(m_hi, m_lo); wxLongLongWx q(ll.m_hi, ll.m_lo); - wxLongLongWx p; - int counter = 0; + m_hi = m_lo = 0; + +#ifdef wxLONGLONG_TEST_MODE + wxLongLong_t llOld = m_ll; + m_ll = 0; +#endif // wxLONGLONG_TEST_MODE + + int counter = 0; do { if ((q.m_lo & 1) != 0) - p += t; + *this += t; q >>= 1; t <<= 1; counter++; - } - while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0))); - return p; + } + while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0))); + +#ifdef wxLONGLONG_TEST_MODE + m_ll = llOld * ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; } -wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll) +wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll) { - wxLongLongWx t(m_hi, m_lo); - wxLongLongWx q(ll.m_hi, ll.m_lo); - int counter = 0; + wxULongLongWx t(m_hi, m_lo); + wxULongLongWx q(ll.m_hi, ll.m_lo); + m_hi = m_lo = 0; + +#ifdef wxLONGLONG_TEST_MODE + unsigned wxLongLong_t llOld = m_ll; + m_ll = 0; +#endif // wxLONGLONG_TEST_MODE + + int counter = 0; do { if ((q.m_lo & 1) != 0) - *this += t; + *this += t; q >>= 1; t <<= 1; counter++; - } - while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0))); + } + while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0))); + +#ifdef wxLONGLONG_TEST_MODE + m_ll = llOld * ll.m_ll; + + Check(); +#endif // wxLONGLONG_TEST_MODE + return *this; } @@ -435,7 +778,7 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn, // Use of this program, for any purpose, is granted the author, Ian // Kaplan, as long as this copyright notice is included in the source // code or any source code derived from this program. The user assumes - // all responsibility for using this code. + // all responsibility for using this code. // init everything wxLongLongWx dividend = *this, @@ -444,21 +787,6 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn, quotient = 0l; remainder = 0l; - // check for some particular cases - if ( divisor > dividend ) - { - remainder = dividend; - - return; - } - - if ( divisor == dividend ) - { - quotient = 1l; - - return; - } - // always do unsigned division and adjust the signs later: in C integer // division, the sign of the remainder is the same as the sign of the // dividend, while the sign of the quotient is the product of the signs of @@ -480,47 +808,59 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn, divisor = -divisor; } - // here: dividend > divisor and both are positibe: do unsigned division - size_t nBits = 64u; - wxLongLongWx d; - - #define IS_MSB_SET(ll) ((ll.m_hi) & (1 << (8*sizeof(long) - 1))) - - while ( remainder < divisor ) + // check for some particular cases + if ( divisor > dividend ) { - remainder <<= 1; - if ( IS_MSB_SET(dividend) ) - { - remainder |= 1; - } - - d = dividend; - dividend <<= 1; - - nBits--; + remainder = dividend; + } + else if ( divisor == dividend ) + { + quotient = 1l; } + else + { + // here: dividend > divisor and both are positibe: do unsigned division + size_t nBits = 64u; + wxLongLongWx d; - // undo the last loop iteration - dividend = d; - remainder >>= 1; - nBits++; + #define IS_MSB_SET(ll) ((ll.m_hi) & (1 << (8*sizeof(long) - 1))) - for ( size_t i = 0; i < nBits; i++ ) - { - remainder <<= 1; - if ( IS_MSB_SET(dividend) ) + while ( remainder < divisor ) { - remainder |= 1; + remainder <<= 1; + if ( IS_MSB_SET(dividend) ) + { + remainder |= 1; + } + + d = dividend; + dividend <<= 1; + + nBits--; } - wxLongLongWx t = remainder - divisor; - dividend <<= 1; - quotient <<= 1; - if ( !IS_MSB_SET(t) ) - { - quotient |= 1; + // undo the last loop iteration + dividend = d; + remainder >>= 1; + nBits++; - remainder = t; + for ( size_t i = 0; i < nBits; i++ ) + { + remainder <<= 1; + if ( IS_MSB_SET(dividend) ) + { + remainder |= 1; + } + + wxLongLongWx t = remainder - divisor; + dividend <<= 1; + quotient <<= 1; + if ( !IS_MSB_SET(t) ) + { + quotient |= 1; + + remainder = t; + } } } @@ -536,6 +876,95 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn, } } +void wxULongLongWx::Divide(const wxULongLongWx& divisorIn, + wxULongLongWx& quotient, + wxULongLongWx& remainder) const +{ + if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0)) + { + // provoke division by zero error and silence the compilers warnings + // about an expression without effect and unused variable + unsigned long dummy = divisorIn.m_lo/divisorIn.m_hi; + dummy += 0; + } + + // VZ: I'm writing this in a hurry and it's surely not the fastest way to + // do this - any improvements are more than welcome + // + // code inspired by the snippet at + // http://www.bearcave.com/software/divide.htm + // + // Copyright notice: + // + // Use of this program, for any purpose, is granted the author, Ian + // Kaplan, as long as this copyright notice is included in the source + // code or any source code derived from this program. The user assumes + // all responsibility for using this code. + + // init everything + wxULongLongWx dividend = *this, + divisor = divisorIn; + + quotient = 0l; + remainder = 0l; + + // check for some particular cases + if ( divisor > dividend ) + { + remainder = dividend; + } + else if ( divisor == dividend ) + { + quotient = 1l; + } + else + { + // here: dividend > divisor + size_t nBits = 64u; + wxULongLongWx d; + + #define IS_MSB_SET(ll) ((ll.m_hi) & (1 << (8*sizeof(long) - 1))) + + while ( remainder < divisor ) + { + remainder <<= 1; + if ( IS_MSB_SET(dividend) ) + { + remainder |= 1; + } + + d = dividend; + dividend <<= 1; + + nBits--; + } + + // undo the last loop iteration + dividend = d; + remainder >>= 1; + nBits++; + + for ( size_t i = 0; i < nBits; i++ ) + { + remainder <<= 1; + if ( IS_MSB_SET(dividend) ) + { + remainder |= 1; + } + + wxULongLongWx t = remainder - divisor; + dividend <<= 1; + quotient <<= 1; + if ( !IS_MSB_SET(t) ) + { + quotient |= 1; + + remainder = t; + } + } + } +} + wxLongLongWx wxLongLongWx::operator/(const wxLongLongWx& ll) const { wxLongLongWx quotient, remainder; @@ -545,13 +974,35 @@ wxLongLongWx wxLongLongWx::operator/(const wxLongLongWx& ll) const return quotient; } +wxULongLongWx wxULongLongWx::operator/(const wxULongLongWx& ll) const +{ + wxULongLongWx quotient, remainder; + + Divide(ll, quotient, remainder); + + return quotient; +} + wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll) { wxLongLongWx quotient, remainder; Divide(ll, quotient, remainder); - return *this = quotient; + *this = quotient; + + return *this; +} + +wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll) +{ + wxULongLongWx quotient, remainder; + + Divide(ll, quotient, remainder); + + *this = quotient; + + return *this; } wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const @@ -563,6 +1014,15 @@ wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const return remainder; } +wxULongLongWx wxULongLongWx::operator%(const wxULongLongWx& ll) const +{ + wxULongLongWx quotient, remainder; + + Divide(ll, quotient, remainder); + + return remainder; +} + // ---------------------------------------------------------------------------- // misc // ---------------------------------------------------------------------------- @@ -572,39 +1032,110 @@ void *wxLongLongWx::asArray(void) const { static unsigned char temp[8]; - temp[0] = (m_hi >> 24) & 0xFF; - temp[1] = (m_hi >> 16) & 0xFF; - temp[2] = (m_hi >> 8) & 0xFF; - temp[3] = (m_hi >> 0) & 0xFF; - temp[4] = (m_lo >> 24) & 0xFF; - temp[5] = (m_lo >> 16) & 0xFF; - temp[6] = (m_lo >> 8) & 0xFF; - temp[7] = (m_lo >> 0) & 0xFF; + temp[0] = (char)((m_hi >> 24) & 0xFF); + temp[1] = (char)((m_hi >> 16) & 0xFF); + temp[2] = (char)((m_hi >> 8) & 0xFF); + temp[3] = (char)((m_hi >> 0) & 0xFF); + temp[4] = (char)((m_lo >> 24) & 0xFF); + temp[5] = (char)((m_lo >> 16) & 0xFF); + temp[6] = (char)((m_lo >> 8) & 0xFF); + temp[7] = (char)((m_lo >> 0) & 0xFF); return temp; } -#if wxUSE_STD_IOSTREAM +void *wxULongLongWx::asArray(void) const +{ + static unsigned char temp[8]; -// input/output -ostream& operator<< (ostream& o, const wxLongLongWx& ll) + temp[0] = (char)((m_hi >> 24) & 0xFF); + temp[1] = (char)((m_hi >> 16) & 0xFF); + temp[2] = (char)((m_hi >> 8) & 0xFF); + temp[3] = (char)((m_hi >> 0) & 0xFF); + temp[4] = (char)((m_lo >> 24) & 0xFF); + temp[5] = (char)((m_lo >> 16) & 0xFF); + temp[6] = (char)((m_lo >> 8) & 0xFF); + temp[7] = (char)((m_lo >> 0) & 0xFF); + + return temp; +} + +#endif // wxUSE_LONGLONG_WX + +wxString +#if wxUSE_LONGLONG_NATIVE +wxLongLongNative::ToString() const +#else +wxLongLongWx::ToString() const +#endif { - char result[65]; + // TODO: this is awfully inefficient, anything better? + wxString result; + + wxLongLong ll = *this; + + bool neg; + if ( ll < 0 ) + { + ll.Negate(); + neg = TRUE; + } + else + { + neg = FALSE; + } + + while ( ll != 0 ) + { + result.Prepend((wxChar)(_T('0') + (ll % 10).ToLong())); + ll /= 10; + } + + if ( result.empty() ) + result = _T('0'); + else if ( neg ) + result.Prepend(_T('-')); - memset(result, 'A', 64); + return result; +} + +wxString +#if wxUSE_LONGLONG_NATIVE +wxULongLongNative::ToString() const +#else +wxULongLongWx::ToString() const +#endif +{ + // TODO: this is awfully inefficient, anything better? + wxString result; - result[64] = '\0'; + wxULongLong ll = *this; - for (int i = 0; i < 32; i++) + while ( ll != 0 ) { - result[31 - i] = (char) ('0' + (int) ((ll.m_hi >> i) & 1)); - result[63 - i] = (char) ('0' + (int) ((ll.m_lo >> i) & 1)); + result.Prepend((wxChar)(_T('0') + (ll % 10).ToULong())); + ll /= 10; } - return o << result; + if ( result.empty() ) + result = _T('0'); + + return result; } -#endif // wxUSE_STD_IOSTREAM -#endif // wxUSE_LONGLONG_NATIVE +#if wxUSE_STD_IOSTREAM + +// input/output +wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll) +{ + return o << ll.ToString(); +} + +wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll) +{ + return o << ll.ToString(); +} + +#endif // wxUSE_STD_IOSTREAM #endif // wxUSE_LONGLONG