X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCicode.c;h=2e0c1908705f3aa552582081c37b9b096c0413c7;hb=1e1c6a588fe0a45598443b59686c6f6cd0f84cca;hp=c024091a67f105c2a90d3aa5c7c956126e5b6975;hpb=6d5732239ca066c1757ae16f69942fd4b320e612;p=fw%2Fsdcc diff --git a/src/SDCCicode.c b/src/SDCCicode.c index c024091a..2e0c1908 100644 --- a/src/SDCCicode.c +++ b/src/SDCCicode.c @@ -190,7 +190,7 @@ void checkConstantRange(sym_link *ltype, value *val, char *msg, #if 0 // temporary disabled, leaving the warning as a reminder if (warnings) { - SNPRINTF (message, sizeof(message), "for %s %s in %s", + SNPRINTF (message, sizeof(message), "for %s %s in %s", IS_UNSIGNED(ltype) ? "unsigned" : "signed", nounName(ltype), msg); werror (W_CONST_RANGE, message); @@ -204,7 +204,7 @@ void checkConstantRange(sym_link *ltype, value *val, char *msg, /*-----------------------------------------------------------------*/ /* operandName - returns the name of the operand */ /*-----------------------------------------------------------------*/ -int +int printOperand (operand * op, FILE * file) { sym_link *opetype; @@ -233,13 +233,14 @@ printOperand (operand * op, FILE * file) case SYMBOL: #define REGA 1 -#ifdef REGA +//#if REGA /* { */ + if(REGA && !getenv("PRINT_SHORT_OPERANDS")) { fprintf (file, "%s [k%d lr%d:%d so:%d]{ ia%d a2p%d re%d rm%d nos%d ru%d dp%d}", /*{ar%d rm%d ru%d p%d a%d u%d i%d au%d k%d ks%d}" , */ (OP_SYMBOL (op)->rname[0] ? OP_SYMBOL (op)->rname : OP_SYMBOL (op)->name), op->key, OP_LIVEFROM (op), OP_LIVETO (op), OP_SYMBOL (op)->stack, - op->isaddr, op->aggr2ptr, OP_SYMBOL (op)->isreqv, + op->isaddr, op->aggr2ptr, OP_SYMBOL (op)->isreqv, OP_SYMBOL (op)->remat,OP_SYMBOL(op)->noSpilLoc, OP_SYMBOL(op)->ruonly,OP_SYMBOL(op)->dptr ); @@ -276,21 +277,53 @@ printOperand (operand * op, FILE * file) fprintf (file, "]"); } } -#else - fprintf (file, "%s", (OP_SYMBOL (op)->rname[0] ? - OP_SYMBOL (op)->rname : OP_SYMBOL (op)->name)); +//#else /* } else { */ + } else { + /* (getenv("PRINT_SHORT_OPERANDS") != NULL) */ + fprintf (file, "%s ", (OP_SYMBOL (op)->rname[0] ? OP_SYMBOL (op)->rname : OP_SYMBOL (op)->name)); + + if(getenv("PRINT_SHORT_OPERANDS")[0] < '1') + { + fprintf (file, "[lr%d:%d so:%d]", + OP_LIVEFROM (op), OP_LIVETO (op), + OP_SYMBOL (op)->stack); + } + + if(getenv("PRINT_SHORT_OPERANDS")[0] < '2') + { + fprintf (file, "{"); + printTypeChain (operandType (op), file); + if (SPIL_LOC (op) && IS_ITEMP (op)) + fprintf (file, "}{ sir@ %s", SPIL_LOC (op)->rname); + fprintf (file, "}"); + } + /* if assigned to registers */ - if (OP_SYMBOL (op)->nRegs && !OP_SYMBOL (op)->isspilt) + if (OP_SYMBOL (op)->nRegs) { - int i; - fprintf (file, "["); - for (i = 0; i < OP_SYMBOL (op)->nRegs; i++) - fprintf (file, "%s ", (OP_SYMBOL (op)->regs[i] ? - OP_SYMBOL (op)->regs[i]->name : - "err")); - fprintf (file, "]"); + if (OP_SYMBOL (op)->isspilt) + { + if (!OP_SYMBOL (op)->remat) + if (OP_SYMBOL (op)->usl.spillLoc) + fprintf (file, "[%s]", (OP_SYMBOL (op)->usl.spillLoc->rname[0] ? + OP_SYMBOL (op)->usl.spillLoc->rname : + OP_SYMBOL (op)->usl.spillLoc->name)); + else + fprintf (file, "[err]"); + else + fprintf (file, "[remat]"); + } + else + { + int i; + fprintf (file, "["); + for (i = 0; i < OP_SYMBOL (op)->nRegs; i++) + fprintf (file, "%s ", port->getRegName (OP_SYMBOL (op)->regs[i])); + fprintf (file, "]"); + } } -#endif +//#endif /* } */ + } break; case TYPE: @@ -399,6 +432,9 @@ PRINTFUNC (picGenericOne) if (ic->op == SEND || ic->op == RECEIVE) { fprintf(of,"{argreg = %d}",ic->argreg); } + if (ic->op == IPUSH) { + fprintf(of,"{parmPush = %d}",ic->parmPush); + } fprintf (of, "\n"); } @@ -514,7 +550,7 @@ piCode (void *item, FILE * of) of = stdout; icTab = getTableEntry (ic->op); - fprintf (stdout, "%s(%d:%d:%d:%d:%d)\t", + fprintf (of, "%s(%d:%d:%d:%d:%d)\t", ic->filename, ic->lineno, ic->seq, ic->key, ic->depth, ic->supportRtn); icTab->iCodePrint (of, ic, icTab->printName); @@ -641,7 +677,7 @@ newiTemp (char *s) { SNPRINTF (buffer, sizeof(buffer), "iTemp%d", iTempNum++); } - + itmp = newSymbol (buffer, 1); strncpyz (itmp->rname, itmp->name, SDCC_NAME_MAX); itmp->isitmp = 1; @@ -657,13 +693,13 @@ newiTempLabel (char *s) { symbol *itmplbl; - /* check if this alredy exists */ + /* check if this already exists */ if (s && (itmplbl = findSym (LabelTab, NULL, s))) return itmplbl; if (s) { - itmplbl = newSymbol (s, 1); + itmplbl = newSymbol (s, 1); } else { @@ -700,7 +736,7 @@ newiTempPreheaderLabel () /*-----------------------------------------------------------------*/ /* initiCode - initialises some iCode related stuff */ /*-----------------------------------------------------------------*/ -void +void initiCode () { @@ -835,13 +871,13 @@ operandType (operand * op) /*-----------------------------------------------------------------*/ /* isParamterToCall - will return 1 if op is a parameter to args */ /*-----------------------------------------------------------------*/ -int +int isParameterToCall (value * args, operand * op) { value *tval = args; wassert (IS_SYMOP(op)); - + while (tval) { if (tval->sym && @@ -855,7 +891,7 @@ isParameterToCall (value * args, operand * op) /*-----------------------------------------------------------------*/ /* isOperandGlobal - return 1 if operand is a global variable */ /*-----------------------------------------------------------------*/ -int +int isOperandGlobal (operand * op) { if (!op) @@ -877,7 +913,7 @@ isOperandGlobal (operand * op) /*-----------------------------------------------------------------*/ /* isOperandVolatile - return 1 if the operand is volatile */ /*-----------------------------------------------------------------*/ -int +int isOperandVolatile (operand * op, bool chkTemp) { sym_link *optype; @@ -887,19 +923,19 @@ isOperandVolatile (operand * op, bool chkTemp) return 0; opetype = getSpec (optype = operandType (op)); - - if (IS_PTR (optype) && DCL_PTR_VOLATILE (optype)) - return 1; - - if (IS_VOLATILE (opetype)) - return 1; - return 0; + + if (IS_PTR (optype) && DCL_PTR_VOLATILE (optype)) + return 1; + + if (IS_VOLATILE (opetype)) + return 1; + return 0; } /*-----------------------------------------------------------------*/ /* isOperandLiteral - returns 1 if an operand contains a literal */ /*-----------------------------------------------------------------*/ -int +int isOperandLiteral (operand * op) { sym_link *opetype; @@ -918,7 +954,7 @@ isOperandLiteral (operand * op) /*-----------------------------------------------------------------*/ /* isOperandInFarSpace - will return true if operand is in farSpace */ /*-----------------------------------------------------------------*/ -bool +bool isOperandInFarSpace (operand * op) { sym_link *etype; @@ -946,7 +982,7 @@ isOperandInFarSpace (operand * op) /*------------------------------------------------------------------*/ /* isOperandInDirSpace - will return true if operand is in dirSpace */ /*------------------------------------------------------------------*/ -bool +bool isOperandInDirSpace (operand * op) { sym_link *etype; @@ -974,7 +1010,7 @@ isOperandInDirSpace (operand * op) /*--------------------------------------------------------------------*/ /* isOperandInCodeSpace - will return true if operand is in codeSpace */ /*--------------------------------------------------------------------*/ -bool +bool isOperandInCodeSpace (operand * op) { sym_link *etype; @@ -1004,7 +1040,7 @@ isOperandInCodeSpace (operand * op) /*-----------------------------------------------------------------*/ /* isOperandOnStack - will return true if operand is on stack */ /*-----------------------------------------------------------------*/ -bool +bool isOperandOnStack (operand * op) { sym_link *etype; @@ -1028,7 +1064,7 @@ isOperandOnStack (operand * op) /* isOclsExpensive - will return true if accesses to an output */ /* storage class are expensive */ /*-----------------------------------------------------------------*/ -bool +bool isOclsExpensive (struct memmap *oclass) { if (port->oclsExpense) @@ -1039,6 +1075,40 @@ isOclsExpensive (struct memmap *oclass) return IN_FARSPACE (oclass); } +/*-----------------------------------------------------------------*/ +/* isiCodeInFunctionCall - return TRUE if an iCode is between a */ +/* CALL/PCALL and the first IPUSH/SEND associated with the call */ +/*-----------------------------------------------------------------*/ +int +isiCodeInFunctionCall (iCode * ic) +{ + iCode * lic = ic; + + /* Find the next CALL/PCALL */ + while (lic) + { + if (lic->op == CALL || lic->op == PCALL) + break; + lic = lic->next; + } + + if (!lic) + return FALSE; + + /* A function call was found. Scan backwards and see if an */ + /* IPUSH or SEND is encountered */ + while (ic) + { + if (lic != ic && (ic->op == CALL || ic->op == PCALL)) + return FALSE; + if (ic->op == SEND || (ic->op == IPUSH && ic->parmPush)) + return TRUE; + ic = ic->prev; + } + + return FALSE; +} + /*-----------------------------------------------------------------*/ /* operandLitValue - literal value of an operand */ /*-----------------------------------------------------------------*/ @@ -1358,8 +1428,10 @@ isOperandEqual (operand * left, operand * right) return isSymbolEqual (left->operand.symOperand, right->operand.symOperand); case VALUE: - return (floatFromVal (left->operand.valOperand) == - floatFromVal (right->operand.valOperand)); + return (compareType (left->operand.valOperand->type, + right->operand.valOperand->type) && + (floatFromVal (left->operand.valOperand) == + floatFromVal (right->operand.valOperand))); case TYPE: if (compareType (left->operand.typeOperand, right->operand.typeOperand) == 1) @@ -1372,7 +1444,7 @@ isOperandEqual (operand * left, operand * right) /*-------------------------------------------------------------------*/ /* isiCodeEqual - compares two iCodes are equal, returns true if yes */ /*-------------------------------------------------------------------*/ -int +int isiCodeEqual (iCode * left, iCode * right) { /* if the same pointer */ @@ -1405,7 +1477,7 @@ isiCodeEqual (iCode * left, iCode * right) if (!isSymbolEqual (IC_FALSE (left), IC_FALSE (right))) return 0; } - + return 1; } return 0; @@ -1454,7 +1526,7 @@ operandFromOperand (operand * op) nop->isLiteral = op->isLiteral; nop->usesDefs = op->usesDefs; nop->isParm = op->isParm; - + switch (nop->type) { case SYMBOL: @@ -1538,7 +1610,7 @@ operandFromSymbol (symbol * sym) ok && /* farspace check */ !IS_BITVAR (sym->etype) /* not a bit variable */ ) - { + { /* we will use it after all optimizations and before liveRange calculation */ @@ -1667,7 +1739,7 @@ operandFromAst (ast * tree,int lvl) default: assert (0); } - + /* Just to keep the compiler happy */ return (operand *) 0; } @@ -1675,7 +1747,7 @@ operandFromAst (ast * tree,int lvl) /*-----------------------------------------------------------------*/ /* setOperandType - sets the operand's type to the given type */ /*-----------------------------------------------------------------*/ -void +void setOperandType (operand * op, sym_link * type) { /* depending on the type of operand */ @@ -1716,7 +1788,7 @@ getArraySizePtr (operand * op) if(IS_PTR(ltype)) { int size = getSize(ltype); - return(IS_GENPTR(ltype)?(size-1):size); + return((IS_GENPTR(ltype) && GPTRSIZE > FPTRSIZE) ? (size-1) : size); } if(IS_ARRAY(ltype)) @@ -1734,7 +1806,10 @@ getArraySizePtr (operand * op) case FUNCTION: return (FPTRSIZE); case GPOINTER: - return (GPTRSIZE-1); + if (GPTRSIZE > FPTRSIZE) + return (GPTRSIZE-1); + else + return (FPTRSIZE); default: return (FPTRSIZE); @@ -1793,7 +1868,7 @@ usualBinaryConversions (operand ** op1, operand ** op2, *op1 = geniCodeCast (ctype, *op1, TRUE); *op2 = geniCodeCast (ctype, *op2, TRUE); - + return ctype; } @@ -1879,7 +1954,7 @@ geniCodeCast (sym_link * type, operand * op, bool implicit) geniCodeArray2Ptr (op); op->isaddr = 0; } - + /* if the operand is already the desired type then do nothing */ if (compareType (type, optype) == 1) return op; @@ -1930,7 +2005,12 @@ geniCodeCast (sym_link * type, operand * op, bool implicit) // if not a pointer to a function if (!(IS_CODEPTR(type) && IS_FUNC(type->next) && IS_FUNC(optype))) { if (implicit) { // if not to generic, they have to match - if ((!IS_GENPTR(type) && (DCL_TYPE(optype) != DCL_TYPE(type)))) { + if (!IS_GENPTR(type) && + !((DCL_TYPE(optype) == DCL_TYPE(type)) || + ((DCL_TYPE(optype) == POINTER) && (DCL_TYPE(type) == IPOINTER)) + ) + ) + { werror(E_INCOMPAT_PTYPES); errors++; } @@ -1956,7 +2036,7 @@ geniCodeCast (sym_link * type, operand * op, bool implicit) } /* if they are the same size create an assignment */ - + /* This seems very dangerous to me, since there are several */ /* optimizations (for example, gcse) that don't notice the */ /* cast hidden in this assignement and may simplify an */ @@ -1990,9 +2070,10 @@ geniCodeCast (sym_link * type, operand * op, bool implicit) restype = getSpec (operandType (IC_RESULT (ic))); if (!IS_LITERAL(opetype) && !IS_BIT(opetype)) + { SPEC_SCLS (restype) = SPEC_SCLS (opetype); - SPEC_OCLS (restype) = SPEC_OCLS (opetype); - + SPEC_OCLS (restype) = SPEC_OCLS (opetype); + } ADDTOCHAIN (ic); return IC_RESULT (ic); } @@ -2057,8 +2138,8 @@ geniCodeMultiply (operand * left, operand * right, RESULT_TYPE resultType) if (p2 && !IS_FLOAT (letype) && !((resultType == RESULT_TYPE_INT) && (getSize (resType) != getSize (ltype)) && (port->support.muldiv == 1)) - && strcmp (port->target, "pic14") != 0 /* don't shift for pic */ - && strcmp (port->target, "pic16") != 0) + && strcmp (port->target, "pic16") != 0 /* don't shift for pic */ + && strcmp (port->target, "pic14") != 0) { if ((resultType == RESULT_TYPE_INT) && (getSize (resType) != getSize (ltype))) { @@ -2176,7 +2257,7 @@ subtractExit: if (IS_VOID(ltype->next) || IS_VOID(rtype->next)) { return result; } - + // should we really do this? is this ANSI? return geniCodeDivision (result, operandFromLit (getSize (ltype->next)), @@ -2495,6 +2576,8 @@ geniCodePostInc (operand * op) geniCodeAssign (rOp, rv, 0, 0); size = (IS_PTR (rvtype) ? getSize (rvtype->next) : 1); + if (size == 0) + werror(W_SIZEOF_VOID); if (IS_FLOAT (rvtype)) ic = newiCode ('+', rv, operandFromValue (constFloatVal ("1.0"))); else @@ -2530,8 +2613,9 @@ geniCodePreInc (operand * op, bool lvalue) return op; } - size = (IS_PTR (roptype) ? getSize (roptype->next) : 1); + if (size == 0) + werror(W_SIZEOF_VOID); if (IS_FLOAT (roptype)) ic = newiCode ('+', rop, operandFromValue (constFloatVal ("1.0"))); else @@ -2578,6 +2662,8 @@ geniCodePostDec (operand * op) geniCodeAssign (rOp, rv, 0, 0); size = (IS_PTR (rvtype) ? getSize (rvtype->next) : 1); + if (size == 0) + werror(W_SIZEOF_VOID); if (IS_FLOAT (rvtype)) ic = newiCode ('-', rv, operandFromValue (constFloatVal ("1.0"))); else @@ -2613,8 +2699,9 @@ geniCodePreDec (operand * op, bool lvalue) return op; } - size = (IS_PTR (roptype) ? getSize (roptype->next) : 1); + if (size == 0) + werror(W_SIZEOF_VOID); if (IS_FLOAT (roptype)) ic = newiCode ('-', rop, operandFromValue (constFloatVal ("1.0"))); else @@ -2666,7 +2753,7 @@ geniCodeAddressOf (operand * op) op->isaddr = 0; return op; } - + /* lvalue check already done in decorateType */ /* this must be a lvalue */ /* if (!op->isaddr && !IS_AGGREGATE(optype)) { */ @@ -2699,7 +2786,7 @@ geniCodeAddressOf (operand * op) /*-----------------------------------------------------------------*/ /* setOClass - sets the output class depending on the pointer type */ /*-----------------------------------------------------------------*/ -void +void setOClass (sym_link * ptr, sym_link * spec) { switch (DCL_TYPE (ptr)) @@ -2773,7 +2860,7 @@ geniCodeDerefPtr (operand * op,int lvl) /* outputclass needs 2b updated */ setOClass (optype, retype); } - + op->isGptr = IS_GENPTR (optype); op->isaddr = (IS_PTR (rtype) || @@ -2874,7 +2961,7 @@ geniCodeLogic (operand * left, operand * right, int op) ic = setNextItem (iCodeChain); } /* if casting literal to generic pointer, then cast to rtype instead */ - if (ic && (ic->op == CAST) && isOperandLiteral(IC_RIGHT (ic))) + if (ic && (ic->op == CAST) && isOperandLiteral(IC_RIGHT (ic))) { left = operandFromValue (valCastLiteral (rtype, operandLitValue (IC_RIGHT (ic)))); ltype = operandType(left); @@ -2894,7 +2981,7 @@ geniCodeLogic (operand * left, operand * right, int op) ic = setNextItem (iCodeChain); } /* if casting literal to generic pointer, then cast to rtype instead */ - if (ic && (ic->op == CAST) && isOperandLiteral(IC_RIGHT (ic))) + if (ic && (ic->op == CAST) && isOperandLiteral(IC_RIGHT (ic))) { right = operandFromValue (valCastLiteral (ltype, operandLitValue (IC_RIGHT (ic)))); rtype = operandType(right); @@ -2960,18 +3047,18 @@ geniCodeLogicAndOr (ast *tree, int lvl) else /* OR_OP */ ic = newiCodeCondition (op, trueLabel, NULL); ADDTOCHAIN (ic); - + /* evaluate right operand */ condition = ast2iCode (tree->right, lvl + 1); op = geniCodeRValue (condition, FALSE); - + /* test right operand */ ic = newiCodeCondition (op, trueLabel, NULL); ADDTOCHAIN (ic); - + /* store 0 or 1 in result */ result = newiTempOperand (newCharLink(), 1); - + geniCodeLabel (falseLabel); geniCodeAssign (result, operandFromLit (0), 0, 0); /* generate an unconditional goto */ @@ -3055,7 +3142,7 @@ geniCodeAssign (operand * left, operand * right, int nosupdate, int strictLval) check if the literal value is within bounds */ if (IS_INTEGRAL (ltype) && right->type == VALUE && IS_LITERAL (rtype)) { - checkConstantRange(ltype, + checkConstantRange(ltype, OP_VALUE(right), "= operation", 0); } @@ -3118,7 +3205,7 @@ geniCodeDummyRead (operand * op) if (!IS_VOLATILE(type)) return; - + ic = newiCode (DUMMY_READ_VOLATILE, NULL, op); ADDTOCHAIN (ic); @@ -3128,7 +3215,7 @@ geniCodeDummyRead (operand * op) /*-----------------------------------------------------------------*/ /* geniCodeSEParms - generate code for side effecting fcalls */ /*-----------------------------------------------------------------*/ -static void +static void geniCodeSEParms (ast * parms,int lvl) { if (!parms) @@ -3151,9 +3238,9 @@ geniCodeSEParms (ast * parms,int lvl) IS_ADDRESS_OF_OP (parms->right)) parms->right->left->lvalue = 1; - parms->opval.oprnd = + parms->opval.oprnd = geniCodeRValue (ast2iCode (parms,lvl+1), FALSE); - + parms->type = EX_OPERAND; AST_ARGREG(parms) = parms->etype ? SPEC_ARGREG(parms->etype) : SPEC_ARGREG(parms->ftype); @@ -3163,7 +3250,7 @@ geniCodeSEParms (ast * parms,int lvl) /* geniCodeParms - generates parameters */ /*-----------------------------------------------------------------*/ value * -geniCodeParms (ast * parms, value *argVals, int *stack, +geniCodeParms (ast * parms, value *argVals, int *stack, sym_link * ftype, int lvl) { iCode *ic; @@ -3194,12 +3281,12 @@ geniCodeParms (ast * parms, value *argVals, int *stack, /* hack don't like this but too lazy to think of something better */ if (IS_ADDRESS_OF_OP (parms)) - parms->left->lvalue = 1; + parms->left->lvalue = 1; if (IS_CAST_OP (parms) && - IS_PTR (parms->ftype) && - IS_ADDRESS_OF_OP (parms->right)) - parms->right->left->lvalue = 1; + IS_PTR (parms->ftype) && + IS_ADDRESS_OF_OP (parms->right)) + parms->right->left->lvalue = 1; pval = geniCodeRValue (ast2iCode (parms,lvl+1), FALSE); } @@ -3217,24 +3304,24 @@ geniCodeParms (ast * parms, value *argVals, int *stack, { /* now decide whether to push or assign */ if (!(options.stackAuto || IFFUNC_ISREENT (ftype))) - { + { - /* assign */ - operand *top = operandFromSymbol (argVals->sym); - /* clear useDef and other bitVectors */ - OP_USES(top)=OP_DEFS(top)=OP_SYMBOL(top)->clashes = NULL; - geniCodeAssign (top, pval, 1, 0); - } + /* assign */ + operand *top = operandFromSymbol (argVals->sym); + /* clear useDef and other bitVectors */ + OP_USES(top)=OP_DEFS(top)=OP_SYMBOL(top)->clashes = NULL; + geniCodeAssign (top, pval, 1, 0); + } else - { - sym_link *p = operandType (pval); - /* push */ - ic = newiCode (IPUSH, pval, NULL); - ic->parmPush = 1; - /* update the stack adjustment */ - *stack += getSize (IS_AGGREGATE (p) ? aggrToPtr (p, FALSE) : p); - ADDTOCHAIN (ic); - } + { + sym_link *p = operandType (pval); + /* push */ + ic = newiCode (IPUSH, pval, NULL); + ic->parmPush = 1; + /* update the stack adjustment */ + *stack += getSize (IS_AGGREGATE (p) ? aggrToPtr (p, FALSE) : p); + ADDTOCHAIN (ic); + } } argVals=argVals->next; @@ -3253,8 +3340,8 @@ geniCodeCall (operand * left, ast * parms,int lvl) sym_link *ftype; int stack = 0; - if (!IS_FUNC(OP_SYMBOL(left)->type) && - !IS_CODEPTR(OP_SYMBOL(left)->type)) { + if (!IS_FUNC(OP_SYMBOL(left)->type) && + !IS_FUNCPTR(OP_SYMBOL(left)->type)) { werror (E_FUNCTION_EXPECTED); return operandFromValue(valueFromLit(0)); } @@ -3265,9 +3352,9 @@ geniCodeCall (operand * left, ast * parms,int lvl) geniCodeSEParms (parms,lvl); ftype = operandType (left); - if (IS_CODEPTR (ftype)) + if (IS_FUNCPTR (ftype)) ftype = ftype->next; - + /* first the parameters */ geniCodeParms (parms, NULL, &stack, ftype, lvl); @@ -3294,9 +3381,11 @@ geniCodeCall (operand * left, ast * parms,int lvl) /*-----------------------------------------------------------------*/ /* geniCodeReceive - generate intermediate code for "receive" */ /*-----------------------------------------------------------------*/ -static void +static void geniCodeReceive (value * args) { + unsigned char paramByteCounter = 0; + /* for all arguments that are passed in registers */ while (args) { @@ -3330,13 +3419,24 @@ geniCodeReceive (value * args) } } - ic = newiCode (RECEIVE, NULL, NULL); + ic = newiCode (RECEIVE, NULL, NULL); ic->argreg = SPEC_ARGREG(args->etype); if (first) { currFunc->recvSize = getSize (sym->type); first = 0; } IC_RESULT (ic) = opr; + + /* misuse of parmBytes (normally used for functions) + * to save estimated stack position of this argument. + * Normally this should be zero for RECEIVE iCodes. + * No idea if this causes side effects on other ports. - dw + */ + ic->parmBytes = paramByteCounter; + + /* what stack position do we have? */ + paramByteCounter += getSize (sym->type); + ADDTOCHAIN (ic); } @@ -3347,7 +3447,7 @@ geniCodeReceive (value * args) /*-----------------------------------------------------------------*/ /* geniCodeFunctionBody - create the function body */ /*-----------------------------------------------------------------*/ -void +void geniCodeFunctionBody (ast * tree,int lvl) { iCode *ic; @@ -3397,7 +3497,7 @@ geniCodeFunctionBody (ast * tree,int lvl) /*-----------------------------------------------------------------*/ /* geniCodeReturn - gen icode for 'return' statement */ /*-----------------------------------------------------------------*/ -void +void geniCodeReturn (operand * op) { iCode *ic; @@ -3413,7 +3513,7 @@ geniCodeReturn (operand * op) /*-----------------------------------------------------------------*/ /* geniCodeIfx - generates code for extended if statement */ /*-----------------------------------------------------------------*/ -void +void geniCodeIfx (ast * tree,int lvl) { iCode *ic; @@ -3472,7 +3572,7 @@ exit: /*-----------------------------------------------------------------*/ /* geniCodeJumpTable - tries to create a jump table for switch */ /*-----------------------------------------------------------------*/ -int +int geniCodeJumpTable (operand * cond, value * caseVals, ast * tree) { int min, max, cnt = 1; @@ -3485,7 +3585,7 @@ geniCodeJumpTable (operand * cond, value * caseVals, ast * tree) int needRangeCheck = !optimize.noJTabBoundary || tree->values.switchVals.swDefault; sym_link *cetype = getSpec (operandType (cond)); - int sizeofMinCost, sizeofMaxCost; + int sizeofMinCost, sizeofZeroMinCost, sizeofMaxCost; int sizeofMatchJump, sizeofJumpTable; int sizeIndex; @@ -3518,29 +3618,39 @@ geniCodeJumpTable (operand * cond, value * caseVals, ast * tree) case 4: sizeIndex = 2; break; default: return 0; } - + /* Compute the size cost of the range check and subtraction. */ sizeofMinCost = 0; + sizeofZeroMinCost = 0; sizeofMaxCost = 0; if (needRangeCheck) { if (!(min==0 && IS_UNSIGNED (cetype))) sizeofMinCost = port->jumptableCost.sizeofRangeCompare[sizeIndex]; + if (!IS_UNSIGNED (cetype)) + sizeofZeroMinCost = port->jumptableCost.sizeofRangeCompare[sizeIndex]; sizeofMaxCost = port->jumptableCost.sizeofRangeCompare[sizeIndex]; } if (min) sizeofMinCost += port->jumptableCost.sizeofSubtract; - + /* If the size cost of handling a non-zero minimum exceeds the */ /* cost of extending the range down to zero, then it might be */ /* better to extend the range to zero. */ - if (min > 0 && sizeofMinCost >= (min * port->jumptableCost.sizeofElement)) + if (min > 0 && (sizeofMinCost-sizeofZeroMinCost) + >= (min * port->jumptableCost.sizeofElement)) { /* Only extend the jump table if it would still be manageable. */ if (1 + max <= port->jumptableCost.maxCount) - min = 0; + { + min = 0; + if (IS_UNSIGNED (cetype)) + sizeofMinCost = 0; + else + sizeofMinCost = port->jumptableCost.sizeofRangeCompare[sizeIndex]; + } } - + /* Compute the total size cost of a jump table. */ sizeofJumpTable = (1 + max - min) * port->jumptableCost.sizeofElement + port->jumptableCost.sizeofDispatch @@ -3548,13 +3658,13 @@ geniCodeJumpTable (operand * cond, value * caseVals, ast * tree) /* Compute the total size cost of a match & jump sequence */ sizeofMatchJump = cnt * port->jumptableCost.sizeofMatchJump[sizeIndex]; - + /* If the size cost of the jump table is uneconomical then exit */ if (sizeofMatchJump < sizeofJumpTable) return 0; /* The jump table is preferable. */ - + /* First, a label for the default or missing cases. */ if (tree->values.switchVals.swDefault) { @@ -3578,7 +3688,7 @@ geniCodeJumpTable (operand * cond, value * caseVals, ast * tree) if (vch && t==i) { /* Explicit case: make a new label for it. */ - SNPRINTF (buffer, sizeof(buffer), + SNPRINTF (buffer, sizeof(buffer), "_case_%d_%d", tree->values.switchVals.swNum, i); @@ -3594,23 +3704,6 @@ geniCodeJumpTable (operand * cond, value * caseVals, ast * tree) } } - /* If cond is volatile, it might change after the boundary */ - /* conditions are tested to an out of bounds value, causing */ - /* a jump to a location outside of the jump table. To avoid */ - /* this possibility, use a non-volatile copy of it instead. */ - if (IS_OP_VOLATILE (cond)) - { - operand * newcond; - iCode * ic; - - newcond = newiTempOperand (operandType (cond), TRUE); - newcond->isvolatile = 0; - ic = newiCode ('=', NULL, cond); - IC_RESULT (ic) = newcond; - ADDTOCHAIN (ic); - cond = newcond; - } - /* first we rule out the boundary conditions */ /* if only optimization says so */ if (needRangeCheck) @@ -3657,13 +3750,13 @@ geniCodeSwitch (ast * tree,int lvl) operand *cond = geniCodeRValue (ast2iCode (tree->left,lvl+1), FALSE); value *caseVals = tree->values.switchVals.swVals; symbol *trueLabel, *falseLabel; - + /* If the condition is a literal, then just jump to the */ /* appropriate case label. */ if (IS_LITERAL(getSpec(operandType(cond)))) { int switchVal, caseVal; - + switchVal = (int) floatFromVal (cond->operand.valOperand); while (caseVals) { @@ -3681,6 +3774,22 @@ geniCodeSwitch (ast * tree,int lvl) goto defaultOrBreak; } + /* If cond is volatile, it might change while we are trying to */ + /* find the matching case. To avoid this possibility, make a */ + /* non-volatile copy to use instead. */ + if (IS_OP_VOLATILE (cond)) + { + operand * newcond; + iCode * ic; + + newcond = newiTempOperand (operandType (cond), TRUE); + newcond->isvolatile = 0; + ic = newiCode ('=', NULL, cond); + IC_RESULT (ic) = newcond; + ADDTOCHAIN (ic); + cond = newcond; + } + /* if we can make this a jump table */ if (geniCodeJumpTable (cond, caseVals, tree)) goto jumpTable; /* no need for the comparison */ @@ -3725,7 +3834,7 @@ jumpTable: /*-----------------------------------------------------------------*/ /* geniCodeInline - intermediate code for inline assembler */ /*-----------------------------------------------------------------*/ -static void +static void geniCodeInline (ast * tree) { iCode *ic; @@ -3755,30 +3864,42 @@ geniCodeArrayInit (ast * tree, operand *array) } ADDTOCHAIN (ic); } - + /*-----------------------------------------------------------------*/ /* geniCodeCritical - intermediate code for a critical statement */ /*-----------------------------------------------------------------*/ -static void +static void geniCodeCritical (ast *tree, int lvl) { iCode *ic; operand *op = NULL; + sym_link *type; + + if (!options.stackAuto) + { + type = newLink(SPECIFIER); + SPEC_VOLATILE(type) = 1; + SPEC_NOUN(type) = V_BIT; + SPEC_SCLS(type) = S_BIT; + SPEC_BLEN(type) = 1; + SPEC_BSTR(type) = 0; + op = newiTempOperand(type, 1); + } /* If op is NULL, the original interrupt state will saved on */ /* the stack. Otherwise, it will be saved in op. */ - - /* Generate a save of the current interrupt state & disabled */ + + /* Generate a save of the current interrupt state & disable */ ic = newiCode (CRITICAL, NULL, NULL); IC_RESULT (ic) = op; ADDTOCHAIN (ic); - + /* Generate the critical code sequence */ if (tree->left && tree->left->type == EX_VALUE) geniCodeDummyRead (ast2iCode (tree->left,lvl+1)); else ast2iCode (tree->left,lvl+1); - + /* Generate a restore of the original interrupt state */ ic = newiCode (ENDCRITICAL, NULL, op); ADDTOCHAIN (ic); @@ -4124,7 +4245,7 @@ ast2iCode (ast * tree,int lvl) geniCodeAssign (left, geniCodeMultiply (geniCodeRValue (operandFromOperand (left), FALSE), - geniCodeRValue (right, FALSE), + geniCodeRValue (right, FALSE), getResultTypeFromType (tree->ftype)), 0, 1); @@ -4255,11 +4376,11 @@ ast2iCode (ast * tree,int lvl) case INLINEASM: geniCodeInline (tree); return NULL; - + case ARRAYINIT: geniCodeArrayInit(tree, ast2iCode (tree->left,lvl+1)); return NULL; - + case CRITICAL: geniCodeCritical (tree, lvl); } @@ -4308,25 +4429,25 @@ static const char *opTypeToStr(OPTYPE op) case VALUE: return "value"; case TYPE: return "type"; } - return "undefined type"; + return "undefined type"; } -operand *validateOpType(operand *op, +operand *validateOpType(operand *op, const char *macro, const char *args, OPTYPE type, - const char *file, + const char *file, unsigned line) -{ +{ if (op && op->type == type) { return op; } - fprintf(stderr, + fprintf(stderr, "Internal error: validateOpType failed in %s(%s) @ %s:%u:" " expected %s, got %s\n", - macro, args, file, line, + macro, args, file, line, opTypeToStr(type), op ? opTypeToStr(op->type) : "null op"); exit(-1); return op; // never reached, makes compiler happy.