X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCval.c;h=c61a6c8c19af9525e8c2412ef7a9ba2692ea919d;hb=7674d6140a33e205827bcfb60dc11b16e87df07f;hp=fe15c800b49c63a17e1813aa53fad01ed426fd42;hpb=225c40c9145118d3865b6f7380ebe1e61dd11c4e;p=fw%2Fsdcc

diff --git a/src/SDCCval.c b/src/SDCCval.c
index fe15c800..c61a6c8c 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,31 +337,30 @@ 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;
+      if (sval>=-32768) {
 	SPEC_LONG(val->type)=0;
-      } else {
-	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;
 	}
       }
-    } 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;
 	}
       }
     }
@@ -426,7 +419,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   */
 
@@ -437,10 +430,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   */
@@ -450,44 +439,72 @@ value *constVal (char *s)
   /* create the scan string */
   scanFmt[scI++] = '%';
 
-  scanFmt[scI++] = 'L';
+  scanFmt[scI++] = 'l';
 
   if (octal)
     scanFmt[scI++] = 'o';
   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);
+  }
+
+  /* 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 (sval<0) { // "-28u" will still be signed and negative
+  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;
 }
 
@@ -825,7 +842,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;
 }
@@ -843,7 +860,7 @@ valFromType (sym_link * type)
 }
 
 /*------------------------------------------------------------------*/
-/* floatFromVal - value to unsinged integer conversion        */
+/* floatFromVal - value to double float conversion                  */
 /*------------------------------------------------------------------*/
 double 
 floatFromVal (value * val)
@@ -864,23 +881,26 @@ floatFromVal (value * val)
 
   if (SPEC_NOUN (val->etype) == V_FLOAT)
     return (double) SPEC_CVAL (val->etype).v_float;
-  else
+
+  if (SPEC_LONG (val->etype))
     {
-      if (SPEC_LONG (val->etype))
-	{
-	  if (SPEC_USIGN (val->etype))
-	    return (double) SPEC_CVAL (val->etype).v_ulong;
-	  else
-	    return (double) SPEC_CVAL (val->etype).v_long;
-	}
+      if (SPEC_USIGN (val->etype))
+	return (double) SPEC_CVAL (val->etype).v_ulong;
       else
-	{
-	  if (SPEC_USIGN (val->etype))
-	    return (double) SPEC_CVAL (val->etype).v_uint;
-	  else
-	    return (double) SPEC_CVAL (val->etype).v_int;
-	}
+	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);
+  }
 }
 
 
@@ -908,8 +928,13 @@ 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
+  SPEC_USIGN(val->etype)=0;
   return val;
 }
 
@@ -933,6 +958,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;
+      }
     }
   return val;
 }
@@ -957,6 +985,9 @@ 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;
 }
@@ -977,7 +1008,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);
@@ -992,15 +1023,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);
 }
@@ -1117,7 +1139,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);
@@ -1132,16 +1154,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);
 }
@@ -1210,7 +1222,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))
     {
@@ -1223,18 +1235,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);
 }
@@ -1434,17 +1434,12 @@ valCastLiteral (sym_link * dtype, double fval)
       else
 	{
 	  if (SPEC_USIGN (val->etype))
-	    if (SPEC_NOUN (val->etype)==V_CHAR) {
-	      SPEC_CVAL (val->etype).v_uint = (unsigned char)fval;
-	    } else {
-	      SPEC_CVAL (val->etype).v_uint = (unsigned short)fval;
-	    }
+	    SPEC_CVAL (val->etype).v_uint = (unsigned short)fval;
 	  else
-	    if (SPEC_NOUN (val->etype)==V_CHAR) {
-	      SPEC_CVAL (val->etype).v_int = (char)fval;
-	    } else {
-	      SPEC_CVAL (val->etype).v_int = (short)fval;
-	    }
+	    SPEC_CVAL (val->etype).v_int = (short)fval;
+	  if (SPEC_NOUN (val->etype)==V_CHAR) {
+	    SPEC_CVAL (val->etype).v_uint &= 0xff; 
+	  }
 	}
     }
   return val;