X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FStgPrimFloat.c;h=743e0ea408ab2ba1f0e01f8a801d96bf5392140a;hb=d874b8c93b737bf26c949ef7bf19fc43e335bd1f;hp=150bdc66a2fda2924c9054878bf23730f9632cf5;hpb=d8c655c1e3cac3eaf4ffa223b06fc37aba0871e5;p=ghc-hetmet.git

diff --git a/rts/StgPrimFloat.c b/rts/StgPrimFloat.c
index 150bdc6..743e0ea 100644
--- a/rts/StgPrimFloat.c
+++ b/rts/StgPrimFloat.c
@@ -1,5 +1,6 @@
 /* -----------------------------------------------------------------------------
  *
+ * (c) Lennart Augustsson
  * (c) The GHC Team, 1998-2000
  *
  * Miscellaneous support for floating-point primitives
@@ -59,28 +60,6 @@
 #define __abs(a)		(( (a) >= 0 ) ? (a) : (-(a)))
 
 StgDouble
-__encodeDouble (I_ size, StgByteArray ba, I_ e) /* result = s * 2^e */
-{
-    StgDouble r;
-    const mp_limb_t *const arr = (const mp_limb_t *)ba;
-    I_ i;
-
-    /* Convert MP_INT to a double; knows a lot about internal rep! */
-    for(r = 0.0, i = __abs(size)-1; i >= 0; i--)
-	r = (r * GMP_BASE) + arr[i];
-
-    /* Now raise to the exponent */
-    if ( r != 0.0 ) /* Lennart suggests this avoids a bug in MIPS's ldexp */
-	r = ldexp(r, e);
-
-    /* sign is encoded in the size */
-    if (size < 0)
-	r = -r;
-
-    return r;
-}
-
-StgDouble
 __2Int_encodeDouble (I_ j_high, I_ j_low, I_ e)
 {
   StgDouble r;
@@ -89,7 +68,7 @@ __2Int_encodeDouble (I_ j_high, I_ j_low, I_ e)
   ASSERT(sizeof(int          ) == 4            );
 
   r = (StgDouble)((unsigned int)j_high);
-  r *= 4294967296; /* exp2f(32); */
+  r *= 4294967296.0; /* exp2f(32); */
   r += (StgDouble)((unsigned int)j_low);
   
   /* Now raise to the exponent */
@@ -103,6 +82,21 @@ __2Int_encodeDouble (I_ j_high, I_ j_low, I_ e)
   return r;
 }
 
+/* Special version for words */
+StgDouble
+__word_encodeDouble (W_ j, I_ e)
+{
+  StgDouble r;
+  
+  r = (StgDouble)j;
+  
+  /* Now raise to the exponent */
+  if ( r != 0.0 ) /* Lennart suggests this avoids a bug in MIPS's ldexp */
+    r = ldexp(r, e);
+  
+  return r;
+}
+
 /* Special version for small Integers */
 StgDouble
 __int_encodeDouble (I_ j, I_ e)
@@ -122,28 +116,6 @@ __int_encodeDouble (I_ j, I_ e)
   return r;
 }
 
-StgFloat
-__encodeFloat (I_ size, StgByteArray ba, I_ e) /* result = s * 2^e */
-{
-    StgFloat r;
-    const mp_limb_t *arr = (const mp_limb_t *)ba;
-    I_ i;
-
-    /* Convert MP_INT to a float; knows a lot about internal rep! */
-    for(r = 0.0, i = __abs(size)-1; i >= 0; i--)
-	r = (r * GMP_BASE) + arr[i];
-
-    /* Now raise to the exponent */
-    if ( r != 0.0 ) /* Lennart suggests this avoids a bug in MIPS's ldexp */
-	r = ldexp(r, e);
-
-    /* sign is encoded in the size */
-    if (size < 0)
-	r = -r;
-
-    return r;
-}
-
 /* Special version for small Integers */
 StgFloat
 __int_encodeFloat (I_ j, I_ e)
@@ -163,6 +135,21 @@ __int_encodeFloat (I_ j, I_ e)
   return r;
 }
 
+/* Special version for small positive Integers */
+StgFloat
+__word_encodeFloat (W_ j, I_ e)
+{
+  StgFloat r;
+  
+  r = (StgFloat)j;
+  
+  /* Now raise to the exponent */
+  if ( r != 0.0 ) /* Lennart suggests this avoids a bug in MIPS's ldexp */
+    r = ldexp(r, e);
+  
+  return r;
+}
+
 /* This only supports IEEE floating point */
 
 void
@@ -226,7 +213,7 @@ __decodeDouble (MP_INT *man, I_ *exp, StgDouble dbl)
 }
 
 void
-__decodeDouble_2Int (I_ *man_high, I_ *man_low, I_ *exp, StgDouble dbl)
+__decodeDouble_2Int (I_ *man_sign, W_ *man_high, W_ *man_low, I_ *exp, StgDouble dbl)
 {
     /* Do some bit fiddling on IEEE */
     unsigned int low, high; 	     	/* assuming 32 bit ints */
@@ -266,58 +253,7 @@ __decodeDouble_2Int (I_ *man_high, I_ *man_low, I_ *exp, StgDouble dbl)
         *exp = (I_) iexp;
 	*man_low = low;
 	*man_high = high;
-	if (sign < 0) {
-	    *man_high = - *man_high;
-        }
-    }
-}
-
-void
-__decodeFloat (MP_INT *man, I_ *exp, StgFloat flt)
-{
-    /* Do some bit fiddling on IEEE */
-    int high, sign; 	    	    /* assuming 32 bit ints */
-    union { float f; int i; } u;    /* assuming 32 bit float and int */
-
-    ASSERT(sizeof(int          ) == 4            );
-    ASSERT(sizeof(flt          ) == SIZEOF_FLOAT );
-    ASSERT(sizeof(man->_mp_d[0]) == SIZEOF_LIMB_T);
-    ASSERT(FNBIGIT*SIZEOF_LIMB_T >= SIZEOF_FLOAT );
-
-    u.f = flt;	    /* grab the float */
-    high = u.i;
-
-    /* we know the MP_INT* passed in has size zero, so we realloc
-    	no matter what.
-    */
-    man->_mp_alloc = FNBIGIT;
-
-    if ((high & ~FMSBIT) == 0) {
-	man->_mp_size = 0;
-	*exp = 0;
-    } else {
-	man->_mp_size = FNBIGIT;
-	*exp = ((high >> 23) & 0xff) + MY_FMINEXP;
-	sign = high;
-
-	high &= FHIGHBIT-1;
-	if (*exp != MY_FMINEXP)	/* don't add hidden bit to denorms */
-	    high |= FHIGHBIT;
-	else {
-	    (*exp)++;
-	    /* A denorm, normalize the mantissa */
-	    while (! (high & FHIGHBIT)) {
-		high <<= 1;
-		(*exp)--;
-	    }
-	}
-#if FNBIGIT == 1
-	man->_mp_d[0] = (mp_limb_t)high;
-#else
-#error Cannot cope with FNBIGIT
-#endif
-	if (sign < 0)
-	    man->_mp_size = -man->_mp_size;
+	*man_sign = (sign < 0) ? -1 : 1;
     }
 }