Changed the type of the result of the ! (NOT) operator to char;

[fw/sdcc] / src / SDCCval.c

diff --git a/src/SDCCval.c b/src/SDCCval.c
index ad57890f48fc701686527ade74e0bb6c417a5dfc..30b9446ebab9e7db17fe5335f1c3fb6a1c9c9d55 100644 (file)
--- 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)
     {
@@ -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;
@@ -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,18 +352,16 @@ value *cheapestVal (value *val) {
     if (sval<0) {
       if (sval>=-32768) {
        SPEC_LONG(val->type)=0;
-       SPEC_CVAL(val->type).v_int = sval & 0xffff;
+       SPEC_CVAL(val->type).v_int = (TYPE_WORD)sval;
        if (sval>=-128) {
          SPEC_NOUN(val->type)=V_CHAR;
-         SPEC_CVAL(val->type).v_int &= 0xff;
        }
       }
     } 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 +369,7 @@ value *cheapestVal (value *val) {
   }
   return val;
 }
+#endif
 
 /*-----------------------------------------------------------------*/
 /* valueFromLit - creates a value from a literal                   */
@@ -376,13 +379,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);
 }
 
@@ -401,8 +404,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;
@@ -423,12 +425,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
   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);
 
@@ -465,8 +466,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;
     }
@@ -474,34 +479,53 @@ 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 && SPEC_USIGN (val->type)) { // 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
+    else if (dval>0x7f && !SPEC_USIGN (val->type)) { // check if we have to promote to int
+      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;
+      }
+    }
+    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;
         }
     }
 
@@ -517,7 +541,7 @@ unsigned char hexEscape(char **src)
 {
   char *s ;
   unsigned long value ;
-  
+
   (*src)++ ;   /* Skip over the 'x' */
   s = *src ;   /* Save for error detection */
   
@@ -663,10 +687,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;
 
@@ -756,7 +779,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);
 
@@ -770,12 +793,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;
@@ -788,37 +809,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' :
@@ -862,7 +883,7 @@ valFromType (sym_link * type)
 /*------------------------------------------------------------------*/
 /* floatFromVal - value to double float conversion                  */
 /*------------------------------------------------------------------*/
-double 
+double
 floatFromVal (value * val)
 {
   if (!val)
@@ -889,13 +910,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          */
@@ -925,6 +967,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,10 +996,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;
 }
 
@@ -975,9 +1022,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;
 }
@@ -992,29 +1036,45 @@ 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_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))
     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 */
     {
-      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 (!options.lessPedantic &&
+          ul != SPEC_CVAL (val->type).v_uint)
+        werror (W_INT_OVL);
+    }
+  else /* int */
+    {
+      TYPE_DWORD l = (TYPE_WORD) floatFromVal (lval) *
+                     (TYPE_WORD) floatFromVal (rval);
+
+      SPEC_CVAL (val->type).v_int = (TYPE_WORD) l;
+      if (!options.lessPedantic &&
+          l != SPEC_CVAL (val->type).v_int)
+        werror (W_INT_OVL);
     }
+#ifdef REDUCE_LITERALS
   return cheapestVal(val);
+#else
+  return val;
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -1033,13 +1093,12 @@ 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_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))
     SPEC_CVAL (val->type).v_float = floatFromVal (lval) / floatFromVal (rval);
@@ -1048,25 +1107,28 @@ 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) /
-             (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 = (long) floatFromVal (lval) /
-             (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);
+           SPEC_CVAL (val->type).v_uint = (TYPE_UWORD) floatFromVal (lval) /
+             (TYPE_UWORD) 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);
          }
        }
     }
+#ifdef REDUCE_LITERALS
   return cheapestVal(val);
+#else
+  return val;
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -1079,34 +1141,37 @@ 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_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))
     {
       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);
+       SPEC_CVAL (val->type).v_uint = (TYPE_UWORD) floatFromVal (lval) %
+         (TYPE_UWORD) floatFromVal (rval);
       } else {
-       SPEC_CVAL (val->type).v_int = (unsigned) floatFromVal (lval) %
-         (unsigned) floatFromVal (rval);
+       SPEC_CVAL (val->type).v_int = (TYPE_WORD) floatFromVal (lval) %
+         (TYPE_WORD) floatFromVal (rval);
       }
     }
 
+#ifdef REDUCE_LITERALS
   return cheapestVal(val);
+#else
+  return val;
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -1119,16 +1184,15 @@ 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 (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))
@@ -1145,7 +1209,11 @@ valPlus (value * lval, value * rval)
              (long) floatFromVal (rval);
        }
     }
+#ifdef REDUCE_LITERALS
   return cheapestVal(val);
+#else
+  return val;
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -1158,8 +1226,7 @@ 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 */
@@ -1196,7 +1263,11 @@ valMinus (value * lval, value * rval)
          }
        }
     }
+#ifdef REDUCE_LITERALS
   return cheapestVal(val);
+#else
+  return val;
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -1226,7 +1297,11 @@ valShift (value * lval, value * rval, int lr)
          (long) floatFromVal (lval) >> (long) floatFromVal (rval);
     }
 
+#ifdef REDUCE_LITERALS
   return cheapestVal(val);
+#else
+  return val;
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -1286,7 +1361,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)
@@ -1355,7 +1431,11 @@ valBitwise (value * lval, value * rval, int op)
       break;
     }
 
+#ifdef REDUCE_LITERALS
   return cheapestVal(val);
+#else
+  return val;
+#endif
 }
 
 /*------------------------------------------------------------------*/
@@ -1395,6 +1475,7 @@ value *
 valCastLiteral (sym_link * dtype, double fval)
 {
   value *val;
+  TYPE_UDWORD l = (TYPE_UDWORD)fval;
 
   if (!dtype)
     return NULL;
@@ -1402,30 +1483,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;
-         if (SPEC_NOUN (val->etype)==V_CHAR) {
-             SPEC_CVAL (val->etype).v_uint &= 0xff; 
-         }
+             SPEC_CVAL (val->etype).v_int = (TYPE_WORD)l;
       }
   }
   return val;
@@ -1434,10 +1517,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)
@@ -1448,13 +1530,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;
        }
 
@@ -1471,7 +1553,6 @@ getNelements (sym_link * type, initList * ilist)
       i++;
       ilist = ilist->next;
     }
-
   return i;
 }
 
@@ -1509,14 +1590,18 @@ 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;
@@ -1576,14 +1661,18 @@ 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;
@@ -1620,7 +1709,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));
 
@@ -1643,7 +1732,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;