int currLineno = 0;
set *astList = NULL ;
set *operKeyReset = NULL;
-extern char *currFname ;
ast *staticAutos = NULL;
int labelKey = 1 ;
int noLineno = 0;
int noAlloc = 0 ;
symbol *currFunc ;
-extern int fatalError ;
-extern int lineno;
-extern char *filename ;
-extern set *publics;
-extern ast *createIval (ast *, link *, initList *, ast *);
-extern ast *createIvalCharPtr (ast *, link *, ast *);
+ast *createIval (ast *, sym_link *, initList *, ast *);
+ast *createIvalCharPtr (ast *, sym_link *, ast *);
ast *optimizeRRCRLC ( ast * );
ast *optimizeGetHbit(ast *);
ast *backPatchLabels (ast *,symbol *,symbol *);
/*-----------------------------------------------------------------*/
/* newAst - creates a fresh node for an expression tree */
/*-----------------------------------------------------------------*/
+#if 0
ast *newAst (int type, void *op )
{
ast *ex ;
ex->opval.val = (value *) op;
break ;
case EX_OP :
- ex->opval.op = (int) op ;
+ ex->opval.op = (long) op ;
break ;
case EX_LINK :
- ex->opval.lnk = (link *) op;
+ ex->opval.lnk = (sym_link *) op;
break ;
case EX_STMNT :
ex->opval.stmnt= (unsigned) op;
return ex;
}
+#endif
+
+static ast* newAst_(unsigned type)
+{
+ ast *ex ;
+ static int oldLineno = 0 ;
+
+ ALLOC(ex,sizeof(ast));
+
+ ex->type = type ;
+ ex->lineno = (noLineno ? oldLineno : yylineno);
+ ex->filename = currFname ;
+ ex->level = NestLevel ;
+ ex->block = currBlockno ;
+ ex->initMode = inInitMode;
+ return ex;
+}
+
+ast* newAst_VALUE(value*val)
+{
+ ast* ex = newAst_(EX_VALUE);
+ ex->opval.val = val;
+ return ex;
+}
+
+ast* newAst_OP(unsigned op)
+{
+ ast*ex = newAst_(EX_OP);
+ ex->opval.op = op;
+ return ex;
+}
+
+ast* newAst_LINK(sym_link*val)
+{
+ ast* ex = newAst_(EX_LINK);
+ ex->opval.lnk = val;
+ return ex;
+}
+
+ast* newAst_STMNT(unsigned val)
+{
+ ast* ex = newAst_(EX_STMNT);
+ ex->opval.stmnt = val;
+ return ex;
+}
/*-----------------------------------------------------------------*/
/* newNode - creates a new node */
/*-----------------------------------------------------------------*/
-ast *newNode ( int op, ast *left, ast *right )
+ast *newNode ( long op, ast *left, ast *right )
{
ast *ex ;
- ex = newAst (EX_OP,(void *) op) ;
+ ex = newAst_OP(op) ;
ex->left = left ;
ex->right = right;
/* then depending on the expression value */
if ( floatFromVal(condAst->opval.val) )
- ifxNode = newNode(GOTO, newAst(EX_VALUE,
- symbolVal (trueLabel )),NULL);
+ ifxNode = newNode(GOTO,
+ newAst_VALUE(symbolVal(trueLabel)),
+ NULL);
else
- ifxNode = newNode(GOTO, newAst(EX_VALUE,
- symbolVal (falseLabel )),NULL);
+ ifxNode = newNode(GOTO,
+ newAst_VALUE(symbolVal(falseLabel)),
+ NULL);
}
else {
ifxNode = newNode(IFX,condAst,NULL);
/*-----------------------------------------------------------------*/
/* funcOfType :- function of type with name */
/*-----------------------------------------------------------------*/
-symbol *funcOfType (char *name, link *type, link *argType,
+symbol *funcOfType (char *name, sym_link *type, sym_link *argType,
int nArgs , int rent)
{
symbol *sym;
ast *actParm,
int *parmNumber)
{
- link *fetype = func->etype;
+ sym_link *fetype = func->etype;
/* if none of them exist */
if ( !defParm && !actParm)
return 1;
}
+ /* If this is a varagrs function... */
+ if (!defParm && actParm && func->hasVargs )
+ {
+ ast *newType = NULL;
+
+ if (IS_CAST_OP(actParm)
+ || (IS_AST_LIT_VALUE(actParm) && actParm->values.literalFromCast))
+ {
+ /* Parameter was explicitly typecast; don't touch it. */
+ return 0;
+ }
+
+ /* If it's a small integer, upcast to int. */
+ if (IS_INTEGRAL(actParm->ftype)
+ && getSize(actParm->ftype) < INTSIZE)
+ {
+ newType = newAst_LINK(INTTYPE);
+ }
+
+ if (IS_PTR(actParm->ftype) && !IS_GENPTR(actParm->ftype))
+ {
+ newType = newAst_LINK(copyLinkChain(actParm->ftype));
+ DCL_TYPE(newType->opval.lnk) = GPOINTER;
+ }
+
+ if (newType)
+ {
+ /* cast required; change this op to a cast. */
+ ast *parmCopy = resolveSymbols(copyAst(actParm));
+
+ actParm->type = EX_OP;
+ actParm->opval.op = CAST;
+ actParm->left = newType;
+ actParm->right= parmCopy;
+ decorateType(actParm);
+ }
+
+ return 0;
+ }
+
/* if defined parameters ended but actual has not & */
- /* has a variable argument list or statckAuto */
+ /* stackAuto */
if (! defParm && actParm &&
- (func->hasVargs || options.stackAuto || IS_RENT(fetype)))
+ (options.stackAuto || IS_RENT(fetype)))
return 0;
resolveSymbols(actParm);
/* now change the current one to a cast */
actParm->type = EX_OP ;
actParm->opval.op = CAST ;
- actParm->left = newAst(EX_LINK,defParm->type);
+ actParm->left = newAst_LINK(defParm->type);
actParm->right= pTree ;
actParm->etype= defParm->etype;
actParm->ftype= defParm->type;
/*-----------------------------------------------------------------*/
/* createIvalType - generates ival for basic types */
/*-----------------------------------------------------------------*/
-ast *createIvalType ( ast *sym,link *type, initList *ilist)
+ast *createIvalType ( ast *sym,sym_link *type, initList *ilist)
{
ast *iExpr;
/*-----------------------------------------------------------------*/
/* createIvalStruct - generates initial value for structures */
/*-----------------------------------------------------------------*/
-ast *createIvalStruct (ast *sym,link *type,initList *ilist)
+ast *createIvalStruct (ast *sym,sym_link *type,initList *ilist)
{
ast *rast = NULL ;
symbol *sflds ;
if (!iloop)
break;
sflds->implicit = 1;
- lAst = newNode(PTR_OP,newNode('&',sym,NULL),newAst(EX_VALUE,symbolVal(sflds)));
+ lAst = newNode(PTR_OP,newNode('&',sym,NULL),newAst_VALUE(symbolVal(sflds)));
lAst = decorateType(resolveSymbols(lAst));
rast = decorateType(resolveSymbols(createIval (lAst, sflds->type, iloop,rast)));
}
/*-----------------------------------------------------------------*/
/* createIvalArray - generates code for array initialization */
/*-----------------------------------------------------------------*/
-ast *createIvalArray (ast *sym, link *type, initList *ilist)
+ast *createIvalArray (ast *sym, sym_link *type, initList *ilist)
{
ast *rast = NULL;
initList *iloop ;
ast *aSym ;
size++ ;
- aSym = newNode('[',sym,newAst(EX_VALUE,valueFromLit(size-1)));
+ aSym = newNode('[',sym,newAst_VALUE(valueFromLit(size-1)));
aSym = decorateType(resolveSymbols(aSym));
rast = createIval (aSym,type->next,iloop,rast) ;
iloop = (iloop ? iloop->next : NULL) ;
/*-----------------------------------------------------------------*/
/* createIvalCharPtr - generates initial values for char pointers */
/*-----------------------------------------------------------------*/
-ast *createIvalCharPtr (ast *sym, link *type, ast *iexpr)
+ast *createIvalCharPtr (ast *sym, sym_link *type, ast *iexpr)
{
ast *rast = NULL ;
rast,
newNode('=',
newNode('[', sym,
- newAst(EX_VALUE,valueFromLit(i))),
- newAst(EX_VALUE,valueFromLit(*s))));
+ newAst_VALUE(valueFromLit(i))),
+ newAst_VALUE(valueFromLit(*s))));
i++;
s++;
}
rast,
newNode('=',
newNode('[', sym,
- newAst(EX_VALUE,valueFromLit(i))),
- newAst(EX_VALUE,valueFromLit(*s))));
+ newAst_VALUE(valueFromLit(i))),
+ newAst_VALUE(valueFromLit(*s))));
return decorateType(resolveSymbols(rast));
}
/*-----------------------------------------------------------------*/
/* createIvalPtr - generates initial value for pointers */
/*-----------------------------------------------------------------*/
-ast *createIvalPtr (ast *sym,link *type,initList *ilist)
+ast *createIvalPtr (ast *sym,sym_link *type,initList *ilist)
{
ast *rast;
ast *iexpr ;
/*-----------------------------------------------------------------*/
/* createIval - generates code for initial value */
/*-----------------------------------------------------------------*/
-ast *createIval (ast *sym, link *type, initList *ilist, ast *wid)
+ast *createIval (ast *sym, sym_link *type, initList *ilist, ast *wid)
{
ast *rast = NULL;
/*-----------------------------------------------------------------*/
ast *initAggregates ( symbol *sym, initList *ival, ast *wid)
{
- return createIval (newAst(EX_VALUE,symbolVal(sym)),sym->type,ival,wid);
+ return createIval (newAst_VALUE(symbolVal(sym)),sym->type,ival,wid);
}
/*-----------------------------------------------------------------*/
if (IS_AGGREGATE(sym->type))
work = initAggregates (sym, sym->ival,NULL);
else
- work = newNode('=' ,newAst(EX_VALUE,symbolVal(newSym)),
+ work = newNode('=' ,newAst_VALUE(symbolVal(newSym)),
list2expr(sym->ival));
setAstLineno(work,sym->lineDef);
if (IS_AGGREGATE(sym->type))
work = initAggregates (sym,sym->ival,NULL);
else
- work = newNode('=' ,newAst(EX_VALUE,symbolVal(sym)),
+ work = newNode('=' ,newAst_VALUE(symbolVal(sym)),
list2expr(sym->ival));
setAstLineno (work,sym->lineDef);
sym->block = sym->level = 0;
sym->isstrlit = 1;
/* create an ival */
- sym->ival = newiList(INIT_NODE,newAst(EX_VALUE,val));
+ sym->ival = newiList(INIT_NODE,newAst_VALUE(val));
if (noAlloc == 0) {
/* allocate it */
addSymChain(sym);
isSymbolEqual (*sym,AST_SYMBOL(condExpr->left->left))) {
*end = newNode('+', condExpr->left->right,
- newAst(EX_VALUE,constVal("1")));
+ newAst_VALUE(constVal("1")));
break;
}
return FALSE ;
body->type = EX_OP;
body->opval.op = '-';
- body->left = newAst(EX_VALUE,symbolVal(sym));
- body->right= newAst(EX_VALUE,constVal("1"));
+ body->left = newAst_VALUE(symbolVal(sym));
+ body->right= newAst_VALUE(constVal("1"));
}
forbody
<sym> -= 1;
if (sym) goto for_continue ;
- <sym> = end - 1; */
+ <sym> = end */
/* put it together piece by piece */
rloop = newNode (NULLOP,
- createIf(newAst(EX_VALUE,symbolVal(sym)),
+ createIf(newAst_VALUE(symbolVal(sym)),
newNode(GOTO,
- newAst(EX_VALUE,
- symbolVal(AST_FOR(loop,continueLabel))),
+ newAst_VALUE(symbolVal(AST_FOR(loop,continueLabel))),
NULL),NULL),
newNode('=',
- newAst(EX_VALUE,symbolVal(sym)),
- newNode('-', end,
- newAst(EX_VALUE,
- constVal("1")))));
+ newAst_VALUE(symbolVal(sym)),
+ end));
replLoopSym(loop->left, sym);
rloop = newNode(NULLOP,
newNode('=',
- newAst(EX_VALUE,symbolVal(sym)),
+ newAst_VALUE(symbolVal(sym)),
newNode('-',end,init)),
createLabel(AST_FOR(loop,continueLabel),
newNode(NULLOP,
loop->left,
newNode(NULLOP,
newNode(SUB_ASSIGN,
- newAst(EX_VALUE,symbolVal(sym)),
- newAst(EX_VALUE,constVal("1"))),
+ newAst_VALUE(symbolVal(sym)),
+ newAst_VALUE(constVal("1"))),
rloop ))));
return decorateType(rloop);
}
+#define DEMAND_INTEGER_PROMOTION
+
+#ifdef DEMAND_INTEGER_PROMOTION
+
+/*-----------------------------------------------------------------*/
+/* walk a tree looking for the leaves. Add a typecast to the given */
+/* type to each value leaf node. */
+/*-----------------------------------------------------------------*/
+void pushTypeCastToLeaves(sym_link *type, ast *node, ast **parentPtr)
+{
+ if (!node)
+ {
+ /* WTF? We should never get here. */
+ return;
+ }
+
+ if (!node->left && !node->right)
+ {
+ /* We're at a leaf; if it's a value, apply the typecast */
+ if (node->type == EX_VALUE && IS_INTEGRAL(TTYPE(node)))
+ {
+ *parentPtr = decorateType(newNode(CAST,
+ newAst_LINK(copyLinkChain(type)),
+ node));
+ }
+ }
+ else
+ {
+ if (node->left)
+ {
+ pushTypeCastToLeaves(type, node->left, &(node->left));
+ }
+ if (node->right)
+ {
+ pushTypeCastToLeaves(type, node->right, &(node->right));
+ }
+ }
+}
+
+#endif
+
+/*-----------------------------------------------------------------*/
+/* Given an assignment operation in a tree, determine if the LHS */
+/* (the result) has a different (integer) type than the RHS. */
+/* If so, walk the RHS and add a typecast to the type of the LHS */
+/* to all leaf nodes. */
+/*-----------------------------------------------------------------*/
+void propAsgType(ast *tree)
+{
+#ifdef DEMAND_INTEGER_PROMOTION
+ if (!IS_INTEGRAL(LTYPE(tree)) || !IS_INTEGRAL(RTYPE(tree)))
+ {
+ /* Nothing to do here... */
+ return;
+ }
+
+ if (getSize(LTYPE(tree)) > getSize(RTYPE(tree)))
+ {
+ pushTypeCastToLeaves(LTYPE(tree), tree->right, &(tree->right));
+ }
+#else
+ (void)tree;
+#endif
+}
+
/*-----------------------------------------------------------------*/
/* decorateType - compute type for this tree also does type cheking*/
/* this is done bottom up, since type have to flow upwards*/
ast *decorateType (ast *tree)
{
int parmNumber ;
- link *p;
+ sym_link *p;
if ( ! tree )
return tree ;
/* otherwise just copy the type information */
COPYTYPE(TTYPE(tree),TETYPE(tree),tree->opval.val->type);
+ if (funcInChain(tree->opval.val->type)) {
+ tree->hasVargs = tree->opval.val->sym->hasVargs;
+ tree->args = copyValueChain(tree->opval.val->sym->args) ;
+ }
return tree ;
}
case INC_OP: /* incerement operator unary so left only */
case DEC_OP:
{
- link *ltc = (tree->right ? RTYPE(tree) : LTYPE(tree) );
+ sym_link *ltc = (tree->right ? RTYPE(tree) : LTYPE(tree) );
COPYTYPE(TTYPE(tree),TETYPE(tree),ltc);
if (!tree->initMode && IS_CONSTANT(TETYPE(tree)))
werror(E_CODE_WRITE,"++/--");
/*----------------------------*/
/* casting */
/*----------------------------*/
- case CAST : /* change the type */
+ case CAST: /* change the type */
/* cannot cast to an aggregate type */
if (IS_AGGREGATE(LTYPE(tree))) {
werror(E_CAST_ILLEGAL);
tree->left = NULL;
tree->right = NULL;
TTYPE(tree) = tree->opval.val->type;
+ tree->values.literalFromCast = 1;
}
else {
TTYPE(tree) = LTYPE(tree);
/* logical &&, || */
/*----------------------------*/
case AND_OP:
- case OR_OP :
+ case OR_OP:
/* each must me arithmetic type or be a pointer */
if (!IS_PTR(LTYPE(tree)) &&
!IS_ARRAY(LTYPE(tree)) &&
goto errorTreeReturn ;
}
LLVAL(tree) = 1;
+
+ propAsgType(tree);
+
return tree ;
case AND_ASSIGN:
goto errorTreeReturn ;
}
LLVAL(tree) = 1;
+
+ propAsgType(tree);
+
return tree ;
/*------------------------------------------------------------------*/
goto errorTreeReturn ;
}
LLVAL(tree) = 1;
+
+ propAsgType(tree);
+
return tree;
/*------------------------------------------------------------------*/
tree->right = decorateType(newNode('+',copyAst(tree->left),tree->right));
tree->opval.op = '=';
+
+ propAsgType(tree);
+
return tree;
/*------------------------------------------------------------------*/
goto errorTreeReturn ;
}
+ propAsgType(tree);
+
return tree ;
/*------------------------------------------------------------------*/
}
/* if there is going to be a casing required then add it */
- if (checkType(currFunc->type->next,RTYPE(tree)) < 0 ) {
- tree->right =
+ if (checkType(currFunc->type->next,RTYPE(tree)) < 0 )
+ {
+#ifdef DEMAND_INTEGER_PROMOTION
+ if (IS_INTEGRAL(currFunc->type->next))
+ {
+ pushTypeCastToLeaves(currFunc->type->next, tree->right, &(tree->right));
+ }
+ else
+#endif
+ {
+ tree->right =
decorateType(newNode(CAST,
- newAst(EX_LINK,
- copyLinkChain(currFunc->type->next)),
+ newAst_LINK(copyLinkChain(currFunc->type->next)),
tree->right));
+ }
}
RRVAL(tree) = 1;
/*-----------------------------------------------------------------*/
/* sizeofOp - processes size of operation */
/*-----------------------------------------------------------------*/
-value *sizeofOp( link *type)
+value *sizeofOp( sym_link *type)
{
char buff[10];
/* change not */
if (IS_NOT(tree)) {
+ int wasnot = IS_NOT(tree->left);
tree->left = backPatchLabels (tree->left,falseLabel,trueLabel);
/* if the left is already a IFX */
if ( ! IS_IFX(tree->left) )
tree->left = newNode (IFX,tree->left,NULL);
- tree->left->trueLabel = falseLabel ;
- tree->left->falseLabel= trueLabel ;
+ if (wasnot) {
+ tree->left->trueLabel = trueLabel ;
+ tree->left->falseLabel= falseLabel ;
+ } else {
+ tree->left->trueLabel = falseLabel ;
+ tree->left->falseLabel= trueLabel ;
+ }
return tree->left ;
}
label->islbl = 1;
label->key = labelKey++ ;
- rValue = newNode (LABEL,newAst(EX_VALUE,symbolVal(label)),stmnt);
+ rValue = newNode (LABEL,newAst_VALUE(symbolVal(label)),stmnt);
rValue->lineno = 0;
return rValue ;
if ( elseBody ) {
ifBody = newNode(NULLOP,ifBody,
newNode(GOTO,
- newAst(EX_VALUE,symbolVal(ifEnd)),
+ newAst_VALUE(symbolVal(ifEnd)),
NULL));
/* put the elseLabel on the else body */
elseBody = createLabel (ifFalse,elseBody);
newNode(NULLOP,
loopExpr,
newNode(GOTO,
- newAst(EX_VALUE,symbolVal(condLabel)),
+ newAst_VALUE(symbolVal(condLabel)),
NULL)));
/* now start putting them together */
forTree = newNode(NULLOP,initExpr,condExpr);
whileBody = newNode(NULLOP,
whileBody,
newNode(GOTO,
- newAst(EX_VALUE,
- symbolVal(continueLabel)),
+ newAst_VALUE(symbolVal(continueLabel)),
createLabel(falseLabel,NULL)));
/* put it all together */
case '>' :
case '<' :
case NE_OP :
- optExpr = newAst(EX_VALUE,constVal("0"));
+ optExpr = newAst_VALUE(constVal("0"));
break;
case GE_OP :
case LE_OP :
case EQ_OP :
- optExpr = newAst(EX_VALUE,constVal("1"));
+ optExpr = newAst_VALUE(constVal("1"));
break;
}
case '<' : /* bit value < 1 means 0 */
case NE_OP :
- optExpr = newNode('!',newAst(EX_VALUE,vleft),NULL);
+ optExpr = newNode('!',newAst_VALUE(vleft),NULL);
break;
case LE_OP : /* bit value <= 1 means no check */
- optExpr = newAst(EX_VALUE,vright);
+ optExpr = newAst_VALUE(vright);
break;
case GE_OP : /* bit value >= 1 means only check for = */
case EQ_OP :
- optExpr = newAst(EX_VALUE,vleft);
+ optExpr = newAst_VALUE(vleft);
break;
}
} else { /* literal is zero */
case '>' : /* bit value > 0 means 1 */
case NE_OP :
- optExpr = newAst(EX_VALUE,vleft);
+ optExpr = newAst_VALUE(vleft);
break;
case LE_OP : /* bit value <= 0 means no check */
break;
case EQ_OP : /* bit == 0 means ! of bit */
- optExpr = newNode('!',newAst(EX_VALUE,vleft),NULL);
+ optExpr = newNode('!',newAst_VALUE(vleft),NULL);
break;
}
}
ast *ex ;
symbol *csym;
int stack = 0 ;
- link *fetype;
+ sym_link *fetype;
iCode *piCode = NULL;
/* if check function return 0 then some problem */
we need to add the name to the publics list : this
actually means we are now compiling the compiler
support routine */
- if (name->cdef)
+ if (name->cdef) {
addSet(&publics,name);
+ }
}
else {
addSymChain(name);
body = resolveSymbols(body); /* resolve the symbols */
body = decorateType (body); /* propagateType & do semantic checks */
- ex = newAst (EX_VALUE, symbolVal(name)); /* create name */
+ ex = newAst_VALUE(symbolVal(name)); /* create name */
ex = newNode (FUNCTION,ex,body);
ex->values.args = name->args ;
addSet(&operKeyReset,name);
applyToSet(operKeyReset,resetParmKey);
- if (options.debug)
+ if (options.debug && !options.nodebug)
cdbStructBlock(1,cdbFile);
cleanUpLevel(LabelTab,0);
projects / fw / sdcc / blobdiff