diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-08-20 22:12:51 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-08-20 22:12:51 -0700 |
| commit | c344f3e38c60147cacd8a5d414625b832192ccee (patch) | |
| tree | 390f8d38d7fc5c601099e08a471c327ac3dc5c7a /src/misc | |
| parent | 6dbaa4d0f85d8e9ba08b06192aac6013c6461147 (diff) | |
| download | abc-c344f3e38c60147cacd8a5d414625b832192ccee.tar.gz abc-c344f3e38c60147cacd8a5d414625b832192ccee.tar.bz2 abc-c344f3e38c60147cacd8a5d414625b832192ccee.zip | |
Propagating timing support to the new synthesis/mapping commands.
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/tim/timMan.c | 2 | ||||
| -rw-r--r-- | src/misc/tim/timTime.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/misc/tim/timMan.c b/src/misc/tim/timMan.c index 42f2fe1a..0900b7ae 100644 --- a/src/misc/tim/timMan.c +++ b/src/misc/tim/timMan.c @@ -128,7 +128,7 @@ Tim_Man_t * Tim_ManDup( Tim_Man_t * p, int fUnitDelay ) pDelayTableNew[1] = (int)pDelayTable[1]; pDelayTableNew[2] = (int)pDelayTable[2]; for ( k = 0; k < nInputs * nOutputs; k++ ) - pDelayTableNew[3+k] = fUnitDelay ? 1.0 : pDelayTable[3+k]; + pDelayTableNew[3+k] = fUnitDelay ? (float)fUnitDelay : pDelayTable[3+k]; // assert( (int)pDelayTableNew[0] == Vec_PtrSize(pNew->vDelayTables) ); assert( Vec_PtrEntry(pNew->vDelayTables, i) == NULL ); Vec_PtrWriteEntry( pNew->vDelayTables, i, pDelayTableNew ); diff --git a/src/misc/tim/timTime.c b/src/misc/tim/timTime.c index ddec4c62..7d3dd082 100644 --- a/src/misc/tim/timTime.c +++ b/src/misc/tim/timTime.c @@ -154,7 +154,7 @@ void Tim_ManSetCiRequired( Tim_Man_t * p, int iCi, float Delay ) void Tim_ManSetCoRequired( Tim_Man_t * p, int iCo, float Delay ) { assert( iCo < p->nCos ); - assert( !p->fUseTravId || p->pCos[iCo].TravId != p->nTravIds ); + assert( !p->fUseTravId || !p->nTravIds || p->pCos[iCo].TravId != p->nTravIds ); p->pCos[iCo].timeReq = Delay; p->pCos[iCo].TravId = p->nTravIds; } |