X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCval.c;h=59cb58726ea60b3de136a709c625dc62848d7fef;hb=9f034219c943bb8ba958efaa6258c8f220633c17;hp=8871a531f3c7df3840316397adfe8befce3bebca;hpb=0ca01d6d24b37a1700686f8f7691fe88510ca9b8;p=fw%2Fsdcc

diff --git a/src/SDCCval.c b/src/SDCCval.c
index 8871a531..59cb5872 100644
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -39,7 +39,7 @@ newValue ()
 {
   value *val;
 
-  val = Safe_calloc (1, sizeof (value));
+  val = Safe_alloc (sizeof (value));
 
   return val;
 }
@@ -53,7 +53,7 @@ newiList (int type, void *ilist)
   initList *nilist;
 
 
-  nilist = Safe_calloc (1, sizeof (initList));
+  nilist = Safe_alloc (sizeof (initList));
 
   nilist->type = type;
   nilist->lineno = yylineno;
@@ -97,6 +97,107 @@ revinit (initList * val)
   return prev;
 }
 
+bool
+convertIListToConstList(initList *src, literalList **lList)
+{
+    initList    *iLoop;
+    literalList *head, *last, *newL;
+    
+    head = last = NULL;
+    
+    if (!src || src->type != INIT_DEEP)
+    {
+	return FALSE;
+    }
+    
+    iLoop =  src->init.deep;
+    
+    while (iLoop)
+    {
+	if (iLoop->type != INIT_NODE)
+	{
+	    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++;
+	}
+	else
+	{
+	    newL = Safe_alloc(sizeof(literalList));
+	    newL->literalValue = val;
+	    newL->count = 1;
+	    newL->next = NULL;
+	    
+	    if (last)
+	    {
+		last->next = newL;
+	    }
+	    else
+	    {
+		head = newL;
+	    }
+	    last = newL;
+	}
+	iLoop = iLoop->next;
+    }
+    
+    if (!head)    
+    {
+	return FALSE;
+    }
+    
+    *lList = head;
+    return TRUE;
+}
+
+literalList *
+copyLiteralList(literalList *src)
+{
+    literalList *head, *prev, *newL;
+    
+    head = prev = NULL;
+    
+    while (src)
+    {
+	newL = Safe_alloc(sizeof(literalList));
+	
+	newL->literalValue = src->literalValue;
+	newL->count = src->count;
+	newL->next = NULL;
+	
+	if (prev)
+	{
+	    prev->next = newL;
+	}
+	else
+	{
+	    head = newL;
+	}
+	prev = newL;
+	src = src->next;
+    }
+    
+    return head;
+}
+
+
+
 /*------------------------------------------------------------------*/
 /* copyIlist - copy initializer list            */
 /*------------------------------------------------------------------*/
@@ -211,11 +312,66 @@ symbolVal (symbol * sym)
   return val;
 }
 
+/*--------------------------------------------------------------------*/
+/* cheapestVal - convert a val to the cheapest as possible value      */
+/*--------------------------------------------------------------------*/
+value *cheapestVal (value *val) {
+  long sval=0;
+  unsigned long uval=0;
+
+  if (IS_FLOAT(val->type) || IS_CHAR(val->type))
+    return val;
+
+  if (SPEC_LONG(val->type)) {
+    if (SPEC_USIGN(val->type)) {
+      uval=SPEC_CVAL(val->type).v_ulong;
+    } else {
+      sval=SPEC_CVAL(val->type).v_long;
+    }
+  } else {
+    if (SPEC_USIGN(val->type)) {
+      uval=SPEC_CVAL(val->type).v_uint;
+    } else {
+      sval=SPEC_CVAL(val->type).v_int;
+    }
+  }
+
+  if (SPEC_USIGN(val->type)) {
+    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 { // not unsigned
+    if (sval<0) {
+      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 { // 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;
+	}
+      }
+    }
+  }
+  return val;
+}
+
 /*-----------------------------------------------------------------*/
 /* valueFromLit - creates a value from a literal                   */
 /*-----------------------------------------------------------------*/
 value *
-valueFromLit (float lit)
+valueFromLit (double lit)
 {
   char buffer[50];
 
@@ -236,9 +392,9 @@ value *
 constFloatVal (char *s)
 {
   value *val = newValue ();
-  float sval;
+  double sval;
 
-  if (sscanf (s, "%f", &sval) != 1)
+  if (sscanf (s, "%lf", &sval) != 1)
     {
       werror (E_INVALID_FLOAT_CONST, s);
       return constVal ("0");
@@ -254,31 +410,24 @@ constFloatVal (char *s)
 }
 
 /*-----------------------------------------------------------------*/
-/* constVal - converts a INTEGER constant into a value       */
+/* constVal - converts an INTEGER constant into a cheapest value   */
 /*-----------------------------------------------------------------*/
-value *
-constVal (char *s)
+value *constVal (char *s)
 {
   value *val;
   short hex = 0, octal = 0;
   char scanFmt[10];
   int scI = 0;
-  unsigned long sval;
+  double dval;
 
   val = newValue ();		/* alloc space for value   */
 
   val->type = val->etype = newLink ();	/* create the spcifier */
   val->type->class = SPECIFIER;
-  SPEC_NOUN (val->type) = V_INT;
   SPEC_SCLS (val->type) = S_LITERAL;
-
-  /* set the _unsigned flag if 'uU' found */
-  if (strchr (s, 'u') || strchr (s, 'U'))
-    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;
+  // let's start with an unsigned char
+  SPEC_NOUN (val->type) = V_CHAR;
+  SPEC_USIGN (val->type) = 1;
 
   hex = ((strchr (s, 'x') || strchr (s, 'X')) ? 1 : 0);
 
@@ -289,49 +438,99 @@ constVal (char *s)
   /* create the scan string */
   scanFmt[scI++] = '%';
 
+  scanFmt[scI++] = 'l';
+
   if (octal)
     scanFmt[scI++] = 'o';
   else if (hex)
     scanFmt[scI++] = 'x';
-  else if (SPEC_USIGN (val->type))
-    scanFmt[scI++] = 'u';
   else
-    scanFmt[scI++] = 'd';
+    scanFmt[scI++] = 'f';
 
   scanFmt[scI++] = '\0';
 
-  /* if hex or octal then set the unsigned flag   */
-  if (hex || octal)
-    {
-      SPEC_USIGN (val->type) = 1;
-      sscanf (s, scanFmt, &sval);
-    }
-  else
-    sval = atol (s);
+  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 (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;
+    }
+    if (dval<-32768) { // check if we have to promote to long int
+      SPEC_LONG (val->type) = 1;
+    }
+  } 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;
+    }
+  }
 
-  if (SPEC_LONG (val->type) || sval > 32768)
+  if (SPEC_LONG (val->type))
     {
       if (SPEC_USIGN (val->type))
-	SPEC_CVAL (val->type).v_ulong = sval;
+        {
+          SPEC_CVAL (val->type).v_ulong = dval;
+        }
       else
-	SPEC_CVAL (val->type).v_long = sval;
-      SPEC_LONG (val->type) = 1;
+        {
+          SPEC_CVAL (val->type).v_long = dval;
+        }
     }
   else
     {
       if (SPEC_USIGN (val->type))
-	SPEC_CVAL (val->type).v_uint = sval;
+        {
+          SPEC_CVAL (val->type).v_uint = dval;
+        }
       else
-	SPEC_CVAL (val->type).v_int = sval;
+        {
+          SPEC_CVAL (val->type).v_int = dval;
+        }
     }
 
-  // check the size and make it a short if required
-  if (sval < 256)
-    SPEC_SHORT (val->etype) = 1;
-
   return val;
+}
+
+/*! /fn char hexEscape(char **src)
+
+    /param src Pointer to 'x' from start of hex character value
+*/
 
+unsigned char hexEscape(char **src)
+{
+  char *s ;
+  unsigned long value ;
+  
+  (*src)++ ;	/* Skip over the 'x' */
+  s = *src ;	/* Save for error detection */
+  
+  value = strtol (*src, src, 16);
+  
+  if (s == *src) {
+      // no valid hex found
+      werror(E_INVALID_HEX);
+  } else {
+    if (value > 255) {
+      werror(W_ESC_SEQ_OOR_FOR_CHAR);
+    }
+  }
+  return (char) value;
 }
 
 /*------------------------------------------------------------------*/
@@ -340,7 +539,7 @@ constVal (char *s)
 /* adjust src to point at the last proccesed char                   */
 /*------------------------------------------------------------------*/
 
-char octalEscape (char **str) {
+unsigned char octalEscape (char **str) {
   int digits;
   unsigned value=0;
 
@@ -356,17 +555,28 @@ char octalEscape (char **str) {
     if (value > 255 /* || (**str>='0' && **str<='7') */ ) {
       werror (W_ESC_SEQ_OOR_FOR_CHAR);
     }
-    (*str)--;
   }
   return value;
 }
 
-/*------------------------------------------------------------------*/
-/* copyStr - copies src to dest ignoring leading & trailing \"s     */
-/*------------------------------------------------------------------*/
-void 
+/*! 
+  /fn int copyStr (char *dest, char *src)
+  
+  Copies a source string to a dest buffer interpreting escape sequences
+  and special characters
+
+  /param dest Buffer to receive the resultant string
+  /param src  Buffer containing the source string with escape sequecnes
+  /return Number of characters in output string
+
+*/
+
+int 
 copyStr (char *dest, char *src)
+
 {
+  char *OriginalDest = dest ;
+
   while (*src)
     {
       if (*src == '\"')
@@ -407,25 +617,13 @@ copyStr (char *dest, char *src)
 	    case '6':
 	    case '7':
 	      *dest++ = octalEscape(&src);
+	      src-- ;
 	      break;
 
-	    case 'x': {
-	      char *s=++src;
-	      unsigned long value=strtol (src, &src, 16);
-
-	      if (s==src) {
-		// no valid hex found
-		werror(E_INVALID_HEX);
-	      } else {
-		if (value>255) {
-		  werror(W_ESC_SEQ_OOR_FOR_CHAR);
-		} else {
-		  *dest++ = value;
-		}
-		src--;
-	      }
-	      break;
-	    }
+	    case 'x': 
+	      *dest++ = hexEscape(&src) ;
+	      src-- ;
+	      break ;
 
 	    case '\\':
 	      *dest++ = '\\';
@@ -448,7 +646,9 @@ copyStr (char *dest, char *src)
 	*dest++ = *src++;
     }
 
-  *dest = '\0';
+  *dest++ = '\0';
+
+  return dest - OriginalDest ;
 }
 
 /*------------------------------------------------------------------*/
@@ -464,14 +664,14 @@ strVal (char *s)
   /* get a declarator */
   val->type = newLink ();
   DCL_TYPE (val->type) = ARRAY;
-  DCL_ELEM (val->type) = strlen (s) - 1;
   val->type->next = val->etype = newLink ();
   val->etype->class = SPECIFIER;
   SPEC_NOUN (val->etype) = V_CHAR;
   SPEC_SCLS (val->etype) = S_LITERAL;
 
-  SPEC_CVAL (val->etype).v_char = Safe_calloc (1, strlen (s) + 1);
-  copyStr (SPEC_CVAL (val->etype).v_char, s);
+  SPEC_CVAL (val->etype).v_char = Safe_alloc (strlen (s) + 1);
+  DCL_ELEM (val->type) = copyStr (SPEC_CVAL (val->etype).v_char, s);
+
   return val;
 }
 
@@ -546,7 +746,7 @@ copyValueChain (value * src)
 }
 
 /*------------------------------------------------------------------*/
-/* copyValue - copies contents of a vlue to a fresh one             */
+/* copyValue - copies contents of a value to a fresh one            */
 /*------------------------------------------------------------------*/
 value *
 copyValue (value * src)
@@ -569,12 +769,14 @@ value *
 charVal (char *s)
 {
   value *val;
+//  unsigned uValue ;
 
   val = newValue ();
 
   val->type = val->etype = newLink ();
   val->type->class = SPECIFIER;
   SPEC_NOUN (val->type) = V_CHAR;
+  SPEC_USIGN(val->type) = 1;
   SPEC_SCLS (val->type) = S_LITERAL;
 
   s++;				/* get rid of quotation */
@@ -617,20 +819,29 @@ charVal (char *s)
 	case '\"':
 	  SPEC_CVAL (val->type).v_int = '\"';
 	  break;
-	case '0':
-	  sscanf (s, "%o", &SPEC_CVAL (val->type).v_int);
+
+	case '0' :
+	case '1' :
+	case '2' :
+	case '3' :
+	case '4' :
+	case '5' :
+	case '6' :
+	case '7' :
+	  SPEC_CVAL (val->type).v_uint = octalEscape(&s);
 	  break;
+
 	case 'x':
-	  s++;			/* go behond the 'x' */
-	  sscanf (s, "%x", &SPEC_CVAL (val->type).v_int);
+	  SPEC_CVAL (val->type).v_uint = hexEscape(&s) ;
 	  break;
+
 	default:
-	  SPEC_CVAL (val->type).v_int = *s;
+	  SPEC_CVAL (val->type).v_uint = (unsigned char)*s;
 	  break;
 	}
     }
   else				/* not a backslash */
-    SPEC_CVAL (val->type).v_int = *s;
+    SPEC_CVAL (val->type).v_uint = (unsigned char)*s;
 
   return val;
 }
@@ -648,7 +859,7 @@ valFromType (sym_link * type)
 }
 
 /*------------------------------------------------------------------*/
-/* floatFromVal - value to unsinged integer conversion        */
+/* floatFromVal - value to double float conversion                  */
 /*------------------------------------------------------------------*/
 double 
 floatFromVal (value * val)
@@ -669,28 +880,42 @@ 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;
+  }
+
+  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_ulong;
+  }
+
+  // we are lost !
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
+	  "floatFromVal: unknown value");
+  return 0;
 }
 
 
 /*------------------------------------------------------------------*/
-/* valUnaryPM - dones the unary +/- operation on a constant         */
+/* valUnaryPM - does the unary +/- operation on a constant          */
 /*------------------------------------------------------------------*/
 value *
 valUnaryPM (value * val)
@@ -715,8 +940,9 @@ valUnaryPM (value * val)
 	    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;
-
 }
 
 /*------------------------------------------------------------------*/
@@ -782,8 +1008,8 @@ valMult (value * lval, value * rval)
   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) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+  SPEC_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
+  SPEC_LONG (val->type) = 1;
 
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) * floatFromVal (rval);
@@ -798,17 +1024,8 @@ 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 val;
+  return cheapestVal(val);
 }
 
 /*------------------------------------------------------------------*/
@@ -827,12 +1044,12 @@ valDiv (value * lval, value * rval)
 
   /* create a new value */
   val = newValue ();
-  val->type = val->etype = ((floatFromVal (lval) / floatFromVal (rval)) < 256 ?
-			    newCharLink () : newIntLink ());
-  if (IS_FLOAT (lval->etype) || IS_FLOAT (rval->etype))
-    SPEC_NOUN (val->etype) = V_FLOAT;
+  val->type = val->etype = newLink();
+  val->type->class = 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_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
   SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
 
   if (IS_FLOAT (val->type))
@@ -842,7 +1059,8 @@ valDiv (value * lval, value * rval)
       if (SPEC_LONG (val->type))
 	{
 	  if (SPEC_USIGN (val->type))
-	    SPEC_CVAL (val->type).v_ulong = (unsigned long) floatFromVal (lval) /
+	    SPEC_CVAL (val->type).v_ulong = 
+	      (unsigned long) floatFromVal (lval) /
 	      (unsigned long) floatFromVal (rval);
 	  else
 	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) /
@@ -850,15 +1068,16 @@ valDiv (value * lval, value * rval)
 	}
       else
 	{
-	  if (SPEC_USIGN (val->type))
+	  if (SPEC_USIGN (val->type)) {
 	    SPEC_CVAL (val->type).v_uint = (unsigned) floatFromVal (lval) /
 	      (unsigned) floatFromVal (rval);
-	  else
+	  } else {
 	    SPEC_CVAL (val->type).v_int = (int) floatFromVal (lval) /
 	      (int) floatFromVal (rval);
+	  }
 	}
     }
-  return val;
+  return cheapestVal(val);
 }
 
 /*------------------------------------------------------------------*/
@@ -875,7 +1094,7 @@ valMod (value * lval, value * rval)
   val->type->class = 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_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
   SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
 
   if (SPEC_LONG (val->type))
@@ -889,15 +1108,16 @@ valMod (value * lval, value * rval)
     }
   else
     {
-      if (SPEC_USIGN (val->type))
+      if (SPEC_USIGN (val->type)) {
 	SPEC_CVAL (val->type).v_uint = (unsigned) floatFromVal (lval) %
 	  (unsigned) floatFromVal (rval);
-      else
+      } else {
 	SPEC_CVAL (val->type).v_int = (unsigned) floatFromVal (lval) %
 	  (unsigned) floatFromVal (rval);
+      }
     }
 
-  return val;
+  return cheapestVal(val);
 }
 
 /*------------------------------------------------------------------*/
@@ -915,8 +1135,12 @@ valPlus (value * lval, value * rval)
   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) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+  SPEC_USIGN (val->type) = 
+    SPEC_USIGN (lval->etype) &&
+    SPEC_USIGN (rval->etype) &&
+    (floatFromVal(lval)+floatFromVal(rval))>=0;
+    
+  SPEC_LONG (val->type) = 1;
 
   if (IS_FLOAT (val->type))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) + floatFromVal (rval);
@@ -931,17 +1155,8 @@ 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 val;
+  return cheapestVal(val);
 }
 
 /*------------------------------------------------------------------*/
@@ -959,7 +1174,11 @@ valMinus (value * lval, value * rval)
   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_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));
 
   if (IS_FLOAT (val->type))
@@ -968,23 +1187,27 @@ valMinus (value * lval, value * rval)
     {
       if (SPEC_LONG (val->type))
 	{
-	  if (SPEC_USIGN (val->type))
-	    SPEC_CVAL (val->type).v_ulong = (unsigned long) floatFromVal (lval) -
+	  if (SPEC_USIGN (val->type)) {
+	    SPEC_CVAL (val->type).v_ulong = 
+	      (unsigned long) floatFromVal (lval) -
 	      (unsigned long) floatFromVal (rval);
-	  else
+	  } else {
 	    SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) -
 	      (long) floatFromVal (rval);
+	  }
 	}
       else
 	{
-	  if (SPEC_USIGN (val->type))
+	  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);
+	  } else {
+	    SPEC_CVAL (val->type).v_int = (int) floatFromVal (lval) - 
+	      (int) floatFromVal (rval);
+	  }
 	}
     }
-  return val;
+  return cheapestVal(val);
 }
 
 /*------------------------------------------------------------------*/
@@ -997,57 +1220,24 @@ valShift (value * lval, value * rval, int lr)
 
   /* create a new value */
   val = newValue ();
-  val->type = val->etype = newLink ();
-  val->type->class = SPECIFIER;
-  SPEC_NOUN (val->type) = V_INT;	/* type is int */
+  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_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
+  SPEC_LONG (val->type) = 1;
 
-  if (lr)
+  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 = lr ? 
+	  (unsigned long) floatFromVal (lval) << (unsigned long) floatFromVal (rval) : \
+	  (unsigned long) floatFromVal (lval) >> (unsigned 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);
-	}
-    }
-  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);
-	}
-      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 = lr ?
+	  (long) floatFromVal (lval) << (long) floatFromVal (rval) : \
+	  (long) floatFromVal (lval) >> (long) floatFromVal (rval);
     }
 
-  return val;
+  return cheapestVal(val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1062,7 +1252,8 @@ valCompare (value * lval, value * rval, int ctype)
   val = newValue ();
   val->type = val->etype = newCharLink ();
   val->type->class = SPECIFIER;
-  SPEC_NOUN (val->type) = V_INT;	/* type is int */
+  SPEC_NOUN (val->type) = V_CHAR;	/* type is char */
+  SPEC_USIGN (val->type) = 1;
   SPEC_SCLS (val->type) = S_LITERAL;	/* will remain literal */
 
   switch (ctype)
@@ -1175,7 +1366,7 @@ valBitwise (value * lval, value * rval, int op)
       break;
     }
 
-  return val;
+  return cheapestVal(val);
 }
 
 /*------------------------------------------------------------------*/
@@ -1191,6 +1382,7 @@ valLogicAndOr (value * lval, value * rval, int op)
   val->type = val->etype = newCharLink ();
   val->type->class = SPECIFIER;
   SPEC_SCLS (val->type) = S_LITERAL;	/* will remain literal */
+  SPEC_USIGN (val->type) = 0;
 
   switch (op)
     {
@@ -1223,31 +1415,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 int) fval;
+	      SPEC_CVAL (val->etype).v_uint = (unsigned short)l;
 	  else
-	    SPEC_CVAL (val->etype).v_int = (int) fval;
-	}
-    }
+	      SPEC_CVAL (val->etype).v_int = (short)l;
+      }
+  }
   return val;
 }
 
@@ -1267,22 +1455,22 @@ getNelements (sym_link * type, initList * ilist)
     ilist = ilist->init.deep;
 
   /* if type is a character array and there is only one
-     initialiser then get the length of the string */
+     (string) initialiser then get the length of the string */
   if (IS_ARRAY (type) && IS_CHAR (etype) && !ilist->next)
     {
       ast *iast = ilist->init.node;
       value *v = (iast->type == EX_VALUE ? iast->opval.val : NULL);
       if (!v)
 	{
-	  werror (E_INIT_WRONG);
+	  werror (W_INIT_WRONG);
 	  return 0;
 	}
-      if (!IS_ARRAY (v->type) || !IS_CHAR (v->etype))
+
+      if (IS_ARRAY (v->type) && IS_CHAR (v->etype))
+	// yep, it's a string
 	{
-	  werror (E_INIT_WRONG);
-	  return 0;
+	  return DCL_ELEM (v->type);
 	}
-      return DCL_ELEM (v->type);
     }
 
   i = 0;