fix warning

[fw/sdcc] / src / SDCCval.c

diff --git a/src/SDCCval.c b/src/SDCCval.c
index 02172a723a5688fd649c822f3c7cb2eca4507977..edd9c25b82ee14dc58df776f56013e9341f10713 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)
     {
@@ -304,10 +304,13 @@ 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;
 }
@@ -377,11 +380,11 @@ valueFromLit (double lit)
 
   if ((((long) lit) - lit) == 0)
     {
-      sprintf (buffer, "%ld", (long) lit);
+      SNPRINTF (buffer, sizeof(buffer), "%ld", (long) lit);
       return constVal (buffer);
     }
 
-  sprintf (buffer, "%f", lit);
+  SNPRINTF (buffer, sizeof(buffer), "%f", lit);
   return constFloatVal (buffer);
 }
 
@@ -400,8 +403,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,8 +424,7 @@ 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;
@@ -662,10 +663,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 +755,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);
 
@@ -773,8 +773,7 @@ charVal (char *s)
 
   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 +786,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' :
@@ -904,7 +903,7 @@ floatFromVal (value * val)
   }
 
   if (IS_BITVAR(val->etype)) {
-    return (double) SPEC_CVAL (val->etype).v_ulong;
+    return (double) SPEC_CVAL (val->etype).v_uint;
   }
 
   if (SPEC_NOUN (val->etype) == V_VOID) {
@@ -946,6 +945,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;
 }
 
@@ -1009,8 +1014,7 @@ 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 */
@@ -1050,8 +1054,7 @@ 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;
@@ -1096,8 +1099,7 @@ 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));
@@ -1136,8 +1138,7 @@ 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 */
@@ -1175,8 +1176,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 */
@@ -1303,7 +1303,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)
@@ -1451,18 +1452,17 @@ valCastLiteral (sym_link * dtype, double fval)
 int 
 getNelements (sym_link * type, initList * ilist)
 {
-  sym_link *etype = getSpec (type);
   int i;
 
   if (!ilist)
     return 0;
 
-  while (ilist->type == INIT_DEEP)
+  if (ilist->type == INIT_DEEP)
     ilist = ilist->init.deep;
 
   /* 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);
@@ -1485,7 +1485,6 @@ getNelements (sym_link * type, initList * ilist)
       i++;
       ilist = ilist->next;
     }
-
   return i;
 }
 
@@ -1523,14 +1522,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;
@@ -1590,14 +1593,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;
@@ -1634,7 +1641,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));
 
@@ -1657,7 +1664,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;