X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCval.c;h=7c0e04da24e3f947e5fb44325a9c6fa01feeacfc;hb=808f5e7fbf3de6ae5c1effcdf2764fb6d706b1cf;hp=86de5525be63e892b658735dfee21d855529e1d0;hpb=92ee91cb4a8a8d3c76e71fd20522ab13f8faab23;p=fw%2Fsdcc

diff --git a/src/SDCCval.c b/src/SDCCval.c
index 86de5525..7c0e04da 100644
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -56,7 +56,7 @@ newiList (int type, void *ilist)
   nilist = Safe_alloc (sizeof (initList));
 
   nilist->type = type;
-  nilist->lineno = yylineno;
+  nilist->lineno = mylineno;
 
   switch (type)
     {
@@ -118,21 +118,21 @@ convertIListToConstList(initList *src, literalList **lList)
 	{
 	    return FALSE;
 	}
-	
+
 	if (!IS_AST_LIT_VALUE(decorateType(resolveSymbols(iLoop->init.node))))
 	{
 	    return FALSE;
 	}
 	iLoop = iLoop->next;
     }
-    
+
     // We've now established that the initializer list contains only literal values.
-    
+
     iLoop = src->init.deep;
     while (iLoop)
     {
 	double val = AST_LIT_VALUE(iLoop->init.node);
-	
+
 	if (last && last->literalValue == val)
 	{
 	    last->count++;
@@ -228,7 +228,7 @@ copyIlist (initList * src)
 /*------------------------------------------------------------------*/
 /* list2int - converts the first element of the list to value       */
 /*------------------------------------------------------------------*/
-double 
+double
 list2int (initList * val)
 {
   initList *i = val;
@@ -268,7 +268,7 @@ list2expr (initList * ilist)
 /*------------------------------------------------------------------*/
 /* resolveIvalSym - resolve symbols in initial values               */
 /*------------------------------------------------------------------*/
-void 
+void
 resolveIvalSym (initList * ilist)
 {
   if (!ilist)
@@ -304,20 +304,24 @@ symbolVal (symbol * sym)
     }
 
   if (*sym->rname)
-    sprintf (val->name, "%s", sym->rname);
+    {
+	SNPRINTF (val->name, sizeof(val->name), "%s", sym->rname);
+    }
   else
-    sprintf (val->name, "_%s", sym->name);
-
+    {
+	SNPRINTF (val->name, sizeof(val->name), "_%s", sym->name);
+    }
 
   return val;
 }
 
+#if defined(REDUCE_LITERALS)
 /*--------------------------------------------------------------------*/
 /* cheapestVal - convert a val to the cheapest as possible value      */
 /*--------------------------------------------------------------------*/
-value *cheapestVal (value *val) {
-  long sval=0;
-  unsigned long uval=0;
+static value *cheapestVal (value *val) {
+  TYPE_DWORD  sval=0;
+  TYPE_UDWORD uval=0;
 
   if (IS_FLOAT(val->type) || IS_CHAR(val->type))
     return val;
@@ -339,7 +343,7 @@ value *cheapestVal (value *val) {
   if (SPEC_USIGN(val->type)) {
     if (uval<=0xffff) {
       SPEC_LONG(val->type)=0;
-      SPEC_CVAL(val->type).v_uint = uval;
+      SPEC_CVAL(val->type).v_uint = (TYPE_UWORD)uval;
       if (uval<=0xff) {
 	SPEC_NOUN(val->type)=V_CHAR;
       }
@@ -348,17 +352,16 @@ value *cheapestVal (value *val) {
     if (sval<0) {
       if (sval>=-32768) {
 	SPEC_LONG(val->type)=0;
-	SPEC_CVAL(val->type).v_int = sval;
+	SPEC_CVAL(val->type).v_int = (TYPE_WORD)sval;
 	if (sval>=-128) {
 	  SPEC_NOUN(val->type)=V_CHAR;
 	}
       }
     } else { // sval>=0
-      SPEC_USIGN(val->type)=1;
-      if (sval<=65535) {
+      if (sval<=32767) {
 	SPEC_LONG(val->type)=0;
-	SPEC_CVAL(val->type).v_int = sval;
-	if (sval<=255) {
+	SPEC_CVAL(val->type).v_int = (TYPE_WORD)sval;
+	if (sval<=127) {
 	  SPEC_NOUN(val->type)=V_CHAR;
 	}
       }
@@ -367,6 +370,44 @@ value *cheapestVal (value *val) {
   return val;
 }
 
+#else
+
+static value *cheapestVal (value *val)
+{
+  /* - signed/unsigned must not be changed.
+     - long must not be changed.
+
+     the only possible reduction is from signed int to signed char,
+     because it's automatically promoted back to signed int.
+
+     a reduction from unsigned int to unsigned char is a bug,
+     because an _unsigned_ char is promoted to _signed_ int! */
+  if (IS_INT(val->type) &&
+      !SPEC_USIGN(val->type) &&
+      !SPEC_LONG(val->type) &&
+      SPEC_CVAL(val->type).v_int >= -128 &&
+      SPEC_CVAL(val->type).v_int <=  127)
+
+    {
+      SPEC_NOUN(val->type) = V_CHAR;
+    }
+  /* this could be too aggressive:
+     'unsigned char' promotes to 'signed int', so that we can
+     reduce it the other way */
+  if (IS_INT(val->type) &&
+      !SPEC_USIGN(val->type) &&
+      !SPEC_LONG(val->type) &&
+      SPEC_CVAL(val->type).v_int >= 128 &&
+      SPEC_CVAL(val->type).v_int <= 255)
+
+    {
+      SPEC_NOUN(val->type) = V_CHAR;
+      SPEC_USIGN(val->type) = 1;
+    }
+  return (val);
+}
+#endif
+
 /*-----------------------------------------------------------------*/
 /* valueFromLit - creates a value from a literal                   */
 /*-----------------------------------------------------------------*/
@@ -375,13 +416,13 @@ valueFromLit (double lit)
 {
   char buffer[50];
 
-  if ((((long) lit) - lit) == 0)
+  if ((((TYPE_DWORD) lit) - lit) == 0)
     {
-      sprintf (buffer, "%ld", (long) lit);
+      SNPRINTF (buffer, sizeof(buffer), "%d", (TYPE_DWORD) lit);
       return constVal (buffer);
     }
 
-  sprintf (buffer, "%f", lit);
+  SNPRINTF (buffer, sizeof(buffer), "%f", lit);
   return constFloatVal (buffer);
 }
 
@@ -400,8 +441,7 @@ constFloatVal (char *s)
       return constVal ("0");
     }
 
-  val->type = val->etype = newLink ();
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink (SPECIFIER);
   SPEC_NOUN (val->type) = V_FLOAT;
   SPEC_SCLS (val->type) = S_LITERAL;
   SPEC_CVAL (val->type).v_float = sval;
@@ -422,12 +462,11 @@ value *constVal (char *s)
 
   val = newValue ();		/* alloc space for value   */
 
-  val->type = val->etype = newLink ();	/* create the spcifier */
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink (SPECIFIER);	/* create the spcifier */
   SPEC_SCLS (val->type) = S_LITERAL;
-  // let's start with an unsigned char
+  // let's start with a signed char
   SPEC_NOUN (val->type) = V_CHAR;
-  SPEC_USIGN (val->type) = 1;
+  SPEC_USIGN (val->type) = 0;
 
   hex = ((strchr (s, 'x') || strchr (s, 'X')) ? 1 : 0);
 
@@ -464,8 +503,12 @@ value *constVal (char *s)
     SPEC_LONG (val->type) = 1;
   }
 
+  /* set the unsigned flag if 'uU' is found */
+  if (strchr (s, 'u') || strchr (s, 'U')) {
+    SPEC_USIGN (val->type) = 1;
+  }
+
   if (dval<0) { // "-28u" will still be signed and negative
-    SPEC_USIGN (val->type) = 0;
     if (dval<-128) { // check if we have to promote to int
       SPEC_NOUN (val->type) = V_INT;
     }
@@ -473,34 +516,63 @@ value *constVal (char *s)
       SPEC_LONG (val->type) = 1;
     }
   } else { // >=0
-    if (dval>0xff) { // check if we have to promote to int
+    if (dval>0xff ||	/* check if we have to promote to int */
+        SPEC_USIGN (val->type)) { /* if it's unsigned, we can't use unsigned
+				     char. After an integral promotion it will
+				     be a signed int; this certainly isn't what
+				     the programer wants */
       SPEC_NOUN (val->type) = V_INT;
     }
-    if (dval>0xffff) { // check if we have to promote to long int
+    else if (dval>0x7f && !SPEC_USIGN (val->type)) { // check if we have to promote to int
+#if 0
+      if ((hex || octal) && /* hex or octal constants may be stored in unsigned type */
+          dval<=0xff) {
+        SPEC_USIGN (val->type) = 1;
+      } else {
+	SPEC_NOUN (val->type) = V_INT;
+      }
+#else
+      /* this is quite agressive: 'unsigned char' will be promoted to 'signed int',
+         so that the signedness of a char shouldn't matter */
+      SPEC_USIGN (val->type) = 1;
+#endif
+    }
+    if (dval>0xffff && SPEC_USIGN (val->type)) { // check if we have to promote to long
       SPEC_LONG (val->type) = 1;
     }
+    else if (dval>0x7fff && !SPEC_USIGN (val->type)) { // check if we have to promote to long int
+      if ((hex || octal) && /* hex or octal constants may be stored in unsigned type */
+          dval<=0xffff) {
+        SPEC_USIGN (val->type) = 1;
+      } else {
+        SPEC_LONG (val->type) = 1;
+        if (dval>0x7fffffff) {
+          SPEC_USIGN (val->type) = 1;
+	}
+      }
+    }
   }
 
   if (SPEC_LONG (val->type))
     {
       if (SPEC_USIGN (val->type))
         {
-          SPEC_CVAL (val->type).v_ulong = dval;
+          SPEC_CVAL (val->type).v_ulong = (TYPE_UDWORD)dval;
         }
       else
         {
-          SPEC_CVAL (val->type).v_long = dval;
+          SPEC_CVAL (val->type).v_long = (TYPE_DWORD)dval;
         }
     }
   else
     {
       if (SPEC_USIGN (val->type))
         {
-          SPEC_CVAL (val->type).v_uint = dval;
+          SPEC_CVAL (val->type).v_uint = (TYPE_UWORD)dval;
         }
       else
         {
-          SPEC_CVAL (val->type).v_int = dval;
+          SPEC_CVAL (val->type).v_int = (TYPE_WORD)dval;
         }
     }
 
@@ -516,7 +588,7 @@ unsigned char hexEscape(char **src)
 {
   char *s ;
   unsigned long value ;
-  
+
   (*src)++ ;	/* Skip over the 'x' */
   s = *src ;	/* Save for error detection */
   
@@ -662,10 +734,9 @@ strVal (char *s)
   val = newValue ();		/* get a new one */
 
   /* get a declarator */
-  val->type = newLink ();
+  val->type = newLink (DECLARATOR);
   DCL_TYPE (val->type) = ARRAY;
-  val->type->next = val->etype = newLink ();
-  val->etype->class = SPECIFIER;
+  val->type->next = val->etype = newLink (SPECIFIER);
   SPEC_NOUN (val->etype) = V_CHAR;
   SPEC_SCLS (val->etype) = S_LITERAL;
 
@@ -755,7 +826,7 @@ copyValue (value * src)
 
   dest = newValue ();
   dest->sym = copySymbol (src->sym);
-  strcpy (dest->name, src->name);
+  strncpyz (dest->name, src->name, SDCC_NAME_MAX);
   dest->type = (src->type ? copyLinkChain (src->type) : NULL);
   dest->etype = (src->type ? getSpec (dest->type) : NULL);
 
@@ -769,12 +840,10 @@ value *
 charVal (char *s)
 {
   value *val;
-//  unsigned uValue ;
 
   val = newValue ();
 
-  val->type = val->etype = newLink ();
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink (SPECIFIER);
   SPEC_NOUN (val->type) = V_CHAR;
   SPEC_USIGN(val->type) = 1;
   SPEC_SCLS (val->type) = S_LITERAL;
@@ -787,37 +856,37 @@ charVal (char *s)
       switch (*s)
 	{
 	case 'n':
-	  SPEC_CVAL (val->type).v_int = '\n';
+	  SPEC_CVAL (val->type).v_uint = '\n';
 	  break;
 	case 't':
-	  SPEC_CVAL (val->type).v_int = '\t';
+	  SPEC_CVAL (val->type).v_uint = '\t';
 	  break;
 	case 'v':
-	  SPEC_CVAL (val->type).v_int = '\v';
+	  SPEC_CVAL (val->type).v_uint = '\v';
 	  break;
 	case 'b':
-	  SPEC_CVAL (val->type).v_int = '\b';
+	  SPEC_CVAL (val->type).v_uint = '\b';
 	  break;
 	case 'r':
-	  SPEC_CVAL (val->type).v_int = '\r';
+	  SPEC_CVAL (val->type).v_uint = '\r';
 	  break;
 	case 'f':
-	  SPEC_CVAL (val->type).v_int = '\f';
+	  SPEC_CVAL (val->type).v_uint = '\f';
 	  break;
 	case 'a':
-	  SPEC_CVAL (val->type).v_int = '\a';
+	  SPEC_CVAL (val->type).v_uint = '\a';
 	  break;
 	case '\\':
-	  SPEC_CVAL (val->type).v_int = '\\';
+	  SPEC_CVAL (val->type).v_uint = '\\';
 	  break;
 	case '\?':
-	  SPEC_CVAL (val->type).v_int = '\?';
+	  SPEC_CVAL (val->type).v_uint = '\?';
 	  break;
 	case '\'':
-	  SPEC_CVAL (val->type).v_int = '\'';
+	  SPEC_CVAL (val->type).v_uint = '\'';
 	  break;
 	case '\"':
-	  SPEC_CVAL (val->type).v_int = '\"';
+	  SPEC_CVAL (val->type).v_uint = '\"';
 	  break;
 
 	case '0' :
@@ -861,7 +930,7 @@ valFromType (sym_link * type)
 /*------------------------------------------------------------------*/
 /* floatFromVal - value to double float conversion                  */
 /*------------------------------------------------------------------*/
-double 
+double
 floatFromVal (value * val)
 {
   if (!val)
@@ -888,13 +957,34 @@ floatFromVal (value * val)
       else
 	return (double) SPEC_CVAL (val->etype).v_long;
     }
-  
-  if (SPEC_USIGN (val->etype))
+
+  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;
+  }
+
+  if (SPEC_NOUN (val->etype) == 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 (IS_BITVAR(val->etype)) {
     return (double) SPEC_CVAL (val->etype).v_uint;
-  else
-    return (double) SPEC_CVAL (val->etype).v_int;
-}
+  }
+
+  if (SPEC_NOUN (val->etype) == V_VOID) {
+    return (double) SPEC_CVAL (val->etype).v_ulong;
+  }
 
+  // we are lost !
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
+	  "floatFromVal: unknown value");
+  return 0;
+}
 
 /*------------------------------------------------------------------*/
 /* valUnaryPM - does the unary +/- operation on a constant          */
@@ -924,6 +1014,12 @@ valUnaryPM (value * val)
     }
   // -(unsigned 3) now really is signed
   SPEC_USIGN(val->etype)=0;
+  // -(unsigned char)135 now really is an int
+  if (SPEC_NOUN(val->etype) == V_CHAR) {
+    if (SPEC_CVAL(val->etype).v_int < -128) {
+      SPEC_NOUN(val->etype) = V_INT;
+    }
+  }
   return val;
 }
 
@@ -948,6 +1044,8 @@ valComplement (value * val)
       else
 	SPEC_CVAL (val->etype).v_int = ~SPEC_CVAL (val->etype).v_int;
     }
+  // ~(unsigned 3) now really is signed
+  SPEC_USIGN(val->etype)=0;
   return val;
 }
 
@@ -985,29 +1083,40 @@ valMult (value * lval, value * rval)
 
   /* create a new value */
   val = newValue ();
-  val->type = val->etype = newLink ();
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink (SPECIFIER);
   SPEC_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
 			   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) = 1;
-
+  SPEC_SCLS  (val->type) = S_LITERAL;	/* will remain literal */
+  SPEC_LONG  (val->type) = (SPEC_LONG  (lval->etype) | SPEC_LONG  (rval->etype));
+  SPEC_USIGN (val->type) = SPEC_USIGN (computeType (lval->etype,
+						    rval->etype,
+						    TRUE));
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) * floatFromVal (rval);
-  else
+      /* signed and unsigned mul are the same, as long as the precision of the
+         result isn't bigger than the precision of the operands. */
+  else if (SPEC_LONG (val->type))
+    SPEC_CVAL (val->type).v_ulong = (TYPE_UDWORD) floatFromVal (lval) *
+	                            (TYPE_UDWORD) floatFromVal (rval);
+  else if (SPEC_USIGN (val->type)) /* unsigned int */
     {
-      if (SPEC_LONG (val->type))
-	{
-	  if (SPEC_USIGN (val->type))
-	    SPEC_CVAL (val->type).v_ulong = (unsigned long) floatFromVal (lval) *
-	      (unsigned long) floatFromVal (rval);
-	  else
-	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) *
-	      (long) floatFromVal (rval);
-	}
+      TYPE_UDWORD ul = (TYPE_UWORD) floatFromVal (lval) *
+                       (TYPE_UWORD) floatFromVal (rval);
+
+      SPEC_CVAL (val->type).v_uint = (TYPE_UWORD) ul;
+      if (ul != (TYPE_UWORD) ul)
+        werror (W_INT_OVL);
     }
-  return cheapestVal(val);
+  else /* signed int */
+    {
+      TYPE_DWORD l = (TYPE_WORD) floatFromVal (lval) *
+                     (TYPE_WORD) floatFromVal (rval);
+
+      SPEC_CVAL (val->type).v_int = (TYPE_WORD) l;
+      if (l != (TYPE_WORD) l)
+        werror (W_INT_OVL);
+    }
+  return cheapestVal (val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1026,40 +1135,36 @@ valDiv (value * lval, value * rval)
 
   /* create a new value */
   val = newValue ();
-  val->type = val->etype = newLink();
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink(SPECIFIER);
   SPEC_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
 			   IS_FLOAT (rval->etype) ? V_FLOAT : V_INT);
   SPEC_SCLS (val->etype) = S_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) = (SPEC_LONG  (lval->etype) | SPEC_LONG  (rval->etype));
+  SPEC_USIGN (val->type) = SPEC_USIGN (computeType (lval->etype,
+						    rval->etype,
+						    TRUE));
 
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) / floatFromVal (rval);
+  else if (SPEC_LONG (val->type))
+    {
+      if (SPEC_USIGN (val->type))
+	SPEC_CVAL (val->type).v_ulong = (TYPE_UDWORD) floatFromVal (lval) /
+	  (TYPE_UDWORD) floatFromVal (rval);
+      else
+	SPEC_CVAL (val->type).v_long = (TYPE_DWORD) floatFromVal (lval) /
+	  (TYPE_DWORD) floatFromVal (rval);
+    }
   else
     {
-      if (SPEC_LONG (val->type))
-	{
-	  if (SPEC_USIGN (val->type))
-	    SPEC_CVAL (val->type).v_ulong = 
-	      (unsigned long) floatFromVal (lval) /
-	      (unsigned long) floatFromVal (rval);
-	  else
-	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) /
-	      (long) floatFromVal (rval);
-	}
+      if (SPEC_USIGN (val->type))
+        SPEC_CVAL (val->type).v_uint = (TYPE_UWORD) floatFromVal (lval) /
+          (TYPE_UWORD) 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);
-	  }
-	}
+        SPEC_CVAL (val->type).v_int = (TYPE_WORD) floatFromVal (lval) /
+          (TYPE_WORD) floatFromVal (rval);
     }
-  return cheapestVal(val);
+  return cheapestVal (val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1072,34 +1177,33 @@ valMod (value * lval, value * rval)
 
   /* create a new value */
   val = newValue ();
-  val->type = val->etype = newLink ();
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink (SPECIFIER);
   SPEC_NOUN (val->type) = V_INT;	/* type is 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) = (SPEC_LONG  (lval->etype) | SPEC_LONG  (rval->etype));
+  SPEC_USIGN (val->type) = SPEC_USIGN (computeType (lval->etype,
+						    rval->etype,
+						    TRUE));
 
   if (SPEC_LONG (val->type))
     {
       if (SPEC_USIGN (val->type))
-	SPEC_CVAL (val->type).v_ulong = (unsigned long) floatFromVal (lval) %
-	  (unsigned long) floatFromVal (rval);
+	SPEC_CVAL (val->type).v_ulong = (TYPE_UDWORD) floatFromVal (lval) %
+	  (TYPE_UDWORD) floatFromVal (rval);
       else
-	SPEC_CVAL (val->type).v_long = (unsigned long) floatFromVal (lval) %
-	  (unsigned long) floatFromVal (rval);
+	SPEC_CVAL (val->type).v_long = (TYPE_DWORD) floatFromVal (lval) %
+	  (TYPE_DWORD) 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 = (unsigned) floatFromVal (lval) %
-	  (unsigned) floatFromVal (rval);
-      }
+      if (SPEC_USIGN (val->type))
+        SPEC_CVAL (val->type).v_uint = (TYPE_UWORD) floatFromVal (lval) %
+          (TYPE_UWORD) floatFromVal (rval);
+      else
+        SPEC_CVAL (val->type).v_int = (TYPE_WORD) floatFromVal (lval) %
+          (TYPE_WORD) floatFromVal (rval);
     }
-
-  return cheapestVal(val);
+  return cheapestVal (val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1112,33 +1216,35 @@ valPlus (value * lval, value * rval)
 
   /* create a new value */
   val = newValue ();
-  val->type = val->etype = newLink ();
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink (SPECIFIER);
   SPEC_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
 			   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) &&
-    (floatFromVal(lval)+floatFromVal(rval))>=0;
-    
-  SPEC_LONG (val->type) = 1;
-
+  SPEC_SCLS  (val->type) = S_LITERAL;	/* will remain literal */
+  SPEC_LONG  (val->type) = (SPEC_LONG  (lval->etype) | SPEC_LONG  (rval->etype));
+  SPEC_USIGN (val->type) = SPEC_USIGN (computeType (lval->etype,
+						    rval->etype,
+						    TRUE));
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) + floatFromVal (rval);
+  else  if (SPEC_LONG (val->type))
+    {
+      if (SPEC_USIGN (val->type))
+        SPEC_CVAL (val->type).v_ulong = (TYPE_UDWORD) floatFromVal (lval) +
+         (TYPE_UDWORD) floatFromVal (rval);
+      else
+        SPEC_CVAL (val->type).v_long = (TYPE_DWORD) floatFromVal (lval) +
+          (TYPE_DWORD) floatFromVal (rval);
+    }
   else
     {
-      if (SPEC_LONG (val->type))
-	{
-	  if (SPEC_USIGN (val->type))
-	    SPEC_CVAL (val->type).v_ulong = (unsigned long) floatFromVal (lval) +
-	      (unsigned long) floatFromVal (rval);
-	  else
-	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) +
-	      (long) floatFromVal (rval);
-	}
+      if (SPEC_USIGN (val->type))
+        SPEC_CVAL (val->type).v_uint = (TYPE_UWORD) floatFromVal (lval) +
+          (TYPE_UWORD) floatFromVal (rval);
+      else
+        SPEC_CVAL (val->type).v_int = (TYPE_WORD) floatFromVal (lval) +
+          (TYPE_WORD) floatFromVal (rval);
     }
-  return cheapestVal(val);
+  return cheapestVal (val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1151,45 +1257,35 @@ valMinus (value * lval, value * rval)
 
   /* create a new value */
   val = newValue ();
-  val->type = val->etype = newLink ();
-  val->type->class = SPECIFIER;
+  val->type = val->etype = newLink (SPECIFIER);
   SPEC_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
 			   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) &&
-    (floatFromVal(lval)-floatFromVal(rval))>=0;
-
-  SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
-
+  SPEC_LONG  (val->type) = (SPEC_LONG  (lval->etype) | SPEC_LONG  (rval->etype));
+  SPEC_USIGN (val->type) = SPEC_USIGN (computeType (lval->etype,
+						    rval->etype,
+						    FALSE));
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) - floatFromVal (rval);
-  else
+  else  if (SPEC_LONG (val->type))
     {
-      if (SPEC_LONG (val->type))
-	{
-	  if (SPEC_USIGN (val->type)) {
-	    SPEC_CVAL (val->type).v_ulong = 
-	      (unsigned long) floatFromVal (lval) -
-	      (unsigned long) floatFromVal (rval);
-	  } else {
-	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) -
-	      (long) floatFromVal (rval);
-	  }
-	}
+      if (SPEC_USIGN (val->type))
+        SPEC_CVAL (val->type).v_ulong = (TYPE_UDWORD) floatFromVal (lval) -
+          (TYPE_UDWORD) 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);
-	  }
-	}
+        SPEC_CVAL (val->type).v_long = (TYPE_DWORD) floatFromVal (lval) -
+          (TYPE_DWORD) floatFromVal (rval);
     }
-  return cheapestVal(val);
+  else
+   {
+     if (SPEC_USIGN (val->type))
+       SPEC_CVAL (val->type).v_uint = (TYPE_UWORD) floatFromVal (lval) -
+         (TYPE_UWORD) floatFromVal (rval);
+     else
+       SPEC_CVAL (val->type).v_int = (TYPE_WORD) floatFromVal (lval) -
+         (TYPE_WORD) floatFromVal (rval);
+    }
+  return cheapestVal (val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1204,22 +1300,52 @@ valShift (value * lval, value * rval, int lr)
   val = newValue ();
   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) = 1;
+  SPEC_NOUN  (val->etype) = V_INT;
+  /* 'unsigned char' promotes to 'signed int' */
+  if (!IS_CHAR (lval->etype))
+    SPEC_USIGN (val->type) = SPEC_USIGN (lval->etype);
+  SPEC_LONG (val->type) = SPEC_LONG (lval->etype);
+
+  if (getSize (lval->type) * 8 <= (TYPE_UDWORD) floatFromVal (rval) &&
+       /* left shift */
+      (lr ||
+	/* right shift and unsigned */
+       (!lr && SPEC_USIGN (rval->type))))
+    {
+      werror (W_SHIFT_CHANGED, (lr ? "left" : "right"));
+    }
 
   if (SPEC_LONG (val->type))
     {
       if (SPEC_USIGN (val->type))
-	SPEC_CVAL (val->type).v_ulong = lr ? 
-	  (unsigned long) floatFromVal (lval) << (unsigned long) floatFromVal (rval) : \
-	  (unsigned long) floatFromVal (lval) >> (unsigned long) floatFromVal (rval);
+        {
+          SPEC_CVAL (val->type).v_ulong = lr ?
+	    (TYPE_UDWORD) floatFromVal (lval) << (TYPE_UWORD) floatFromVal (rval) : \
+	    (TYPE_UDWORD) floatFromVal (lval) >> (TYPE_UWORD) floatFromVal (rval);
+        }
+      else
+        {
+          SPEC_CVAL (val->type).v_long = lr ?
+	    (TYPE_DWORD) floatFromVal (lval) << (TYPE_UWORD) floatFromVal (rval) : \
+	    (TYPE_DWORD) floatFromVal (lval) >> (TYPE_UWORD) floatFromVal (rval);
+        }
+    }
+  else
+    {
+      if (SPEC_USIGN (val->type))
+        {
+          SPEC_CVAL (val->type).v_uint = lr ?
+	    (TYPE_UWORD) floatFromVal (lval) << (TYPE_UWORD) floatFromVal (rval) : \
+	    (TYPE_UWORD) floatFromVal (lval) >> (TYPE_UWORD) floatFromVal (rval);
+        }
       else
-	SPEC_CVAL (val->type).v_long = lr ?
-	  (long) floatFromVal (lval) << (long) floatFromVal (rval) : \
-	  (long) floatFromVal (lval) >> (long) floatFromVal (rval);
+        {
+          SPEC_CVAL (val->type).v_int = lr ?
+	    (TYPE_WORD) floatFromVal (lval) << (TYPE_UWORD) floatFromVal (rval) : \
+	    (TYPE_WORD) floatFromVal (lval) >> (TYPE_UWORD) floatFromVal (rval);
+        }
     }
-
-  return cheapestVal(val);
+  return cheapestVal (val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1257,11 +1383,58 @@ valCompare (value * lval, value * rval, int ctype)
       break;
 
     case EQ_OP:
-      SPEC_CVAL (val->type).v_int = floatFromVal (lval) == floatFromVal (rval);
+      if (SPEC_NOUN(lval->type) == V_FLOAT ||
+	  SPEC_NOUN(rval->type) == V_FLOAT)
+	{
+	  SPEC_CVAL (val->type).v_int = floatFromVal (lval) == floatFromVal (rval);
+	}
+      else
+	{
+	  /* integrals: ignore signedness */
+	  TYPE_UDWORD l, r;
+
+	  l = (TYPE_UDWORD) floatFromVal (lval);
+	  r = (TYPE_UDWORD) floatFromVal (rval);
+	  /* In order to correctly compare 'signed int' and 'unsigned int' it's
+	     neccessary to strip them to 16 bit.
+	     Literals are reduced to their cheapest type, therefore left and
+	     right might have different types. It's neccessary to find a
+	     common type: int (used for char too) or long */
+	  if (!IS_LONG (lval->etype) &&
+	      !IS_LONG (rval->etype))
+	    {
+	      r = (TYPE_UWORD) r;
+	      l = (TYPE_UWORD) l;
+	    }
+	  SPEC_CVAL (val->type).v_int = l == r;
+	}
       break;
-
     case NE_OP:
-      SPEC_CVAL (val->type).v_int = floatFromVal (lval) != floatFromVal (rval);
+      if (SPEC_NOUN(lval->type) == V_FLOAT ||
+	  SPEC_NOUN(rval->type) == V_FLOAT)
+	{
+	  SPEC_CVAL (val->type).v_int = floatFromVal (lval) != floatFromVal (rval);
+	}
+      else
+	{
+	  /* integrals: ignore signedness */
+	  TYPE_UDWORD l, r;
+
+	  l = (TYPE_UDWORD) floatFromVal (lval);
+	  r = (TYPE_UDWORD) floatFromVal (rval);
+	  /* In order to correctly compare 'signed int' and 'unsigned int' it's
+	     neccessary to strip them to 16 bit.
+	     Literals are reduced to their cheapest type, therefore left and
+	     right might have different types. It's neccessary to find a
+	     common type: int (used for char too) or long */
+	  if (!IS_LONG (lval->etype) &&
+	      !IS_LONG (rval->etype))
+	    {
+	      r = (TYPE_UWORD) r;
+	      l = (TYPE_UWORD) l;
+	    }
+	  SPEC_CVAL (val->type).v_int = l != r;
+	}
       break;
 
     }
@@ -1279,7 +1452,8 @@ valBitwise (value * lval, value * rval, int op)
 
   /* create a new value */
   val = newValue ();
-  val->type = copyLinkChain (lval->type);
+  val->type = copyLinkChain (getSize(rval->type) > getSize(lval->type) ?
+			     rval->type : lval->type);
   val->etype = getSpec (val->type);
 
   switch (op)
@@ -1388,6 +1562,7 @@ value *
 valCastLiteral (sym_link * dtype, double fval)
 {
   value *val;
+  TYPE_UDWORD l = (TYPE_UDWORD)fval;
 
   if (!dtype)
     return NULL;
@@ -1395,27 +1570,32 @@ valCastLiteral (sym_link * dtype, double fval)
   val = newValue ();
   val->etype = getSpec (val->type = copyLinkChain (dtype));
   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)) {
-      SPEC_CVAL (val->etype).v_ulong = (unsigned long) fval;
+      SPEC_CVAL (val->etype).v_ulong = l;
       return val;
   }
 
   if (SPEC_NOUN (val->etype) == V_FLOAT)
       SPEC_CVAL (val->etype).v_float = fval;
-  else {
-      unsigned long l = fval;
+  else if (SPEC_NOUN (val->etype) == V_CHAR) {
+      if (SPEC_USIGN (val->etype))
+	  SPEC_CVAL (val->etype).v_uint= (TYPE_UBYTE) l;
+      else
+	  SPEC_CVAL (val->etype).v_int = (TYPE_BYTE) l;
+  } else {
       if (SPEC_LONG (val->etype)) {
 	  if (SPEC_USIGN (val->etype))
-	      SPEC_CVAL (val->etype).v_ulong = (unsigned long) l;
+	      SPEC_CVAL (val->etype).v_ulong = (TYPE_UDWORD) l;
 	  else
-	      SPEC_CVAL (val->etype).v_long = (long) l;
+	      SPEC_CVAL (val->etype).v_long = (TYPE_DWORD) l;
       } else {
 	  if (SPEC_USIGN (val->etype))
-	      SPEC_CVAL (val->etype).v_uint = (unsigned short)l;
+	      SPEC_CVAL (val->etype).v_uint = (TYPE_UWORD)l;
 	  else
-	      SPEC_CVAL (val->etype).v_int = (short)l;
+	      SPEC_CVAL (val->etype).v_int = (TYPE_WORD)l;
       }
   }
   return val;
@@ -1424,10 +1604,9 @@ valCastLiteral (sym_link * dtype, double fval)
 /*------------------------------------------------------------------*/
 /* getNelements - determines # of elements from init list           */
 /*------------------------------------------------------------------*/
-int 
+int
 getNelements (sym_link * type, initList * ilist)
 {
-  sym_link *etype = getSpec (type);
   int i;
 
   if (!ilist)
@@ -1438,13 +1617,13 @@ getNelements (sym_link * type, initList * ilist)
 
   /* if type is a character array and there is only one
      (string) initialiser then get the length of the string */
-  if (IS_ARRAY (type) && IS_CHAR (etype) && !ilist->next)
+  if (IS_ARRAY (type) && IS_CHAR (type->next) && !ilist->next)
     {
       ast *iast = ilist->init.node;
       value *v = (iast->type == EX_VALUE ? iast->opval.val : NULL);
       if (!v)
 	{
-	  werror (W_INIT_WRONG);
+	  werror (E_CONST_EXPECTED);
 	  return 0;
 	}
 
@@ -1461,7 +1640,6 @@ getNelements (sym_link * type, initList * ilist)
       i++;
       ilist = ilist->next;
     }
-
   return i;
 }
 
@@ -1499,19 +1677,20 @@ valForArray (ast * arrExpr)
 
   val = newValue ();
   if (!lval)
-    sprintf (buffer, "%s", AST_SYMBOL (arrExpr->left)->rname);
+    {
+	SNPRINTF (buffer, sizeof(buffer), "%s", AST_SYMBOL (arrExpr->left)->rname);
+    }
   else
-    sprintf (buffer, "%s", lval->name);
+    {
+	SNPRINTF (buffer, sizeof(buffer), "%s", lval->name);
+    }
 
-  sprintf (val->name, "(%s + %d)", buffer,
+  SNPRINTF (val->name, sizeof(val->name), "(%s + %d)", buffer,
 	   (int) AST_LIT_VALUE (arrExpr->right) * size);
 
-  val->type = newLink ();
+  val->type = newLink (DECLARATOR);
   if (SPEC_SCLS (arrExpr->left->etype) == S_CODE)
-    {
-      DCL_TYPE (val->type) = CPOINTER;
-      DCL_PTR_CONST (val->type) = port->mem.code_ro;
-    }
+    DCL_TYPE (val->type) = CPOINTER;
   else if (SPEC_SCLS (arrExpr->left->etype) == S_XDATA)
     DCL_TYPE (val->type) = FPOINTER;
   else if (SPEC_SCLS (arrExpr->left->etype) == S_XSTACK)
@@ -1566,19 +1745,20 @@ valForStructElem (ast * structT, ast * elemT)
 
   val = newValue ();
   if (!lval)
-    sprintf (buffer, "%s", AST_SYMBOL (structT)->rname);
+    {
+	SNPRINTF(buffer, sizeof(buffer), "%s", AST_SYMBOL (structT)->rname);
+    }
   else
-    sprintf (buffer, "%s", lval->name);
+    {
+	SNPRINTF (buffer, sizeof(buffer), "%s", lval->name);
+    }
 
-  sprintf (val->name, "(%s + %d)", buffer,
+  SNPRINTF (val->name, sizeof(val->name), "(%s + %d)", buffer,
 	   (int) sym->offset);
 
-  val->type = newLink ();
+  val->type = newLink (DECLARATOR);
   if (SPEC_SCLS (structT->etype) == S_CODE)
-    {
-      DCL_TYPE (val->type) = CPOINTER;
-      DCL_PTR_CONST (val->type) = port->mem.code_ro;
-    }
+    DCL_TYPE (val->type) = CPOINTER;
   else if (SPEC_SCLS (structT->etype) == S_XDATA)
     DCL_TYPE (val->type) = FPOINTER;
   else if (SPEC_SCLS (structT->etype) == S_XSTACK)
@@ -1610,7 +1790,7 @@ valForCastAggr (ast * aexpr, sym_link * type, ast * cnst, int op)
 
   val = newValue ();
 
-  sprintf (val->name, "(%s %c %d)",
+  SNPRINTF (val->name, sizeof(val->name), "(%s %c %d)",
 	   AST_SYMBOL (aexpr)->rname, op,
 	   getSize (type->next) * (int) AST_LIT_VALUE (cnst));
 
@@ -1633,7 +1813,7 @@ valForCastArr (ast * aexpr, sym_link * type)
 
   val = newValue ();
 
-  sprintf (val->name, "(%s)",
+  SNPRINTF (val->name, sizeof(val->name), "(%s)",
 	   AST_SYMBOL (aexpr)->rname);
 
   val->type = type;