X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCval.c;h=4335276764809d836e44502c6b04c95a252b4e64;hb=bb663502b1db5a0068504f50357294bd97c97731;hp=819b8144e0ed6af3ac8274f8ab35a14c02572aba;hpb=11a6db511db5f9e09ddd0f07a828ec2d1125d6f8;p=fw%2Fsdcc

diff --git a/src/SDCCval.c b/src/SDCCval.c
index 819b8144..43352767 100644
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -29,12 +29,6 @@
 #include <limits.h>
 #include "newalloc.h"
 
-#if defined(__BORLANDC__) || defined(_MSC_VER)
-#define LONG_LONG __int64
-#else
-#define LONG_LONG long long
-#endif
-
 int cNestLevel;
 
 /*-----------------------------------------------------------------*/
@@ -343,32 +337,29 @@ value *cheapestVal (value *val) {
   }
 
   if (SPEC_USIGN(val->type)) {
-    if (uval<=0xff) {
-      SPEC_NOUN(val->type)=V_CHAR;
+    if (uval<=0xffff) {
       SPEC_LONG(val->type)=0;
-    } else {
-      if (uval<=0xffff) {
-	SPEC_LONG(val->type)=0;
+      SPEC_CVAL(val->type).v_uint = uval;
+      if (uval<=0xff) {
+	SPEC_NOUN(val->type)=V_CHAR;
       }
     }
-  } else {
+  } else { // not unsigned
     if (sval<0) {
-      if (sval>=-128) {
-	SPEC_NOUN(val->type)=V_CHAR;
-	SPEC_CVAL(val->type).v_int &= 0xff;
+      if (sval>=-32768) {
 	SPEC_LONG(val->type)=0;
-      } else {
-	if (sval>=-32768) {
-	  SPEC_LONG(val->type)=0;
+	SPEC_CVAL(val->type).v_int = sval;
+	if (sval>=-128) {
+	  SPEC_NOUN(val->type)=V_CHAR;
 	}
       }
-    } else {
-      if (sval<=127) {
-	SPEC_NOUN(val->type)=V_CHAR;
+    } else { // sval>=0
+      SPEC_USIGN(val->type)=1;
+      if (sval<=65535) {
 	SPEC_LONG(val->type)=0;
-      } else {
-	if (sval<=32767) {
-	  SPEC_LONG(val->type)=0;
+	SPEC_CVAL(val->type).v_int = sval;
+	if (sval<=255) {
+	  SPEC_NOUN(val->type)=V_CHAR;
 	}
       }
     }
@@ -427,7 +418,7 @@ value *constVal (char *s)
   short hex = 0, octal = 0;
   char scanFmt[10];
   int scI = 0;
-  LONG_LONG sval;
+  double dval;
 
   val = newValue ();		/* alloc space for value   */
 
@@ -438,10 +429,6 @@ value *constVal (char *s)
   SPEC_NOUN (val->type) = V_CHAR;
   SPEC_USIGN (val->type) = 1;
 
-  /* set the _long flag if 'lL' is found */
-  if (strchr (s, 'l') || strchr (s, 'L'))
-    SPEC_LONG (val->type) = 1;
-
   hex = ((strchr (s, 'x') || strchr (s, 'X')) ? 1 : 0);
 
   /* set the octal flag   */
@@ -451,7 +438,6 @@ value *constVal (char *s)
   /* create the scan string */
   scanFmt[scI++] = '%';
 
-  scanFmt[scI++] = 'l';
   scanFmt[scI++] = 'l';
 
   if (octal)
@@ -459,37 +445,65 @@ value *constVal (char *s)
   else if (hex)
     scanFmt[scI++] = 'x';
   else
-    scanFmt[scI++] = 'd';
+    scanFmt[scI++] = 'f';
 
   scanFmt[scI++] = '\0';
 
-  sscanf (s, scanFmt, &sval);
+  if (octal || hex) {
+    unsigned long sval;
+    sscanf (s, scanFmt, &sval);
+    dval=sval;
+  } else {
+    sscanf (s, scanFmt, &dval);
+  }
 
-  if (sval<0) { // "-28u" will still be signed and negative
+  /* Setup the flags first */
+  /* set the _long flag if 'lL' is found */
+  if (strchr (s, 'l') || strchr (s, 'L')) {
+    SPEC_NOUN (val->type) = V_INT;
+    SPEC_LONG (val->type) = 1;
+  }
+
+  if (dval<0) { // "-28u" will still be signed and negative
     SPEC_USIGN (val->type) = 0;
-    if (sval<-32768) { // check if we have to promote to long
+    if (dval<-128) { // check if we have to promote to int
       SPEC_NOUN (val->type) = V_INT;
+    }
+    if (dval<-32768) { // check if we have to promote to long int
       SPEC_LONG (val->type) = 1;
-      SPEC_CVAL (val->type).v_long=sval;
-    } else {
-      SPEC_CVAL (val->type).v_int=sval;
-      if (sval<-128) { // check if we have to promote to int
-	SPEC_NOUN (val->type) = V_INT;
-      }
     }
-  } else {
-    if (sval>0xffff) { // check if we have to promote to long
+  } else { // >=0
+    if (dval>0xff) { // check if we have to promote to int
       SPEC_NOUN (val->type) = V_INT;
+    }
+    if (dval>0xffff) { // check if we have to promote to long int
       SPEC_LONG (val->type) = 1;
-      SPEC_CVAL (val->type).v_ulong=sval;
-    } else {
-      SPEC_CVAL (val->type).v_uint=sval;
-      if (sval>0xff) { // check if we have to promote to int
-	SPEC_NOUN (val->type) = V_INT;
-      }
     }
   }
 
+  if (SPEC_LONG (val->type))
+    {
+      if (SPEC_USIGN (val->type))
+        {
+          SPEC_CVAL (val->type).v_ulong = dval;
+        }
+      else
+        {
+          SPEC_CVAL (val->type).v_long = dval;
+        }
+    }
+  else
+    {
+      if (SPEC_USIGN (val->type))
+        {
+          SPEC_CVAL (val->type).v_uint = dval;
+        }
+      else
+        {
+          SPEC_CVAL (val->type).v_int = dval;
+        }
+    }
+
   return val;
 }
 
@@ -827,7 +841,7 @@ charVal (char *s)
 	}
     }
   else				/* not a backslash */
-    SPEC_CVAL (val->type).v_int = (unsigned char)*s;
+    SPEC_CVAL (val->type).v_uint = (unsigned char)*s;
 
   return val;
 }
@@ -845,7 +859,7 @@ valFromType (sym_link * type)
 }
 
 /*------------------------------------------------------------------*/
-/* floatFromVal - value to unsinged integer conversion        */
+/* floatFromVal - value to double float conversion                  */
 /*------------------------------------------------------------------*/
 double 
 floatFromVal (value * val)
@@ -875,17 +889,28 @@ floatFromVal (value * val)
 	return (double) SPEC_CVAL (val->etype).v_long;
     }
   
-  if (SPEC_NOUN(val->etype)==V_INT) {
+  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_NOUN (val->etype) == V_CHAR) {
     if (SPEC_USIGN (val->etype))
-      return (double) ((unsigned char)SPEC_CVAL (val->etype).v_uint);
+      return (double) (unsigned char)SPEC_CVAL (val->etype).v_uint;
     else
-      return (double) ((signed char)SPEC_CVAL (val->etype).v_int);
+      return (double) (signed char)SPEC_CVAL (val->etype).v_int;
   }
+
+  if (IS_BITVAR(val->etype)) {
+    return (double) SPEC_CVAL (val->etype).v_ulong;
+  }
+
+  // we are lost !
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
+	  "floatFromVal: unknown value");
+  return 0;
 }
 
 
@@ -913,9 +938,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
@@ -943,10 +965,9 @@ 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;
-      }
     }
+  // ~(unsigned 3) now really is signed
+  SPEC_USIGN(val->etype)=0;
   return val;
 }
 
@@ -970,9 +991,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;
 }
@@ -993,7 +1011,7 @@ valMult (value * lval, value * rval)
 			   IS_FLOAT (rval->etype) ? V_FLOAT : V_INT);
   SPEC_SCLS (val->type) = S_LITERAL;	/* will remain literal */
   SPEC_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
-  SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+  SPEC_LONG (val->type) = 1;
 
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) * floatFromVal (rval);
@@ -1008,15 +1026,6 @@ valMult (value * lval, value * rval)
 	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) *
 	      (long) floatFromVal (rval);
 	}
-      else
-	{
-	  if (SPEC_USIGN (val->type))
-	    SPEC_CVAL (val->type).v_uint = (unsigned) floatFromVal (lval) *
-	      (unsigned) floatFromVal (rval);
-	  else
-	    SPEC_CVAL (val->type).v_int = (int) floatFromVal (lval) *
-	      (int) floatFromVal (rval);
-	}
     }
   return cheapestVal(val);
 }
@@ -1133,7 +1142,7 @@ valPlus (value * lval, value * rval)
     SPEC_USIGN (rval->etype) &&
     (floatFromVal(lval)+floatFromVal(rval))>=0;
     
-  SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+  SPEC_LONG (val->type) = 1;
 
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) + floatFromVal (rval);
@@ -1148,16 +1157,6 @@ valPlus (value * lval, value * rval)
 	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) +
 	      (long) floatFromVal (rval);
 	}
-      else
-	{
-	  if (SPEC_USIGN (val->type)) {
-	    SPEC_CVAL (val->type).v_uint = (unsigned) floatFromVal (lval) +
-	      (unsigned) floatFromVal (rval);
-	  } else {
-	    SPEC_CVAL (val->type).v_int = (int) floatFromVal (lval) +
-	      (int) floatFromVal (rval);
-	  }
-	}
     }
   return cheapestVal(val);
 }
@@ -1226,7 +1225,7 @@ valShift (value * lval, value * rval, int lr)
   val->type = val->etype = newIntLink ();
   SPEC_SCLS (val->type) = S_LITERAL;	/* will remain literal */
   SPEC_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
-  SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+  SPEC_LONG (val->type) = 1;
 
   if (SPEC_LONG (val->type))
     {
@@ -1239,18 +1238,6 @@ valShift (value * lval, value * rval, int lr)
 	  (long) floatFromVal (lval) << (long) floatFromVal (rval) : \
 	  (long) floatFromVal (lval) >> (long) floatFromVal (rval);
     }
-  else
-    {
-      if (SPEC_USIGN (val->type)) {
-	SPEC_CVAL (val->type).v_uint = lr ? 
-	  (unsigned) floatFromVal (lval) << (unsigned) floatFromVal (rval) :\
-	  (unsigned) floatFromVal (lval) >> (unsigned) floatFromVal (rval);
-      } else {
-	SPEC_CVAL (val->type).v_int = lr ?
-	  (int) floatFromVal (lval) << (int) floatFromVal (rval) : \
-	  (int) floatFromVal (lval) >> (int) floatFromVal (rval);
-      }
-    }
 
   return cheapestVal(val);
 }
@@ -1430,34 +1417,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;
 }