X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCval.c;h=86de5525be63e892b658735dfee21d855529e1d0;hb=e2d5ecab4daf154db6b8505dbb6892847139cc3f;hp=2e3448a51be3e1bb3dea543eb5affbce40251f08;hpb=a33fd8046d6eb986d762dfecbd5f82c566cdac30;p=fw%2Fsdcc

diff --git a/src/SDCCval.c b/src/SDCCval.c
index 2e3448a5..86de5525 100644
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -340,28 +340,27 @@ value *cheapestVal (value *val) {
     if (uval<=0xffff) {
       SPEC_LONG(val->type)=0;
       SPEC_CVAL(val->type).v_uint = uval;
-    }
-    if (uval<=0xff) {
-      SPEC_NOUN(val->type)=V_CHAR;
+      if (uval<=0xff) {
+	SPEC_NOUN(val->type)=V_CHAR;
+      }
     }
   } else { // not unsigned
     if (sval<0) {
       if (sval>=-32768) {
 	SPEC_LONG(val->type)=0;
-	SPEC_CVAL(val->type).v_int = sval & 0xffff;
-      }
-      if (sval>=-128) {
-	SPEC_NOUN(val->type)=V_CHAR;
-	SPEC_CVAL(val->type).v_int &= 0xff;
+	SPEC_CVAL(val->type).v_int = sval;
+	if (sval>=-128) {
+	  SPEC_NOUN(val->type)=V_CHAR;
+	}
       }
     } else { // sval>=0
       SPEC_USIGN(val->type)=1;
       if (sval<=65535) {
 	SPEC_LONG(val->type)=0;
 	SPEC_CVAL(val->type).v_int = sval;
-      }
-      if (sval<=255) {
-	SPEC_NOUN(val->type)=V_CHAR;
+	if (sval<=255) {
+	  SPEC_NOUN(val->type)=V_CHAR;
+	}
       }
     }
   }
@@ -860,7 +859,7 @@ valFromType (sym_link * type)
 }
 
 /*------------------------------------------------------------------*/
-/* floatFromVal - value to unsinged integer conversion        */
+/* floatFromVal - value to double float conversion                  */
 /*------------------------------------------------------------------*/
 double 
 floatFromVal (value * val)
@@ -890,17 +889,10 @@ floatFromVal (value * val)
 	return (double) SPEC_CVAL (val->etype).v_long;
     }
   
-  if (SPEC_NOUN(val->etype)==V_INT) {
-    if (SPEC_USIGN (val->etype))
-      return (double) SPEC_CVAL (val->etype).v_uint;
-    else
-      return (double) SPEC_CVAL (val->etype).v_int;
-  } else { // SPEC_NOUN==V_CHAR
-    if (SPEC_USIGN (val->etype))
-      return (double) ((unsigned char)SPEC_CVAL (val->etype).v_uint);
-    else
-      return (double) ((signed char)SPEC_CVAL (val->etype).v_int);
-  }
+  if (SPEC_USIGN (val->etype))
+    return (double) SPEC_CVAL (val->etype).v_uint;
+  else
+    return (double) SPEC_CVAL (val->etype).v_int;
 }
 
 
@@ -928,9 +920,6 @@ valUnaryPM (value * val)
 	    SPEC_CVAL (val->etype).v_uint = 0-SPEC_CVAL (val->etype).v_uint;
 	  else
 	    SPEC_CVAL (val->etype).v_int = -SPEC_CVAL (val->etype).v_int;
-	  if (SPEC_NOUN (val->etype)==V_CHAR) {
-	    SPEC_CVAL (val->etype).v_uint &= 0xff;
-	  }
 	}
     }
   // -(unsigned 3) now really is signed
@@ -958,9 +947,6 @@ valComplement (value * val)
 	SPEC_CVAL (val->etype).v_uint = ~SPEC_CVAL (val->etype).v_uint;
       else
 	SPEC_CVAL (val->etype).v_int = ~SPEC_CVAL (val->etype).v_int;
-      if (SPEC_NOUN (val->etype)==V_CHAR) {
-	SPEC_CVAL (val->etype).v_uint &= 0xff;
-      }
     }
   return val;
 }
@@ -985,9 +971,6 @@ valNot (value * val)
 	SPEC_CVAL (val->etype).v_uint = !SPEC_CVAL (val->etype).v_uint;
       else
 	SPEC_CVAL (val->etype).v_int = !SPEC_CVAL (val->etype).v_int;
-      if (SPEC_NOUN (val->etype)==V_CHAR) {
-	SPEC_CVAL (val->etype).v_uint &= 0xff;
-      }
     }
   return val;
 }
@@ -1414,34 +1397,27 @@ valCastLiteral (sym_link * dtype, double fval)
   SPEC_SCLS (val->etype) = S_LITERAL;
   /* if it is not a specifier then we can assume that */
   /* it will be an unsigned long                      */
-  if (!IS_SPEC (val->type))
-    {
+  if (!IS_SPEC (val->type)) {
       SPEC_CVAL (val->etype).v_ulong = (unsigned long) fval;
       return val;
-    }
+  }
 
   if (SPEC_NOUN (val->etype) == V_FLOAT)
-    SPEC_CVAL (val->etype).v_float = fval;
-  else
-    {
-      if (SPEC_LONG (val->etype))
-	{
+      SPEC_CVAL (val->etype).v_float = fval;
+  else {
+      unsigned long l = fval;
+      if (SPEC_LONG (val->etype)) {
 	  if (SPEC_USIGN (val->etype))
-	    SPEC_CVAL (val->etype).v_ulong = (unsigned long) fval;
+	      SPEC_CVAL (val->etype).v_ulong = (unsigned long) l;
 	  else
-	    SPEC_CVAL (val->etype).v_long = (long) fval;
-	}
-      else
-	{
+	      SPEC_CVAL (val->etype).v_long = (long) l;
+      } else {
 	  if (SPEC_USIGN (val->etype))
-	    SPEC_CVAL (val->etype).v_uint = (unsigned short)fval;
+	      SPEC_CVAL (val->etype).v_uint = (unsigned short)l;
 	  else
-	    SPEC_CVAL (val->etype).v_int = (short)fval;
-	  if (SPEC_NOUN (val->etype)==V_CHAR) {
-	    SPEC_CVAL (val->etype).v_uint &= 0xff; 
-	  }
-	}
-    }
+	      SPEC_CVAL (val->etype).v_int = (short)l;
+      }
+  }
   return val;
 }