diff options
Diffstat (limited to 'src/map/if')
| -rw-r--r-- | src/map/if/if.h | 2 | ||||
| -rw-r--r-- | src/map/if/ifLib.c | 4 | ||||
| -rw-r--r-- | src/map/if/ifMan.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/map/if/if.h b/src/map/if/if.h index 8cf5c0e8..24046f06 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -326,7 +326,7 @@ static inline float If_CutLutArea( If_Man_t * p, If_Cut_t * pCut ) { r for ( i = 0; (i < (int)(pCut)->nLeaves) && ((pLeaf) = If_ManObj(p, (pCut)->pLeaves[i])); i++ ) #define If_CutForEachLeafReverse( p, pCut, pLeaf, i ) \ for ( i = (int)(pCut)->nLeaves - 1; (i >= 0) && ((pLeaf) = If_ManObj(p, (pCut)->pLeaves[i])); i-- ) -//#define If_CutForEachLeaf( p, pCut, pLeaf, i ) \ +//#define If_CutForEachLeaf( p, pCut, pLeaf, i ) \ \\prevent multiline comment // for ( i = 0; (i < (int)(pCut)->nLeaves) && ((pLeaf) = If_ManObj(p, p->pPars->fLiftLeaves? (pCut)->pLeaves[i] >> 8 : (pCut)->pLeaves[i])); i++ ) // iterator over the leaves of the sequential cut #define If_CutForEachLeafSeq( p, pCut, pLeaf, Shift, i ) \ diff --git a/src/map/if/ifLib.c b/src/map/if/ifLib.c index b3e6ad4c..51630164 100644 --- a/src/map/if/ifLib.c +++ b/src/map/if/ifLib.c @@ -80,7 +80,7 @@ If_Lib_t * If_LutLibRead( char * FileName ) // read delays k = 0; - while ( pToken = strtok( NULL, " \t\n" ) ) + while ( (pToken = strtok( NULL, " \t\n" )) ) p->pLutDelays[i][k++] = (float)atof(pToken); // check for out-of-bound @@ -124,7 +124,7 @@ If_Lib_t * If_LutLibRead( char * FileName ) { if ( p->pLutDelays[i][0] <= 0.0 ) printf( "Warning: LUT %d has delay %f. Pin delays should be non-negative numbers. Technology mapping may not work correctly.\n", - k, i, p->pLutDelays[i][0] ); + i, p->pLutDelays[i][0] ); } } diff --git a/src/map/if/ifMan.c b/src/map/if/ifMan.c index d1a17b6a..015e3d31 100644 --- a/src/map/if/ifMan.c +++ b/src/map/if/ifMan.c @@ -320,7 +320,7 @@ void If_ManSetupCut( If_Man_t * p, If_Cut_t * pCut ) if ( p->pPars->fUsePerm ) pCut->pPerm = (char *)(pCut->pLeaves + p->pPars->nLutSize); if ( p->pPars->fTruth ) - pCut->pTruth = pCut->pLeaves + p->pPars->nLutSize + p->nPermWords; + pCut->pTruth = (unsigned *)pCut->pLeaves + p->pPars->nLutSize + p->nPermWords; } /**Function************************************************************* |