{
value *val;
- val = Safe_calloc (1, sizeof (value));
+ val = Safe_alloc (sizeof (value));
return val;
}
initList *nilist;
- nilist = Safe_calloc (1, sizeof (initList));
+ nilist = Safe_alloc (sizeof (initList));
nilist->type = type;
nilist->lineno = yylineno;
}
else
{
- newL = Safe_malloc(sizeof(literalList));
+ newL = Safe_alloc(sizeof(literalList));
newL->literalValue = val;
newL->count = 1;
newL->next = NULL;
while (src)
{
- newL = Safe_malloc(sizeof(literalList));
+ newL = Safe_alloc(sizeof(literalList));
newL->literalValue = src->literalValue;
newL->count = src->count;
}
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;
+}
+
+/*--------------------------------------------------------------------*/
+/* 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;
}
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);
}
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");
}
/*-----------------------------------------------------------------*/
-/* 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);
/* 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);
+ 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;
}
- else
- sval = atol (s);
+ 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;
+ }
+ }
- // check if we have to promote to long
- if (SPEC_LONG (val->type) ||
- (SPEC_USIGN(val->type) && sval>0xffff) ||
- (!SPEC_USIGN(val->type) && ((long)sval>32767 || (long)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;
- return val;
+ {
+ SPEC_CVAL (val->type).v_long = dval;
+ }
}
-
- if (SPEC_USIGN (val->type))
- SPEC_CVAL (val->type).v_uint = sval;
else
- SPEC_CVAL (val->type).v_int = sval;
-
-
- // check if we can make it a char
- if ((SPEC_USIGN(val->type) && sval < 256) ||
- (!SPEC_USIGN(val->type) && ((long)sval<127 && (long)sval>-128))) {
- SPEC_NOUN (val->etype) = V_CHAR;
- }
+ {
+ if (SPEC_USIGN (val->type))
+ {
+ SPEC_CVAL (val->type).v_uint = dval;
+ }
+ else
+ {
+ SPEC_CVAL (val->type).v_int = dval;
+ }
+ }
+
return val;
}
/param src Pointer to 'x' from start of hex character value
*/
-char hexEscape(char **src)
-
+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);
+ 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;
+ return (char) value;
}
+
/*------------------------------------------------------------------*/
/* octalEscape - process an octal constant of max three digits */
/* return the octal value, throw a warning for illegal octal */
/* adjust src to point at the last proccesed char */
/*------------------------------------------------------------------*/
-char octalEscape (char **str) {
+unsigned char octalEscape (char **str) {
int digits;
unsigned value=0;
SPEC_NOUN (val->etype) = V_CHAR;
SPEC_SCLS (val->etype) = S_LITERAL;
- SPEC_CVAL (val->etype).v_char = Safe_calloc (1, strlen (s) + 1);
+ 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;
}
/*------------------------------------------------------------------*/
-/* copyValue - copies contents of a vlue to a fresh one */
+/* copyValue - copies contents of a value to a fresh one */
/*------------------------------------------------------------------*/
value *
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);
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 */
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' :
case '5' :
case '6' :
case '7' :
- SPEC_CVAL (val->type).v_int = octalEscape(&s);
+ SPEC_CVAL (val->type).v_uint = octalEscape(&s);
break;
case 'x':
- SPEC_CVAL (val->type).v_int = hexEscape(&s) ;
+ 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;
}
}
/*------------------------------------------------------------------*/
-/* floatFromVal - value to unsinged integer conversion */
+/* floatFromVal - value to double float conversion */
/*------------------------------------------------------------------*/
double
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_uint;
+ }
+
+ 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 - dones the unary +/- operation on a constant */
+/* valUnaryPM - does the unary +/- operation on a constant */
/*------------------------------------------------------------------*/
value *
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;
+ // -(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;
-
}
/*------------------------------------------------------------------*/
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;
}
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);
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);
}
/*------------------------------------------------------------------*/
/* 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))
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) /
}
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);
}
/*------------------------------------------------------------------*/
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))
}
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);
}
/*------------------------------------------------------------------*/
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);
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);
}
/*------------------------------------------------------------------*/
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))
{
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);
}
/*------------------------------------------------------------------*/
/* 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_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);
- }
- }
- 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 = 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);
- }
+ SPEC_CVAL (val->type).v_long = lr ?
+ (long) floatFromVal (lval) << (long) floatFromVal (rval) : \
+ (long) floatFromVal (lval) >> (long) floatFromVal (rval);
}
- return val;
+ return cheapestVal(val);
}
/*------------------------------------------------------------------*/
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)
/* 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)
break;
}
- return val;
+ return cheapestVal(val);
}
/*------------------------------------------------------------------*/
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)
{
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;
}
int
getNelements (sym_link * type, initList * ilist)
{
- sym_link *etype = getSpec (type);
int i;
if (!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 (E_INIT_WRONG);
+ werror (E_CONST_EXPECTED);
return 0;
}
i++;
ilist = ilist->next;
}
-
return i;
}
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 ();
if (SPEC_SCLS (arrExpr->left->etype) == S_CODE)
{
DCL_TYPE (val->type) = CPOINTER;
- DCL_PTR_CONST (val->type) = port->mem.code_ro;
}
else if (SPEC_SCLS (arrExpr->left->etype) == S_XDATA)
DCL_TYPE (val->type) = FPOINTER;
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 ();
if (SPEC_SCLS (structT->etype) == S_CODE)
{
DCL_TYPE (val->type) = CPOINTER;
- DCL_PTR_CONST (val->type) = port->mem.code_ro;
}
else if (SPEC_SCLS (structT->etype) == S_XDATA)
DCL_TYPE (val->type) = FPOINTER;
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));
val = newValue ();
- sprintf (val->name, "(%s)",
+ SNPRINTF (val->name, sizeof(val->name), "(%s)",
AST_SYMBOL (aexpr)->rname);
val->type = type;
projects / fw / sdcc / blobdiff