Changeset 666

Timestamp:

Jul 27, 2015, 5:56:15 PM (9 years ago)

Author:

guerin

Message:

stdio: printf: fix compilation warning using an union

File:

• soft/giet_vm/giet_libs/stdio.c (modified) (7 diffs)

soft/giet_vm/giet_libs/stdio.c

@@ -350 +350 @@
             case ('g'):             /* IEEE754 64 bits */
             {
-                
-                double vald = va_arg( *args, double);
-                
-                unsigned long long
-                    val = *(unsigned long long*)&vald, //get ieee754 without conversion
-                    digits = val & 0xFFFFFFFFFFFFFULL;    //get mantissa
+                union
+                {
+                    double d;
+                    unsigned long long ull;
+                } val;
+                
+                val.d = va_arg( *args, double );
+                
+                unsigned long long digits = val.ull & 0xFFFFFFFFFFFFFULL;    //get mantissa
                 
                 unsigned int
-                    base = (unsigned int)((val & 0x7FF0000000000000ULL) >> 52), //get exposant
-                    intp = (unsigned int)vald,         //get integer part of the float
+                    base = (unsigned int)((val.ull & 0x7FF0000000000000ULL) >> 52), //get exposant
+                    intp = (unsigned int)val.d,         //get integer part of the float
                     decp;
                 
@@ -378 +381 @@
                     {
                         /* inf */
-                        buf[0] = (val & 0x8000000000000000ULL) ? '-' : '+';
+                        buf[0] = (val.ull & 0x8000000000000000ULL) ? '-' : '+';
                         buf[1] = 'i';
                         buf[2] = 'n';
@@ -388 +391 @@
                 }
                 
-                if (val & 0x8000000000000000ULL)
+                if (val.ull & 0x8000000000000000ULL)
                 {
                     /* negative */
@@ -397 +400 @@
                                 0);
                     if (ret != 1) goto return_error;
-                    vald = vald * -1;
+                    val.d = val.d * -1;
                 }
                 else
@@ -410 +413 @@
                 }
                 
-                if (vald > 0xFFFFFFFF)
+                if (val.d > 0xFFFFFFFF)
                 {
                     /* overflow */
@@ -421 +424 @@
                 }
                 
-                vald -= (double)intp;
-                decp = (unsigned int)(vald * 1000000000);
+                val.d -= (double)intp;
+                decp = (unsigned int)(val.d * 1000000000);
                 
                 for(i = 0; i < 10; i++) 
@@ -443 +446 @@
                 if (!isvalue)
                 {
-                    if (vald != 0)
+                    if (val.d != 0)
                     {
                         /* underflow */