Changeset 777 for soft/giet_vm/giet_libs/math

Timestamp:

Feb 4, 2016, 6:25:22 PM (9 years ago)

Author:

meunier

Message:

• Ajout de quelques fonction dans la lib math
• Déplacement de certaines fonctions de stdlib vers string

Location:

soft/giet_vm/giet_libs/math

Files:

• e_pow.c (modified) (7 diffs)
• e_rem_pio2.c (modified) (2 diffs)
• e_sqrt.c (modified) (2 diffs)
• math_private.h (modified) (3 diffs)
• s_copysign.c (modified) (1 diff)
• s_fabs.c (modified) (1 diff)
• s_finite.c (modified) (1 diff)
• s_floor.c (modified) (2 diffs)
• s_isnan.c (modified) (1 diff)
• s_rint.c (modified) (4 diffs)

soft/giet_vm/giet_libs/math/e_pow.c

@@ -103 +103 @@
         int32_t i,j,k,yisint,n;
         int32_t hx,hy,ix,iy;
-        u_int32_t lx,ly;
+        uint32_t lx,ly;
 
         EXTRACT_WORDS(hx,lx,x);
@@ -180 +180 @@
 
     /* (x<0)**(non-int) is NaN */
-        if(((((u_int32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x);
+        if(((((uint32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x);
 
     /* |y| is huge */
@@ -251 +251 @@
 
         s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
-        if(((((u_int32_t)hx>>31)-1)|(yisint-1))==0)
+        if(((((uint32_t)hx>>31)-1)|(yisint-1))==0)
             s = -one;/* (-ve)**(odd int) */
 
@@ -312 +312 @@
 {
         double z = __ieee754_pow(x, y);
-        if (isnan(y))
+        if (isnan(y)) {
                 return z;
+    }
         if (isnan(x)) {
                 if (y == 0.0) {
@@ -322 +323 @@
         if (x == 0.0) {
                 if (y == 0.0) {
-                        return 0; /* pow(0.0,0.0) */
+            return 0; /* pow(0.0,0.0) */
                 }
                 if (isfinite(y) && y < 0.0) {
@@ -332 +333 @@
                 if (isfinite(x) && isfinite(y)) {
                         if (isnan(z)) {
-                                return 0.0/0.0; /* pow neg**non-int */
+                                return 0.0 / 0.0; /* pow neg**non-int */
                         }
                         {
                                 double ret = huge;
                                 y *= 0.5;
-                                if(x<zero&&rint(y)!=y) ret = -huge;
+                                if (x < zero && rint(y) !=y ) {
+                    ret = -huge;
+                }
                                 return ret;
                         }
@@ -347 +350 @@
         return z;
 }
+
+/*
+ * Pseudo exp function (QM)
+ * There probably is a better implementation
+ */
+double exp(double x)
+{
+    const double e = 2.71828182846;
+    return pow(e, x);
+}
+

soft/giet_vm/giet_libs/math/e_rem_pio2.c

@@ -75 +75 @@
         double tx[3];
         int32_t e0,i,j,nx,n,ix,hx;
-        u_int32_t low;
+        uint32_t low;
 
         GET_HIGH_WORD(hx,x);            /* high word of x */
@@ -115 +115 @@
                 y[0] = r-w;     /* quick check no cancellation */
             } else {
-                u_int32_t high;
+                uint32_t high;
                 j  = ix>>20;
                 y[0] = r-w;

soft/giet_vm/giet_libs/math/e_sqrt.c

@@ -93 +93 @@
         int32_t sign = (int)0x80000000;
         int32_t ix0,s0,q,m,t,i;
-        u_int32_t r,t1,s1,ix1,q1;
+        uint32_t r,t1,s1,ix1,q1;
 
         EXTRACT_WORDS(ix0,ix1,x);
@@ -168 +168 @@
             if (z>=one) {
                 z = one+tiny;
-                if (q1==(u_int32_t)0xffffffff) { q1=0; q += 1;}
+                if (q1==(uint32_t)0xffffffff) { q1=0; q += 1;}
                 else if (z>one) {
-                    if (q1==(u_int32_t)0xfffffffe) q+=1;
+                    if (q1==(uint32_t)0xfffffffe) q+=1;
                     q1+=2;
                 } else

soft/giet_vm/giet_libs/math/math_private.h

@@ -16 +16 @@
 #define _MATH_PRIVATE_H_
 
-typedef unsigned int u_int32_t;
-
+typedef unsigned int uint32_t;
 typedef int          int32_t;
+typedef unsigned long long int uint64_t;
+typedef long long int int64_t;
 
 /* The original fdlibm code used statements like:
@@ -51 +52 @@
   struct
   {
-    u_int32_t msw;
-    u_int32_t lsw;
+    uint32_t msw;
+    uint32_t lsw;
   } parts;
 } ieee_double_shape_type;
@@ -64 +65 @@
   struct
   {
-    u_int32_t lsw;
-    u_int32_t msw;
+    uint32_t lsw;
+    uint32_t msw;
   } parts;
 } ieee_double_shape_type;

soft/giet_vm/giet_libs/math/s_copysign.c

@@ -24 +24 @@
 double copysign(double x, double y)
 {
-        u_int32_t hx,hy;
+        uint32_t hx,hy;
         GET_HIGH_WORD(hx,x);
         GET_HIGH_WORD(hy,y);

soft/giet_vm/giet_libs/math/s_fabs.c

@@ -22 +22 @@
 double fabs(double x)
 {
-        u_int32_t high;
+        uint32_t high;
         GET_HIGH_WORD(high,x);
         SET_HIGH_WORD(x,high&0x7fffffff);

soft/giet_vm/giet_libs/math/s_finite.c

@@ -23 +23 @@
 int isfinite(double x)
 {
-        u_int32_t hx;
+        uint32_t hx;
 
         GET_HIGH_WORD(hx, x);

soft/giet_vm/giet_libs/math/s_floor.c

@@ -11 +11 @@
 
 /* Modified for GIET-VM static OS at UPMC, France 2015.
- */
+*/
 
 /*
@@ -28 +28 @@
 double floor(double x)
 {
-        int32_t i0,i1,j0;
-        u_int32_t i,j;
-        EXTRACT_WORDS(i0,i1,x);
-        j0 = ((i0>>20)&0x7ff)-0x3ff;
-        if(j0<20) {
-            if(j0<0) {  /* raise inexact if x != 0 */
-                if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */
-                    if(i0>=0) {i0=i1=0;}
-                    else if(((i0&0x7fffffff)|i1)!=0)
-                        { i0=0xbff00000;i1=0;}
-                }
-            } else {
-                i = (0x000fffff)>>j0;
-                if(((i0&i)|i1)==0) return x; /* x is integral */
-                if(huge+x>0.0) {        /* raise inexact flag */
-                    if(i0<0) i0 += (0x00100000)>>j0;
-                    i0 &= (~i); i1=0;
-                }
-            }
-        } else if (j0>51) {
-            if(j0==0x400) return x+x;   /* inf or NaN */
-            else return x;              /* x is integral */
-        } else {
-            i = ((u_int32_t)(0xffffffff))>>(j0-20);
-            if((i1&i)==0) return x;     /* x is integral */
-            if(huge+x>0.0) {            /* raise inexact flag */
-                if(i0<0) {
-                    if(j0==20) i0+=1;
-                    else {
-                        j = i1+(1<<(52-j0));
-                        if(j<i1) i0 +=1 ;       /* got a carry */
-                        i1=j;
-                    }
-                }
-                i1 &= (~i);
-            }
-        }
-        INSERT_WORDS(x,i0,i1);
-        return x;
+    int32_t i0, i1, j0;
+    uint32_t i, j;
+    EXTRACT_WORDS(i0, i1, x);
+    j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+    if (j0 < 20) {
+        if (j0 < 0) {   /* raise inexact if x != 0 */
+            if (huge + x > 0.0) {/* return 0*sign(x) if |x|<1 */
+                if (i0 >= 0) {
+                    i0 = i1 = 0;
+                }
+                else if (((i0 & 0x7fffffff) | i1) != 0) {
+                    i0 = 0xbff00000;
+                    i1 = 0;
+                }
+            }
+        }
+        else {
+            i = (0x000fffff) >> j0;
+            if (((i0 & i) | i1) == 0) {
+                return x; /* x is integral */
+            }
+            if (huge + x > 0.0) {       /* raise inexact flag */
+                if (i0 < 0) {
+                    i0 += (0x00100000) >> j0;
+                }
+                i0 &= (~i);
+                i1 = 0;
+            }
+        }
+    }
+    else if (j0 > 51) {
+        if (j0 == 0x400) {
+            return x + x;       /* inf or NaN */
+        }
+        else {
+            return x;           /* x is integral */
+        }
+    }
+    else {
+        i = ((uint32_t) (0xffffffff)) >> (j0 - 20);
+        if ((i1 & i)== 0) {
+            return x;   /* x is integral */
+        }
+        if (huge + x > 0.0) {           /* raise inexact flag */
+            if (i0 < 0) {
+                if (j0 == 20) {
+                    i0 += 1;
+                }
+                else {
+                    j = i1 + (1 << (52 - j0));
+                    if (j < i1) {
+                        i0 += 1 ;       /* got a carry */
+                    }
+                    i1 = j;
+                }
+            }
+            i1 &= (~i);
+        }
+    }
+    INSERT_WORDS(x, i0, i1);
+    return x;
 }
 

soft/giet_vm/giet_libs/math/s_isnan.c

@@ -26 +26 @@
         EXTRACT_WORDS(hx,lx,x);
         hx &= 0x7fffffff;
-        hx |= (u_int32_t)(lx|(-lx))>>31;
+        hx |= (uint32_t)(lx|(-lx))>>31;
         hx = 0x7ff00000 - hx;
-        return (int)(((u_int32_t)hx)>>31);
+        return (int)(((uint32_t)hx)>>31);
 }

soft/giet_vm/giet_libs/math/s_rint.c

@@ -35 +35 @@
 {
         int32_t i0, j0, sx;
-        u_int32_t i,i1;
+        uint32_t i,i1;
         double t;
         /* We use w = x + 2^52; t = w - 2^52; trick to round x to integer.
@@ -47 +47 @@
         EXTRACT_WORDS(i0,i1,x);
         /* Unbiased exponent */
-        j0 = ((((u_int32_t)i0) >> 20)&0x7ff)-0x3ff;
+        j0 = ((((uint32_t)i0) >> 20)&0x7ff)-0x3ff;
 
         if (j0 > 51) {
@@ -57 +57 @@
 
         /* Sign */
-        sx = ((u_int32_t)i0) >> 31;
+        sx = ((uint32_t)i0) >> 31;
 
         if (j0<20) {
@@ -81 +81 @@
             }
         } else {
-            i = ((u_int32_t)(0xffffffff))>>(j0-20);
+            i = ((uint32_t)(0xffffffff))>>(j0-20);
             if ((i1&i)==0) return x;    /* x is integral */
             i>>=1;