projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we don't need this anymore
[fw/sdcc]
/
src
/
SDCCval.c
diff --git
a/src/SDCCval.c
b/src/SDCCval.c
index b5685aae5bc8ac7247b5b22836d88751312183db..d944b5c8cd38ec6fed8f35ac4946bc1250d6854b 100644
(file)
--- a/
src/SDCCval.c
+++ b/
src/SDCCval.c
@@
-304,10
+304,13
@@
symbolVal (symbol * sym)
}
if (*sym->rname)
}
if (*sym->rname)
- sprintf (val->name, "%s", sym->rname);
+ {
+ SNPRINTF (val->name, sizeof(val->name), "%s", sym->rname);
+ }
else
else
- sprintf (val->name, "_%s", sym->name);
-
+ {
+ SNPRINTF (val->name, sizeof(val->name), "_%s", sym->name);
+ }
return val;
}
return val;
}
@@
-340,28
+343,27
@@
value *cheapestVal (value *val) {
if (uval<=0xffff) {
SPEC_LONG(val->type)=0;
SPEC_CVAL(val->type).v_uint = uval;
if (uval<=0xffff) {
SPEC_LONG(val->type)=0;
SPEC_CVAL(val->type).v_uint = uval;
- }
- if (uval<=0xff) {
- SPEC_NOUN(val->type)=V_CHAR;
+ if (uval<=0xff) {
+ SPEC_NOUN(val->type)=V_CHAR;
+ }
}
} else { // not unsigned
if (sval<0) {
if (sval>=-32768) {
SPEC_LONG(val->type)=0;
}
} else { // not unsigned
if (sval<0) {
if (sval>=-32768) {
SPEC_LONG(val->type)=0;
- SPEC_CVAL(val->type).v_int = sval & 0xffff;
- }
- if (sval>=-128) {
- SPEC_NOUN(val->type)=V_CHAR;
- SPEC_CVAL(val->type).v_int &= 0xff;
+ 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;
}
} 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;
+ if (sval<=255) {
+ SPEC_NOUN(val->type)=V_CHAR;
+ }
}
}
}
}
}
}
@@
-378,11
+380,11
@@
valueFromLit (double lit)
if ((((long) lit) - lit) == 0)
{
if ((((long) lit) - lit) == 0)
{
-
sprintf (buffer
, "%ld", (long) lit);
+
SNPRINTF (buffer, sizeof(buffer)
, "%ld", (long) lit);
return constVal (buffer);
}
return constVal (buffer);
}
-
sprintf (buffer
, "%f", lit);
+
SNPRINTF (buffer, sizeof(buffer)
, "%f", lit);
return constFloatVal (buffer);
}
return constFloatVal (buffer);
}
@@
-401,8
+403,7
@@
constFloatVal (char *s)
return constVal ("0");
}
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;
SPEC_NOUN (val->type) = V_FLOAT;
SPEC_SCLS (val->type) = S_LITERAL;
SPEC_CVAL (val->type).v_float = sval;
@@
-419,12
+420,11
@@
value *constVal (char *s)
short hex = 0, octal = 0;
char scanFmt[10];
int scI = 0;
short hex = 0, octal = 0;
char scanFmt[10];
int scI = 0;
-
long s
val;
+
double d
val;
val = newValue (); /* alloc space for value */
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_SCLS (val->type) = S_LITERAL;
// let's start with an unsigned char
SPEC_NOUN (val->type) = V_CHAR;
@@
-446,11
+446,17
@@
value *constVal (char *s)
else if (hex)
scanFmt[scI++] = 'x';
else
else if (hex)
scanFmt[scI++] = 'x';
else
- scanFmt[scI++] = '
d
';
+ scanFmt[scI++] = '
f
';
scanFmt[scI++] = '\0';
scanFmt[scI++] = '\0';
- 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 */
/* Setup the flags first */
/* set the _long flag if 'lL' is found */
@@
-459,19
+465,19
@@
value *constVal (char *s)
SPEC_LONG (val->type) = 1;
}
SPEC_LONG (val->type) = 1;
}
- if (
s
val<0) { // "-28u" will still be signed and negative
+ if (
d
val<0) { // "-28u" will still be signed and negative
SPEC_USIGN (val->type) = 0;
SPEC_USIGN (val->type) = 0;
- if (
s
val<-128) { // check if we have to promote to int
+ if (
d
val<-128) { // check if we have to promote to int
SPEC_NOUN (val->type) = V_INT;
}
SPEC_NOUN (val->type) = V_INT;
}
- if (
s
val<-32768) { // check if we have to promote to long int
+ if (
d
val<-32768) { // check if we have to promote to long int
SPEC_LONG (val->type) = 1;
}
} else { // >=0
SPEC_LONG (val->type) = 1;
}
} else { // >=0
- if (
s
val>0xff) { // check if we have to promote to int
+ if (
d
val>0xff) { // check if we have to promote to int
SPEC_NOUN (val->type) = V_INT;
}
SPEC_NOUN (val->type) = V_INT;
}
- if (
s
val>0xffff) { // check if we have to promote to long int
+ if (
d
val>0xffff) { // check if we have to promote to long int
SPEC_LONG (val->type) = 1;
}
}
SPEC_LONG (val->type) = 1;
}
}
@@
-480,22
+486,22
@@
value *constVal (char *s)
{
if (SPEC_USIGN (val->type))
{
{
if (SPEC_USIGN (val->type))
{
- SPEC_CVAL (val->type).v_ulong =
s
val;
+ SPEC_CVAL (val->type).v_ulong =
d
val;
}
else
{
}
else
{
- SPEC_CVAL (val->type).v_long =
s
val;
+ SPEC_CVAL (val->type).v_long =
d
val;
}
}
else
{
if (SPEC_USIGN (val->type))
{
}
}
else
{
if (SPEC_USIGN (val->type))
{
- SPEC_CVAL (val->type).v_uint =
s
val;
+ SPEC_CVAL (val->type).v_uint =
d
val;
}
else
{
}
else
{
- SPEC_CVAL (val->type).v_int =
s
val;
+ SPEC_CVAL (val->type).v_int =
d
val;
}
}
}
}
@@
-657,10
+663,9
@@
strVal (char *s)
val = newValue (); /* get a new one */
/* get a declarator */
val = newValue (); /* get a new one */
/* get a declarator */
- val->type = newLink ();
+ val->type = newLink (
DECLARATOR
);
DCL_TYPE (val->type) = ARRAY;
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;
SPEC_NOUN (val->etype) = V_CHAR;
SPEC_SCLS (val->etype) = S_LITERAL;
@@
-750,7
+755,7
@@
copyValue (value * src)
dest = newValue ();
dest->sym = copySymbol (src->sym);
dest = newValue ();
dest->sym = copySymbol (src->sym);
- str
cpy (dest->name, src->name
);
+ str
ncpyz (dest->name, src->name, SDCC_NAME_MAX
);
dest->type = (src->type ? copyLinkChain (src->type) : NULL);
dest->etype = (src->type ? getSpec (dest->type) : NULL);
dest->type = (src->type ? copyLinkChain (src->type) : NULL);
dest->etype = (src->type ? getSpec (dest->type) : NULL);
@@
-768,8
+773,7
@@
charVal (char *s)
val = newValue ();
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;
SPEC_NOUN (val->type) = V_CHAR;
SPEC_USIGN(val->type) = 1;
SPEC_SCLS (val->type) = S_LITERAL;
@@
-782,37
+786,37
@@
charVal (char *s)
switch (*s)
{
case 'n':
switch (*s)
{
case 'n':
- SPEC_CVAL (val->type).v_int = '\n';
+ SPEC_CVAL (val->type).v_
u
int = '\n';
break;
case 't':
break;
case 't':
- SPEC_CVAL (val->type).v_int = '\t';
+ SPEC_CVAL (val->type).v_
u
int = '\t';
break;
case 'v':
break;
case 'v':
- SPEC_CVAL (val->type).v_int = '\v';
+ SPEC_CVAL (val->type).v_
u
int = '\v';
break;
case 'b':
break;
case 'b':
- SPEC_CVAL (val->type).v_int = '\b';
+ SPEC_CVAL (val->type).v_
u
int = '\b';
break;
case 'r':
break;
case 'r':
- SPEC_CVAL (val->type).v_int = '\r';
+ SPEC_CVAL (val->type).v_
u
int = '\r';
break;
case 'f':
break;
case 'f':
- SPEC_CVAL (val->type).v_int = '\f';
+ SPEC_CVAL (val->type).v_
u
int = '\f';
break;
case 'a':
break;
case 'a':
- SPEC_CVAL (val->type).v_int = '\a';
+ SPEC_CVAL (val->type).v_
u
int = '\a';
break;
case '\\':
break;
case '\\':
- SPEC_CVAL (val->type).v_int = '\\';
+ SPEC_CVAL (val->type).v_
u
int = '\\';
break;
case '\?':
break;
case '\?':
- SPEC_CVAL (val->type).v_int = '\?';
+ SPEC_CVAL (val->type).v_
u
int = '\?';
break;
case '\'':
break;
case '\'':
- SPEC_CVAL (val->type).v_int = '\'';
+ SPEC_CVAL (val->type).v_
u
int = '\'';
break;
case '\"':
break;
case '\"':
- SPEC_CVAL (val->type).v_int = '\"';
+ SPEC_CVAL (val->type).v_
u
int = '\"';
break;
case '0' :
break;
case '0' :
@@
-854,7
+858,7
@@
valFromType (sym_link * type)
}
/*------------------------------------------------------------------*/
}
/*------------------------------------------------------------------*/
-/* floatFromVal - value to
unsinged integer conversion
*/
+/* floatFromVal - value to
double float conversion
*/
/*------------------------------------------------------------------*/
double
floatFromVal (value * val)
/*------------------------------------------------------------------*/
double
floatFromVal (value * val)
@@
-884,17
+888,32
@@
floatFromVal (value * val)
return (double) SPEC_CVAL (val->etype).v_long;
}
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;
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))
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
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_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;
}
}
@@
-922,13
+941,16
@@
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;
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
SPEC_USIGN(val->etype)=0;
}
}
// -(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;
}
return val;
}
@@
-952,10
+974,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;
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;
}
return val;
}
@@
-979,9
+1000,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;
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;
}
}
return val;
}
@@
-996,8
+1014,7
@@
valMult (value * lval, value * rval)
/* create a new value */
val = newValue ();
/* 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_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
IS_FLOAT (rval->etype) ? V_FLOAT : V_INT);
SPEC_SCLS (val->type) = S_LITERAL; /* will remain literal */
@@
-1037,8
+1054,7
@@
valDiv (value * lval, value * rval)
/* create a new value */
val = newValue ();
/* 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_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
IS_FLOAT (rval->etype) ? V_FLOAT : V_INT);
SPEC_SCLS (val->etype) = S_LITERAL;
@@
-1083,8
+1099,7
@@
valMod (value * lval, value * rval)
/* create a new value */
val = newValue ();
/* 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_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));
@@
-1123,8
+1138,7
@@
valPlus (value * lval, value * rval)
/* create a new value */
val = newValue ();
/* 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_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
IS_FLOAT (rval->etype) ? V_FLOAT : V_INT);
SPEC_SCLS (val->type) = S_LITERAL; /* will remain literal */
@@
-1162,8
+1176,7
@@
valMinus (value * lval, value * rval)
/* create a new value */
val = newValue ();
/* 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_NOUN (val->type) = (IS_FLOAT (lval->etype) ||
IS_FLOAT (rval->etype) ? V_FLOAT : V_INT);
SPEC_SCLS (val->type) = S_LITERAL; /* will remain literal */
@@
-1290,7
+1303,8
@@
valBitwise (value * lval, value * rval, int op)
/* create a new value */
val = newValue ();
/* 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)
val->etype = getSpec (val->type);
switch (op)
@@
-1408,34
+1422,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 */
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;
SPEC_CVAL (val->etype).v_ulong = (unsigned long) fval;
return val;
-
}
+ }
if (SPEC_NOUN (val->etype) == V_FLOAT)
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))
if (SPEC_USIGN (val->etype))
-
SPEC_CVAL (val->etype).v_ulong = (unsigned long) fva
l;
+
SPEC_CVAL (val->etype).v_ulong = (unsigned long)
l;
else
else
- SPEC_CVAL (val->etype).v_long = (long) fval;
- }
- else
- {
+ SPEC_CVAL (val->etype).v_long = (long) l;
+ } else {
if (SPEC_USIGN (val->etype))
if (SPEC_USIGN (val->etype))
-
SPEC_CVAL (val->etype).v_uint = (unsigned short)fva
l;
+
SPEC_CVAL (val->etype).v_uint = (unsigned short)
l;
else
else
- SPEC_CVAL (val->etype).v_int = (short)fval;
- if (SPEC_NOUN (val->etype)==V_CHAR) {
- SPEC_CVAL (val->etype).v_uint &= 0xff;
- }
- }
- }
+ SPEC_CVAL (val->etype).v_int = (short)l;
+ }
+ }
return val;
}
return val;
}
@@
-1445,7
+1452,6
@@
valCastLiteral (sym_link * dtype, double fval)
int
getNelements (sym_link * type, initList * ilist)
{
int
getNelements (sym_link * type, initList * ilist)
{
- sym_link *etype = getSpec (type);
int i;
if (!ilist)
int i;
if (!ilist)
@@
-1456,13
+1462,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 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)
{
{
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;
}
return 0;
}
@@
-1479,7
+1485,6
@@
getNelements (sym_link * type, initList * ilist)
i++;
ilist = ilist->next;
}
i++;
ilist = ilist->next;
}
-
return i;
}
return i;
}
@@
-1517,14
+1522,18
@@
valForArray (ast * arrExpr)
val = newValue ();
if (!lval)
val = newValue ();
if (!lval)
- sprintf (buffer, "%s", AST_SYMBOL (arrExpr->left)->rname);
+ {
+ SNPRINTF (buffer, sizeof(buffer), "%s", AST_SYMBOL (arrExpr->left)->rname);
+ }
else
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);
(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;
if (SPEC_SCLS (arrExpr->left->etype) == S_CODE)
{
DCL_TYPE (val->type) = CPOINTER;
@@
-1584,14
+1593,18
@@
valForStructElem (ast * structT, ast * elemT)
val = newValue ();
if (!lval)
val = newValue ();
if (!lval)
- sprintf (buffer, "%s", AST_SYMBOL (structT)->rname);
+ {
+ SNPRINTF(buffer, sizeof(buffer), "%s", AST_SYMBOL (structT)->rname);
+ }
else
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);
(int) sym->offset);
- val->type = newLink ();
+ val->type = newLink (
DECLARATOR
);
if (SPEC_SCLS (structT->etype) == S_CODE)
{
DCL_TYPE (val->type) = CPOINTER;
if (SPEC_SCLS (structT->etype) == S_CODE)
{
DCL_TYPE (val->type) = CPOINTER;
@@
-1628,7
+1641,7
@@
valForCastAggr (ast * aexpr, sym_link * type, ast * cnst, int op)
val = newValue ();
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));
AST_SYMBOL (aexpr)->rname, op,
getSize (type->next) * (int) AST_LIT_VALUE (cnst));
@@
-1651,7
+1664,7
@@
valForCastArr (ast * aexpr, sym_link * type)
val = newValue ();
val = newValue ();
-
sprintf (val->name
, "(%s)",
+
SNPRINTF (val->name, sizeof(val->name)
, "(%s)",
AST_SYMBOL (aexpr)->rname);
val->type = type;
AST_SYMBOL (aexpr)->rname);
val->type = type;