Added 2 extra macros to handle all the flavours of wxInt64 :(

Did a quick and dirty cut'n'paste to implement wxULongLong and provide wxUint64 on platforms without a suitable native type. Noted it's existance and inappropriate methods in the wxLongLong docs. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-01 03:43:08 +00:00
parent 2b7e44a28c
commit 8e38fd1fb0
4 changed files with 915 additions and 8 deletions
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -62,6 +62,22 @@ void *wxLongLongNative::asArray() const
    return temp;
 }

+void *wxULongLongNative::asArray() const
+{
+    static unsigned char temp[8];
+
+    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 temp;
+}
+
 #endif // wxUSE_LONGLONG_NATIVE

 // ============================================================================
@@ -106,6 +122,14 @@ wxLongLongWx wxLongLongWx::operator<<(int shift) const
    return ll;
 }

+wxULongLongWx wxULongLongWx::operator<<(int shift) const
+{
+    wxULongLongWx ll(*this);
+    ll <<= shift;
+
+    return ll;
+}
+
 wxLongLongWx& wxLongLongWx::operator<<=(int shift)
 {
    if (shift != 0)
@@ -132,6 +156,32 @@ wxLongLongWx& wxLongLongWx::operator<<=(int shift)
    return *this;
 }

+wxULongLongWx& wxULongLongWx::operator<<=(int shift)
+{
+    if (shift != 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
 {
    wxLongLongWx ll(*this);
@@ -140,6 +190,14 @@ wxLongLongWx wxLongLongWx::operator>>(int shift) const
    return ll;
 }

+wxULongLongWx wxULongLongWx::operator>>(int shift) const
+{
+    wxULongLongWx ll(*this);
+    ll >>= shift;
+
+    return ll;
+}
+
 wxLongLongWx& wxLongLongWx::operator>>=(int shift)
 {
    if (shift != 0)
@@ -166,6 +224,32 @@ wxLongLongWx& wxLongLongWx::operator>>=(int shift)
    return *this;
 }

+wxULongLongWx& wxULongLongWx::operator>>=(int shift)
+{
+    if (shift != 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 res(*this);
@@ -174,6 +258,14 @@ wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const
    return res;
 }

+wxULongLongWx wxULongLongWx::operator+(const wxULongLongWx& ll) const
+{
+    wxULongLongWx res(*this);
+    res += ll;
+
+    return res;
+}
+
 wxLongLongWx wxLongLongWx::operator+(long l) const
 {
    wxLongLongWx res(*this);
@@ -182,6 +274,14 @@ wxLongLongWx wxLongLongWx::operator+(long l) const
    return res;
 }

+wxULongLongWx wxULongLongWx::operator+(unsigned long l) const
+{
+    wxULongLongWx res(*this);
+    res += l;
+
+    return res;
+}
+
 wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
 {
    unsigned long previous = m_lo;
@@ -201,6 +301,25 @@ wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
    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;
+}
+
 wxLongLongWx& wxLongLongWx::operator+=(long l)
 {
    unsigned long previous = m_lo;
@@ -221,6 +340,24 @@ wxLongLongWx& wxLongLongWx::operator+=(long l)
    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;
+}
+
 // pre increment
 wxLongLongWx& wxLongLongWx::operator++()
 {
@@ -237,6 +374,21 @@ wxLongLongWx& wxLongLongWx::operator++()
    return *this;
 }

+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
 {
@@ -274,6 +426,14 @@ wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const
    return res;
 }

+wxULongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const
+{
+    wxULongLongWx res(*this);
+    res -= ll;
+
+    return res;
+}
+
 wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
 {
    unsigned long previous = m_lo;
@@ -293,6 +453,25 @@ wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
    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
 wxLongLongWx& wxLongLongWx::operator--()
 {
@@ -309,6 +488,21 @@ wxLongLongWx& wxLongLongWx::operator--()
    return *this;
 }

+wxULongLongWx& wxULongLongWx::operator--()
+{
+    m_lo--;
+    if (m_lo == 0xFFFFFFFF)
+        m_hi--;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll--;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
 // comparison operators

 bool wxLongLongWx::operator<(const wxLongLongWx& ll) const
@@ -321,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 )
@@ -331,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
@@ -338,16 +552,31 @@ 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;
@@ -362,6 +591,20 @@ wxLongLongWx& wxLongLongWx::operator&=(const wxLongLongWx& ll)
    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;
+}
+
 wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll)
 {
    m_lo |= ll.m_lo;
@@ -376,6 +619,20 @@ wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll)
    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;
+}
+
 wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll)
 {
    m_lo ^= ll.m_lo;
@@ -390,11 +647,30 @@ wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll)
    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;
+}
+
 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
@@ -405,6 +681,14 @@ wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const
    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);
@@ -437,6 +721,38 @@ wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll)
    return *this;
 }

+wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
+{
+    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;
+        q >>= 1;
+        t <<= 1;
+        counter++;
+    }
+    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;
+}
+
 // division

 void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
@@ -560,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;
@@ -569,6 +974,15 @@ 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;
@@ -580,6 +994,17 @@ wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
    return *this;
 }

+wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll)
+{
+    wxLongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    *this = quotient;
+
+    return *this;
+}
+
 wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const
 {
    wxLongLongWx quotient, remainder;
@@ -589,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
 // ----------------------------------------------------------------------------
@@ -610,6 +1044,22 @@ void *wxLongLongWx::asArray(void) const
    return temp;
 }

+void *wxULongLongWx::asArray(void) const
+{
+    static unsigned char temp[8];
+
+    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
@@ -649,6 +1099,30 @@ wxLongLongWx::ToString() const
    return result;
 }

+wxString
+#if wxUSE_LONGLONG_NATIVE
+wxULongLongNative::ToString() const
+#else
+wxULongLongWx::ToString() const
+#endif
+{
+    // TODO: this is awfully inefficient, anything better?
+    wxString result;
+
+    wxULongLong ll = *this;
+
+    while ( ll != 0 )
+    {
+        result.Prepend((wxChar)(_T('0') + (ll % 10).ToLong()));
+        ll /= 10;
+    }
+
+    if ( result.empty() )
+        result = _T('0');
+
+    return result;
+}
+
 #if wxUSE_STD_IOSTREAM

 // input/output
@@ -657,6 +1131,11 @@ 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