dattalo - Added bank1.c and string1.c to test banking and character strings in the...

[fw/sdcc] / src / SDCCval.c

diff --git a/src/SDCCval.c b/src/SDCCval.c
index 8d65e07fb5d6e64e999ead39c2080ebf4b080e33..02172a723a5688fd649c822f3c7cb2eca4507977 100644 (file)
--- a/src/SDCCval.c
+++ b/src/SDCCval.c
@@ -348,10 +348,9 @@ 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 = sval;
        if (sval>=-128) {
          SPEC_NOUN(val->type)=V_CHAR;
-         SPEC_CVAL(val->type).v_int &= 0xff;
        }
       }
     } else { // sval>=0
@@ -890,17 +889,32 @@ floatFromVal (value * val)
        return (double) SPEC_CVAL (val->etype).v_long;
     }
   
-  if (SPEC_NOUN(val->etype)==V_INT) {
+  if (SPEC_NOUN (val->etype) == V_INT) {
     if (SPEC_USIGN (val->etype))
       return (double) SPEC_CVAL (val->etype).v_uint;
     else
       return (double) SPEC_CVAL (val->etype).v_int;
-  } else { // SPEC_NOUN==V_CHAR
+  }
+
+  if (SPEC_NOUN (val->etype) == V_CHAR) {
     if (SPEC_USIGN (val->etype))
-      return (double) ((unsigned char)SPEC_CVAL (val->etype).v_uint);
+      return (double) (unsigned char)SPEC_CVAL (val->etype).v_uint;
     else
-      return (double) ((signed char)SPEC_CVAL (val->etype).v_int);
+      return (double) (signed char)SPEC_CVAL (val->etype).v_int;
+  }
+
+  if (IS_BITVAR(val->etype)) {
+    return (double) SPEC_CVAL (val->etype).v_ulong;
+  }
+
+  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;
 }
 
 
@@ -928,9 +942,6 @@ valUnaryPM (value * val)
            SPEC_CVAL (val->etype).v_uint = 0-SPEC_CVAL (val->etype).v_uint;
          else
            SPEC_CVAL (val->etype).v_int = -SPEC_CVAL (val->etype).v_int;
-         if (SPEC_NOUN (val->etype)==V_CHAR) {
-           SPEC_CVAL (val->etype).v_uint &= 0xff;
-         }
        }
     }
   // -(unsigned 3) now really is signed
@@ -958,10 +969,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;
 }
 
@@ -985,9 +995,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;
 }
@@ -1433,9 +1440,6 @@ valCastLiteral (sym_link * dtype, double fval)
              SPEC_CVAL (val->etype).v_uint = (unsigned short)l;
          else
              SPEC_CVAL (val->etype).v_int = (short)l;
-         if (SPEC_NOUN (val->etype)==V_CHAR) {
-             SPEC_CVAL (val->etype).v_uint &= 0xff; 
-         }
       }
   }
   return val;
@@ -1453,7 +1457,7 @@ getNelements (sym_link * type, initList * ilist)
   if (!ilist)
     return 0;
 
-  if (ilist->type == INIT_DEEP)
+  while (ilist->type == INIT_DEEP)
     ilist = ilist->init.deep;
 
   /* if type is a character array and there is only one
@@ -1464,7 +1468,7 @@ getNelements (sym_link * type, initList * ilist)
       value *v = (iast->type == EX_VALUE ? iast->opval.val : NULL);
       if (!v)
        {
-         werror (W_INIT_WRONG);
+         werror (E_CONST_EXPECTED);
          return 0;
        }