Changeset 972Tweet

Timestamp:

Sep 22, 2011, 9:15:59 AM (11 years ago)

Author:

sam

Message:

core: fix real unary minus and handle negative numbers in additions.

Location:

trunk

Files:

• src/real.cpp (modified) (4 diffs)
• src/real.h (modified) (1 diff)
• test/unit/real.cpp (modified) (2 diffs)

trunk/src/real.cpp

@@ -54 +54 @@
     uint32_t mantissa = (m_mantissa[0] << 7) | (m_mantissa[1] >> 9);
 
-    int e = (int)(m_signexp & 0x7fffffffu) - (1 << 30) + (1 << 7);
+    int e = (int)exponent - (1 << 30) + (1 << 7);
 
     if (e < 0)
@@ -66 +66 @@
 }
 
-real real::operator -()
-{
-    m_signexp ^= 0x80000000u;
-    return *this;
+real real::operator -() const
+{
+    real ret = *this;
+    ret.m_signexp ^= 0x80000000u;
+    return ret;
 }
 
 real real::operator +(real const &x) const
 {
+    if (x.m_signexp << 1 == 0)
+        return *this;
+
+    /* Ensure *this is the larger exponent, and both arguments are
+     * positive (otherwise, switch signs, or replace + with -). */
     if ((m_signexp << 1) < (x.m_signexp << 1))
         return x + *this;
 
-    if (x.m_signexp << 1 == 0)
-        return *this;
-
-    /* For now, assume both numbers are positive. */
+    if (m_signexp >> 31)
+        return -(-*this + -x);
+
+    if (x.m_signexp >> 31)
+        return *this - x;
+
     real ret;
 
-    int e1 = (m_signexp & 0x7fffffffu) - (1 << 30) + 1;
-    int e2 = (x.m_signexp & 0x7fffffffu) - (1 << 30) + 1;
+    int e1 = m_signexp - (1 << 30) + 1;
+    int e2 = x.m_signexp - (1 << 30) + 1;
 
     int bigoff = (e1 - e2) / (sizeof(uint16_t) * 8);
@@ -92 +100 @@
 
     uint32_t carry = 0;
-    for (int i = 0; i < BIGITS; i++)
-    {
-        carry = m_mantissa[BIGITS - 1 - i];
-        if (BIGITS - 1 - i - bigoff >= 0)
-            carry += x.m_mantissa[BIGITS - 1 - i - bigoff] >> off;
-        else if (BIGITS - 1 - i - bigoff == -1)
+    for (int i = BIGITS; i--; )
+    {
+        carry = m_mantissa[i];
+        if (i - bigoff >= 0)
+            carry += x.m_mantissa[i - bigoff] >> off;
+        else if (i - bigoff == -1)
             carry += 0x0001u >> off;
 
-        if (BIGITS - 1 - i - bigoff - 1 >= 0)
-            carry += (x.m_mantissa[BIGITS - 1 - i - bigoff - 1] << (16 - off)) & 0xffffu;
-        else if (BIGITS - 1 - i - bigoff - 1 == -1)
+        if (i - bigoff > 0)
+            carry += (x.m_mantissa[i - bigoff - 1] << (16 - off)) & 0xffffu;
+        else if (i - bigoff == 0)
             carry += 0x0001u << (16 - off);
 
-        ret.m_mantissa[BIGITS - 1 - i] = carry;
+        ret.m_mantissa[i] = carry;
         carry >>= 16;
     }
@@ -125 +133 @@
 }
 
+real real::operator -(real const &x) const
+{
+    if (x.m_signexp << 1 == 0)
+        return *this;
+
+    /* Ensure *this is the larger exponent, and both arguments are
+     * positive (otherwise, switch signs, or replace - with +). */
+    if ((m_signexp << 1) < (x.m_signexp << 1))
+        return -(x - *this);
+
+    if (m_signexp >> 31)
+        return -(-*this + x);
+
+    if (x.m_signexp >> 31)
+        return (*this) + (-x);
+
+    real ret;
+
+    return ret;
+}
+
 real real::operator *(real const &x) const
 {

trunk/src/real.h

@@ -31 +31 @@
 
     operator float() const;
-    real operator -();
+    real operator -() const;
     real operator +(real const &x) const;
+    real operator -(real const &x) const;
     real operator *(real const &x) const;
 

trunk/test/unit/real.cpp

@@ -23 +23 @@
 LOLUNIT_FIXTURE(RealTest)
 {
-public:
     LOLUNIT_TEST(test_real_from_float)
     {
@@ -54 +53 @@
     LOLUNIT_TEST(test_real_add)
     {
+        float a1 = real(1.0f) + real(0.0f);
+        float a2 = real(0.0f) + real(1.0f);
+        float a3 = real(1.0f) + real(1.0f);
+        float a4 = real(-1.0f) + real(-1.0f);
+        float a5 = real(1.0f) + real(0.125f);
+
+        LOLUNIT_ASSERT_EQUAL(a1, 1.0f);
+        LOLUNIT_ASSERT_EQUAL(a2, 1.0f);
+        LOLUNIT_ASSERT_EQUAL(a3, 2.0f);
+        LOLUNIT_ASSERT_EQUAL(a4, -2.0f);
+        LOLUNIT_ASSERT_EQUAL(a5, 1.125f);
+    }
+
+    LOLUNIT_TEST(test_real_sub)
+    {
+#if 0
+printf("\n");
+real k(1.25f);
+k.print();
+real l(1.0f);
+l.print();
+real m = k - l;
+m.print();
+#endif
         LOLUNIT_ASSERT(true);
     }