Changeset 970Tweet

Timestamp:

Sep 21, 2011, 7:10:31 PM (11 years ago)

Author:

sam

Message:

core: start working on the extended floating point addition.

Location:

trunk

Files:

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

trunk/src/real.cpp

@@ -46 +46 @@
 
     return u.f;
+}
+
+real real::operator -()
+{
+    m_signexp ^= 0x80000000u;
+    return *this;
+}
+
+real real::operator +(real const &x) const
+{
+    if ((m_signexp << 1) < (x.m_signexp << 1))
+        return x + *this;
+
+    /* For now, assume both numbers are positive. */
+    real ret;
+
+    int e1 = (m_signexp & 0x7fffffffu) - (1 << 30) + 1;
+    int e2 = (x.m_signexp & 0x7fffffffu) - (1 << 30) + 1;
+
+    int bigoff = (e1 - e2) / (sizeof(uint16_t) * 8);
+    int off = e1 - e2 - bigoff * (sizeof(uint16_t) * 8);
+
+    ret.m_signexp = m_signexp;
+
+    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)
+            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)
+            carry += 0x0001u << (16 - off);
+
+        ret.m_mantissa[BIGITS - 1 - i] = carry;
+        carry >>= 16;
+    }
+
+    /* Renormalise in case we overflowed the mantissa */
+    if (carry)
+    {
+        carry--;
+        for (int i = 0; i < BIGITS; i++)
+        {
+            uint16_t tmp = ret.m_mantissa[i];
+            ret.m_mantissa[i] = (carry << 15) | (tmp >> 1);
+            carry = tmp & 0x0001u;
+        }
+        ret.m_signexp++;
+    }
+
+    return ret;
 }
 

trunk/src/real.h

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

trunk/test/unit/real.cpp

@@ -35 +35 @@
     }
 
+    LOLUNIT_TEST(test_real_add)
+    {
+        LOLUNIT_ASSERT(true);
+    }
+
     LOLUNIT_TEST(test_real_mul)
     {