Changeset 976Tweet

Timestamp:

Sep 22, 2011, 6:16:51 PM (11 years ago)

Author:

sam

Message:

core: allow to cast reals to doubles in addition to floats.

Location:

trunk

Files:

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

trunk/src/real.cpp

@@ -25 +25 @@
 real::real(float f)
 {
-    union { float f; uint32_t x; } u = { f };
-
-    uint32_t sign = u.x & 0x80000000u;
-    uint32_t exponent = (u.x >> 23) & 0xff;
+    new(this) real((double)f);
+}
+
+real::real(double d)
+{
+    union { double d; uint64_t x; } u = { d };
+
+    uint32_t sign = (u.x >> 63) << 31;
+    uint32_t exponent = (u.x << 1) >> 53;
 
     switch (exponent)
     {
     case 0x00:
-    case 0xff:
-        m_signexp = sign | exponent;
+        m_signexp = sign;
+        break;
+    case 0x7ff:
+        m_signexp = sign | 0x7fffffffu;
         break;
     default:
-        m_signexp = sign | (exponent + (1 << 30) - (1 << 7));
+        m_signexp = sign | (exponent + (1 << 30) - (1 << 10));
         break;
     }
 
-    m_mantissa[0] = u.x >> 7;
-    m_mantissa[1] = u.x << 9;
-    memset(m_mantissa + 2, 0, sizeof(m_mantissa) - sizeof(m_mantissa[0]));
+    m_mantissa[0] = u.x >> 36;
+    m_mantissa[1] = u.x >> 20;
+    m_mantissa[2] = u.x >> 4;
+    m_mantissa[3] = u.x << 12;
+    memset(m_mantissa + 4, 0, sizeof(m_mantissa) - 4 * sizeof(m_mantissa[0]));
 }
 
 real::operator float() const
 {
-    union { float f; uint32_t x; } u;
-
-    uint32_t sign = m_signexp & 0x80000000u;
-    uint32_t exponent = m_signexp & 0x7fffffffu;
-    uint32_t mantissa = (m_mantissa[0] << 7) | (m_mantissa[1] >> 9);
-
-    int e = (int)exponent - (1 << 30) + (1 << 7);
+    return (float)(double)(*this);
+}
+
+real::operator double() const
+{
+    union { double d; uint64_t x; } u;
+
+    /* Get sign */
+    u.x = m_signexp >> 31;
+    u.x <<= 11;
+
+    /* Compute new exponent */
+    uint32_t exponent = (m_signexp << 1) >> 1;
+    int e = (int)exponent - (1 << 30) + (1 << 10);
 
     if (e < 0)
-        u.x = sign;
-    else if (e >= 0xff)
-        u.x = sign | (0xff << 23);
+        u.x <<= 52;
+    else if (e >= 0x7ff)
+    {
+        u.x |= 0x7ff;
+        u.x <<= 52;
+    }
     else
-        u.x = sign | (e << 23) | mantissa;
-
-    return u.f;
+    {
+        u.x |= e;
+
+        /* Store mantissa if necessary */
+        u.x <<= 16;
+        u.x |= m_mantissa[0];
+        u.x <<= 16;
+        u.x |= m_mantissa[1];
+        u.x <<= 16;
+        u.x |= m_mantissa[2];
+        u.x <<= 4;
+        u.x |= m_mantissa[3] >> 12;
+    }
+
+    return u.d;
 }
 

trunk/src/real.h

@@ -29 +29 @@
     inline real() { }
     real(float f);
+    real(double f);
 
     operator float() const;
+    operator double() const;
 
     real operator -() const;

trunk/test/unit/real.cpp

@@ -30 +30 @@
         float a4 = real(-1.0f);
         float a5 = real(1.5f);
+        float a6 = real(12345678.0f);
 
         LOLUNIT_ASSERT_EQUAL(a1, 0.0f);
@@ -36 +37 @@
         LOLUNIT_ASSERT_EQUAL(a4, -1.0f);
         LOLUNIT_ASSERT_EQUAL(a5, 1.5f);
+        LOLUNIT_ASSERT_EQUAL(a6, 12345678.0f);
+    }
+
+    LOLUNIT_TEST(test_real_from_double)
+    {
+        double a1 = real(0.0);
+        double a2 = real(-0.0);
+        double a3 = real(1.0);
+        double a4 = real(-1.0);
+        double a5 = real(1.5);
+        double a6 = real(1234567876543210.0);
+
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(a1, 0.0, 0.0);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(a2, -0.0, 0.0);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(a3, 1.0, 0.0);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(a4, -1.0, 0.0);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(a5, 1.5, 0.0);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(a6, 1234567876543210.0, 0.0);
     }