Changeset 777 for soft/giet_vm/giet_libs/math/s_floor.c

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

File:

• soft/giet_vm/giet_libs/math/s_floor.c (modified) (2 diffs)

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;
 }