X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCBBlock.c;h=9d9558edb37120a60729eb96149c5b762a626cf8;hb=bb939d05cb3f6e3e8f8d5cb10a63b8d48e07a085;hp=10053301a095139b9ea32371bca1c038d87f4571;hpb=df7c871421f26a279325f8efa2c04f4600d9eb45;p=fw%2Fsdcc diff --git a/src/SDCCBBlock.c b/src/SDCCBBlock.c index 10053301..9d9558ed 100644 --- a/src/SDCCBBlock.c +++ b/src/SDCCBBlock.c @@ -88,7 +88,9 @@ newEdge (eBBlock * from, eBBlock * to) /*-----------------------------------------------------------------*/ FILE *createDumpFile (int id) { struct _dumpFiles *dumpFilesPtr=dumpFiles; - + static int dumpIndex=0; + static char dumpIndexStr[32]; + while (dumpFilesPtr->id) { if (dumpFilesPtr->id==id) break; @@ -100,15 +102,26 @@ FILE *createDumpFile (int id) { exit (1); } + sprintf(dumpIndexStr, ".%d", dumpIndex); + dumpIndex++; + if (!dumpFilesPtr->filePtr) { // not used before, create it strncpyz (scratchFileName, dstFileName, PATH_MAX); +#if 0 + strncatz (scratchFileName, dumpIndexStr, PATH_MAX); +#endif strncatz (scratchFileName, dumpFilesPtr->ext, PATH_MAX); if (!(dumpFilesPtr->filePtr = fopen (scratchFileName, "w"))) { werror (E_FILE_OPEN_ERR, scratchFileName); exit (1); } } + +#if 0 + fprintf(dumpFilesPtr->filePtr, "Dump file index: %d\n", dumpIndex); +#endif + return dumpFilesPtr->filePtr; } @@ -169,15 +182,19 @@ dumpLiveRanges (int id, hTab * liveRanges) fflush(file); } + /*-----------------------------------------------------------------*/ /* dumpEbbsToFileExt - writeall the basic blocks to a file */ /*-----------------------------------------------------------------*/ void -dumpEbbsToFileExt (int id, eBBlock ** ebbs, int count) +dumpEbbsToFileExt (int id, ebbIndex * ebbi) { FILE *of; int i; eBBlock *bb; + set *cseSet; + eBBlock ** ebbs = ebbi->dfOrder ? ebbi->dfOrder : ebbi->bbOrder; + int count = ebbi->count; if (id) { of=createDumpFile(id); @@ -214,7 +231,7 @@ dumpEbbsToFileExt (int id, eBBlock ** ebbs, int count) fprintf (of, "\ndominators: "); for (d=0; ddomVect->size; d++) { if (bitVectBitValue(ebbs[i]->domVect, d)) { - fprintf (of, "%s ", ebbs[d]->entryLabel->name); + fprintf (of, "%s ", ebbi->bbOrder[d]->entryLabel->name); //ebbs[d]->entryLabel->name); } } } @@ -226,10 +243,42 @@ dumpEbbsToFileExt (int id, eBBlock ** ebbs, int count) bitVectDebugOn (ebbs[i]->ldefs, of); fprintf (of, "\npointers Set bitvector :"); bitVectDebugOn (ebbs[i]->ptrsSet, of); +#if 0 + fprintf (of, "\nin coming definitions :"); + bitVectDebugOn (ebbs[i]->inDefs, of); + fprintf (of, "\nout going definitions :"); + bitVectDebugOn (ebbs[i]->outDefs, of); + fprintf (of, "\ndefines used :"); + bitVectDebugOn (ebbs[i]->usesDefs, of); +#endif + if (ebbs[i]->isLastInLoop) { fprintf (of, "\nInductions Set bitvector :"); bitVectDebugOn (ebbs[i]->linds, of); } + + fprintf (of, "\ninExprs:"); + for (cseSet = ebbs[i]->inExprs; cseSet; cseSet=cseSet->next) { + cseDef *item=cseSet->item; + fprintf (of, " %s(%d)",OP_SYMBOL(item->sym)->name,item->diCode->key); + if (item->fromGlobal) + fprintf (of, "g"); + } + fprintf (of, "\noutExprs:"); + for (cseSet = ebbs[i]->outExprs; cseSet; cseSet=cseSet->next) { + cseDef *item=cseSet->item; + fprintf (of, " %s(%d)",OP_SYMBOL(item->sym)->name,item->diCode->key); + if (item->fromGlobal) + fprintf (of, "g"); + } + fprintf (of, "\nkilledExprs:"); + for (cseSet = ebbs[i]->killedExprs; cseSet; cseSet=cseSet->next) { + cseDef *item=cseSet->item; + fprintf (of, " %s(%d)",OP_SYMBOL(item->sym)->name,item->diCode->key); + if (item->fromGlobal) + fprintf (of, "g"); + } + fprintf (of, "\n----------------------------------------------------------------\n"); printiCChain (ebbs[i]->sch, of); } @@ -316,8 +365,10 @@ iCode2eBBlock (iCode * ic) /* eBBWithEntryLabel - finds the basic block with the entry label */ /*-----------------------------------------------------------------*/ eBBlock * -eBBWithEntryLabel (eBBlock ** ebbs, symbol * eLabel, int count) +eBBWithEntryLabel (ebbIndex * ebbi, symbol * eLabel) { + eBBlock ** ebbs = ebbi->bbOrder; + int count = ebbi->count; int i; for (i = 0; i < count; i++) @@ -469,17 +520,21 @@ remiCodeFromeBBlock (eBBlock * ebb, iCode * ic) /*-----------------------------------------------------------------*/ /* iCodeBreakDown : breakDown iCode chain to blocks */ /*-----------------------------------------------------------------*/ -eBBlock ** -iCodeBreakDown (iCode * ic, int *count) +ebbIndex * +iCodeBreakDown (iCode * ic) { eBBlock **ebbs = NULL; iCode *loop = ic; - - *count = 0; + ebbIndex *ebbi; + + ebbi = Safe_alloc (sizeof (ebbIndex)); + ebbi->count = 0; + ebbi->dfOrder = NULL; /* no depth first order information yet */ /* allocate for the first entry */ - ebbs = Safe_alloc (sizeof (eBBlock **)); + ebbs = Safe_alloc (sizeof (eBBlock *)); + ebbi->bbOrder = ebbs; while (loop) { @@ -491,64 +546,66 @@ iCodeBreakDown (iCode * ic, int *count) ebb->ech->next = NULL; /* mark the end of this chain */ if (loop) loop->prev = NULL; - ebb->bbnum = *count; /* save this block number */ + ebb->bbnum = ebbi->count; /* save this block number */ /* put it in the array */ - ebbs[(*count)++] = ebb; + ebbs[(ebbi->count)++] = ebb; /* allocate for the next one. Remember to clear the new */ /* pointer at the end, that was created by realloc. */ - ebbs = Safe_realloc (ebbs, (*count + 1) * sizeof (eBBlock **)); + ebbs = Safe_realloc (ebbs, (ebbi->count + 1) * sizeof (eBBlock *)); + ebbi->bbOrder = ebbs; - ebbs[*count] = 0; + ebbs[ebbi->count] = 0; /* if this one ends in a goto or a conditional */ /* branch then check if the block it is going */ /* to already exists, if yes then this could */ /* be a loop, add a preheader to the block it */ /* goes to if it does not already have one */ - if (ebbs[(*count) - 1]->ech && - (ebbs[(*count) - 1]->ech->op == GOTO || - ebbs[(*count) - 1]->ech->op == IFX)) + if (ebbs[(ebbi->count) - 1]->ech && + (ebbs[(ebbi->count) - 1]->ech->op == GOTO || + ebbs[(ebbi->count) - 1]->ech->op == IFX)) { symbol *label; eBBlock *destBlock; - if (ebbs[(*count) - 1]->ech->op == GOTO) - label = IC_LABEL (ebbs[(*count) - 1]->ech); - else if (!(label = IC_TRUE (ebbs[(*count) - 1]->ech))) - label = IC_FALSE (ebbs[(*count) - 1]->ech); + if (ebbs[(ebbi->count) - 1]->ech->op == GOTO) + label = IC_LABEL (ebbs[(ebbi->count) - 1]->ech); + else if (!(label = IC_TRUE (ebbs[(ebbi->count) - 1]->ech))) + label = IC_FALSE (ebbs[(ebbi->count) - 1]->ech); - if ((destBlock = eBBWithEntryLabel (ebbs, label, (*count))) && + if ((destBlock = eBBWithEntryLabel (ebbi, label)) && destBlock->preHeader == NULL && otherPathsPresent (ebbs, destBlock)) { - symbol *preHeaderLabel = newiTempPreheaderLabel (); + symbol *preHeaderLabel = newiTempLoopHeaderLabel (1); int i, j; eBBlock *pBlock; /* go thru all block replacing the entryLabel with new label */ /* till we reach the block , then we insert a new ebblock */ - for (i = 0; i < (*count); i++) + for (i = 0; i < (ebbi->count); i++) { if (ebbs[i] == destBlock) break; replaceLabel (ebbs[i], label, preHeaderLabel); } - (*count)++; + (ebbi->count)++; /* if we have stopped at the block , allocate for an extra one */ - ebbs = Safe_realloc (ebbs, (*count + 1) * sizeof (eBBlock **)); + ebbs = Safe_realloc (ebbs, (ebbi->count + 1) * sizeof (eBBlock *)); + ebbi->bbOrder = ebbs; - ebbs[*count] = 0; + ebbs[ebbi->count] = 0; /* then move the block down one count */ pBlock = ebbs[j = i]; - for (i += 1; i < (*count); i++) + for (i += 1; i < (ebbi->count); i++) { eBBlock *xBlock; @@ -568,9 +625,9 @@ iCodeBreakDown (iCode * ic, int *count) } /* mark the end */ - ebbs[*count] = NULL; + ebbs[ebbi->count] = NULL; - return ebbs; + return ebbi; } /*-----------------------------------------------------------------*/ @@ -710,7 +767,7 @@ iCodeFromeBBlock (eBBlock ** ebbs, int count) while (ic); if (foundNonlabel && ic) { - werror (W_CODE_UNREACH, ic->filename, ic->lineno); + werrorfl (ic->filename, ic->lineno, W_CODE_UNREACH); continue; } }