applied (slightly modified) wxGLApp patch for MSW

[wxWidgets.git] / src / common / longlong.cpp

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 0792e84902c663f7fa8b289710a72c5de500f01f..ba47b870f989fdabf4a8620f871acba5031daa3e 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -26,7 +26,6 @@
 #endif
 
 #if wxUSE_LONGLONG
 #endif
 
 #if wxUSE_LONGLONG

-

 #include "wx/longlong.h"
 
 #include <memory.h>     // for memset()
 #include "wx/longlong.h"
 
 #include <memory.h>     // for memset()


@@ -42,7 +41,7 @@
 // misc
 // ----------------------------------------------------------------------------
 
 // misc
 // ----------------------------------------------------------------------------
 

-void *wxLongLongNative::asArray(void) const
+void *wxLongLongNative::asArray() const

 {
     static unsigned char temp[8];
 
 {
     static unsigned char temp[8];
 


@@ -58,27 +57,6 @@ void *wxLongLongNative::asArray(void) const
     return temp;
 }
 
     return temp;
 }
 

-#if wxUSE_STD_IOSTREAM
-
-// input/output
-ostream& operator<< (ostream& o, const wxLongLongNative& ll)
-{
-    char result[65];
-
-    memset(result, 'A', 64);
-
-    result[64] = '\0';
-
-    for (int i = 0; i < 64; i++)
-    {
-        result[63 - i] = '0' + (char) ((ll.m_ll >> i) & 1);
-    }
-
-    return o << result;
-}
-
-#endif // wxUSE_STD_IOSTREAM
-

 #endif // wxUSE_LONGLONG_NATIVE
 
 // ============================================================================
 #endif // wxUSE_LONGLONG_NATIVE
 
 // ============================================================================


@@ -90,110 +68,113 @@ ostream& operator<< (ostream& o, const wxLongLongNative& ll)
 // assignment
 wxLongLongWx& wxLongLongWx::Assign(double d)
 {
 // 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
     {
         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
 {
     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)
 {
 }
 
 wxLongLongWx& wxLongLongWx::operator<<=(int shift)
 {

-    if (shift == 0)
-        return *this;
-
-    if (shift < 32)
+    if (shift != 0)

     {
     {

-        m_hi <<= shift;
-        m_hi |= m_lo >> (32 - shift);
-        m_lo <<= shift;
-    }
-    else
-    {
-        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
 {
     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)
 {
 }
 
 wxLongLongWx& wxLongLongWx::operator>>=(int shift)
 {

-    if (shift == 0)
-        return *this;
-
-    if (shift < 32)
+    if (shift != 0)

     {
     {

-        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);
+        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);
+        }

     }
 
     }
 

+#ifdef wxLONGLONG_TEST_MODE
+    m_ll >>= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+

     return *this;
 }
 
 wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const
 {
     return *this;
 }
 
 wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const
 {

-    wxLongLongWx temp;
-
-    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++;
+    wxLongLongWx res(*this);
+    res += ll;

 
 

-    return temp;
+    return res;

 }
 
 wxLongLongWx wxLongLongWx::operator+(long l) const
 {
 }
 
 wxLongLongWx wxLongLongWx::operator+(long l) const
 {

-    wxLongLongWx temp;
-
-    temp.m_lo = m_lo + l;
-
-    if (l < 0)
-        temp.m_hi += -1l;
-
-    if ((temp.m_lo < m_lo) || (temp.m_lo < (unsigned long)l))
-        temp.m_hi++;
+    wxLongLongWx res(*this);
+    res += l;

 
 

-    return temp;
+    return res;

 }
 
 wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
 }
 
 wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)


@@ -206,6 +187,12 @@ wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
     if ((m_lo < previous) || (m_lo < ll.m_lo))
         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;
 }
 
     return *this;
 }
 


@@ -220,6 +207,12 @@ wxLongLongWx& wxLongLongWx::operator+=(long l)
     if ((m_lo < previous) || (m_lo < (unsigned long)l))
         m_hi++;
 
     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;
 }
 
     return *this;
 }
 


@@ -230,15 +223,11 @@ wxLongLongWx& wxLongLongWx::operator++()
     if (m_lo == 0)
         m_hi++;
 
     if (m_lo == 0)
         m_hi++;
 

-    return *this;
-}
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll++;

 
 

-// post increment
-wxLongLongWx& wxLongLongWx::operator++(int)
-{
-    m_lo++;
-    if (m_lo == 0)
-        m_hi++;
+    Check();
+#endif // wxLONGLONG_TEST_MODE

 
     return *this;
 }
 
     return *this;
 }


@@ -246,28 +235,38 @@ wxLongLongWx& wxLongLongWx::operator++(int)
 // negation
 wxLongLongWx wxLongLongWx::operator-() const
 {
 // negation
 wxLongLongWx wxLongLongWx::operator-() const
 {

-    wxLongLongWx temp(~m_hi, ~m_lo);
+    wxLongLongWx res(*this);
+    res.Negate();
+
+    return res;
+}
+
+wxLongLongWx& wxLongLongWx::Negate()
+{
+    m_hi = ~m_hi;
+    m_lo = ~m_lo;
+
+    m_lo++;
+    if ( m_lo == 0 )
+        m_hi++;

 
 

-    temp.m_lo++;
-    if (temp.m_lo == 0)
-        temp.m_hi++;
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = -m_ll;

 
 

-    return temp;
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;

 }
 
 // subtraction
 
 wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const
 {
 }
 
 // subtraction
 
 wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const
 {

-    wxLongLongWx temp;
-
-    temp.m_lo = m_lo - ll.m_lo;
-    temp.m_hi = m_hi - ll.m_hi;
+    wxLongLongWx res(*this);
+    res -= ll;

 
 

-    if (m_lo < ll.m_lo)
-        temp.m_hi--;
-
-    return temp;
+    return res;

 }
 
 wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
 }
 
 wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)


@@ -280,7 +279,13 @@ wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
     if (previous < ll.m_lo)
         m_hi--;
 
     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;

 }
 
 // pre decrement
 }
 
 // pre decrement


@@ -290,15 +295,11 @@ wxLongLongWx& wxLongLongWx::operator--()
     if (m_lo == 0xFFFFFFFF)
         m_hi--;
 
     if (m_lo == 0xFFFFFFFF)
         m_hi--;
 

-    return *this;
-}
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll--;

 
 

-// post decrement
-wxLongLongWx& wxLongLongWx::operator--(int)
-{
-    m_lo--;
-    if (m_lo == 0xFFFFFFFF)
-        m_hi--;
+    Check();
+#endif // wxLONGLONG_TEST_MODE

 
     return *this;
 }
 
     return *this;
 }


@@ -347,6 +348,12 @@ wxLongLongWx& wxLongLongWx::operator&=(const wxLongLongWx& ll)
     m_lo &= ll.m_lo;
     m_hi &= ll.m_hi;
 
     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;
 }
 
     return *this;
 }
 


@@ -355,6 +362,12 @@ wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll)
     m_lo |= ll.m_lo;
     m_hi |= ll.m_hi;
 
     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;
 }
 
     return *this;
 }
 


@@ -363,6 +376,12 @@ wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll)
     m_lo ^= ll.m_lo;
     m_hi ^= ll.m_hi;
 
     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;
 }
 
     return *this;
 }
 


@@ -375,38 +394,41 @@ wxLongLongWx wxLongLongWx::operator~() const
 
 wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const
 {
 
 wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const
 {

-    wxLongLongWx t(m_hi, m_lo);
-    wxLongLongWx q(ll.m_hi, ll.m_lo);
-    wxLongLongWx p;
-    int counter = 0;
+    wxLongLongWx res(*this);
+    res *= ll;

 
 

-    do
-    {
-        if ((q.m_lo & 1) != 0)
-              p += t;
-        q >>= 1;
-        t <<= 1;
-        counter++;
-      }
-      while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
-    return p;
+    return res;

 }
 
 wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll)
 {
     wxLongLongWx t(m_hi, m_lo);
     wxLongLongWx q(ll.m_hi, ll.m_lo);
 }
 
 wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll)
 {
     wxLongLongWx t(m_hi, m_lo);
     wxLongLongWx q(ll.m_hi, ll.m_lo);

-    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)
     do
     {
         if ((q.m_lo & 1) != 0)

-              *this += t;
+            *this += t;

         q >>= 1;
         t <<= 1;
         counter++;
         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;
 }
 
     return *this;
 }
 


@@ -435,7 +457,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
     //     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,
 
     // init everything
     wxLongLongWx dividend = *this,


@@ -444,21 +466,6 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     quotient = 0l;
     remainder = 0l;
 
     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
     // 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 +487,59 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
         divisor = -divisor;
     }
 
         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;
+            }

         }
     }
 
         }
     }
 


@@ -551,7 +570,9 @@ wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
 
     Divide(ll, quotient, remainder);
 
 
     Divide(ll, quotient, remainder);
 

-    return *this = quotient;
+    *this = quotient;
+
+    return *this;

 }
 
 wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const
 }
 
 wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const


@@ -572,39 +593,65 @@ void *wxLongLongWx::asArray(void) const
 {
     static unsigned char temp[8];
 
 {
     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;
 }
 
 
     return temp;
 }
 

-#if wxUSE_STD_IOSTREAM
+#endif // wxUSE_LONGLONG_WX

 
 

-// input/output
-ostream& operator<< (ostream& o, const wxLongLongWx& ll)
+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;

 
 

-    memset(result, 'A', 64);
+    wxLongLong ll = *this;

 
 

-    result[64] = '\0';
+    bool neg;
+    if ( ll < 0 )
+    {
+        ll.Negate();
+        neg = TRUE;
+    }
+    else
+    {
+        neg = FALSE;
+    }

 
 

-    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).ToLong()));
+        ll /= 10;

     }
 
     }
 

-    return o << result;
+    if ( result.empty() )
+        result = _T('0');
+    else if ( neg )
+        result.Prepend(_T('-'));
+
+    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();
+}
+
+#endif // wxUSE_STD_IOSTREAM

 
 #endif // wxUSE_LONGLONG
 
 #endif // wxUSE_LONGLONG