diff options
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/mapper/mapperTree.c | 4 | ||||
-rw-r--r-- | src/map/scl/scl.c | 14 | ||||
-rw-r--r-- | src/map/scl/sclBuff.c | 2 | ||||
-rw-r--r-- | src/map/scl/sclInt.h | 4 | ||||
-rw-r--r-- | src/map/scl/sclUtil.c | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/map/mapper/mapperTree.c b/src/map/mapper/mapperTree.c index 9bf74ff2..8c23417c 100644 --- a/src/map/mapper/mapperTree.c +++ b/src/map/mapper/mapperTree.c @@ -162,7 +162,7 @@ int Map_LibraryReadFileTree( Map_SuperLib_t * pLib, FILE * pFile, char *pFileNam } pLibName = strtok( pTemp, " \t\r\n" ); - pLib->pGenlib = Abc_FrameReadLibGen(); + pLib->pGenlib = (Mio_Library_t *)Abc_FrameReadLibGen(); if ( pLib->pGenlib == NULL || strcmp( Mio_LibraryReadName(pLib->pGenlib), pLibName ) ) { printf( "Supergate library \"%s\" requires the use of genlib library \"%s\".\n", pFileName, pLibName ); @@ -410,7 +410,7 @@ int Map_LibraryReadFileTreeStr( Map_SuperLib_t * pLib, Vec_Str_t * vStr, char * } pLibName = strtok( pTemp, " \t\r\n" ); - pLib->pGenlib = Abc_FrameReadLibGen(); + pLib->pGenlib = (Mio_Library_t *)Abc_FrameReadLibGen(); // if ( pLib->pGenlib == NULL || strcmp( , pLibName ) ) if ( pLib->pGenlib == NULL || Map_LibraryCompareLibNames(Mio_LibraryReadName(pLib->pGenlib), pLibName) ) { diff --git a/src/map/scl/scl.c b/src/map/scl/scl.c index ee474c7d..f5c9d914 100644 --- a/src/map/scl/scl.c +++ b/src/map/scl/scl.c @@ -120,7 +120,7 @@ int Scl_CommandRead( Abc_Frame_t * pAbc, int argc, char ** argv ) // read new library Abc_SclLoad( pFileName, (SC_Lib **)&pAbc->pLibScl ); if ( fVerbose ) - Abc_SclWriteText( "scl_out.txt", pAbc->pLibScl ); + Abc_SclWriteText( "scl_out.txt", (SC_Lib *)pAbc->pLibScl ); return 0; usage: @@ -221,7 +221,7 @@ int Scl_CommandPrint( Abc_Frame_t * pAbc, int argc, char **argv ) } // save current library - Abc_SclPrintCells( pAbc->pLibScl ); + Abc_SclPrintCells( (SC_Lib *)pAbc->pLibScl ); return 0; usage: @@ -274,7 +274,7 @@ int Scl_CommandPrintGS( Abc_Frame_t * pAbc, int argc, char **argv ) } // save current library - Abc_SclPrintGateSizes( pAbc->pLibScl, Abc_FrameReadNtk(pAbc) ); + Abc_SclPrintGateSizes( (SC_Lib *)pAbc->pLibScl, Abc_FrameReadNtk(pAbc) ); return 0; usage: @@ -344,7 +344,7 @@ int Scl_CommandStime( Abc_Frame_t * pAbc, int argc, char **argv ) return 1; } - Abc_SclTimePerform( pAbc->pLibScl, Abc_FrameReadNtk(pAbc), fUseWireLoads, fShowAll, fShort ); + Abc_SclTimePerform( (SC_Lib *)pAbc->pLibScl, Abc_FrameReadNtk(pAbc), fUseWireLoads, fShowAll, fShort ); return 0; usage: @@ -611,7 +611,7 @@ int Scl_CommandGsize( Abc_Frame_t * pAbc, int argc, char **argv ) return 1; } - Abc_SclSizingPerform( pAbc->pLibScl, Abc_FrameReadNtk(pAbc), pPars ); + Abc_SclSizingPerform( (SC_Lib *)pAbc->pLibScl, Abc_FrameReadNtk(pAbc), pPars ); return 0; usage: @@ -717,7 +717,7 @@ int Scl_CommandUpsize( Abc_Frame_t * pAbc, int argc, char **argv ) return 1; } - Abc_SclUpsizePerform( pAbc->pLibScl, pNtk, Window, Ratio, nIters, fVerbose ); + Abc_SclUpsizePerform( (SC_Lib *)pAbc->pLibScl, pNtk, Window, Ratio, nIters, fVerbose ); return 0; usage: @@ -782,7 +782,7 @@ int Scl_CommandMinsize( Abc_Frame_t * pAbc, int argc, char **argv ) return 1; } - Abc_SclMinsizePerform( pAbc->pLibScl, pNtk, fVerbose ); + Abc_SclMinsizePerform( (SC_Lib *)pAbc->pLibScl, pNtk, fVerbose ); return 0; usage: diff --git a/src/map/scl/sclBuff.c b/src/map/scl/sclBuff.c index 5a438cd4..808cd1ec 100644 --- a/src/map/scl/sclBuff.c +++ b/src/map/scl/sclBuff.c @@ -136,7 +136,7 @@ Abc_Obj_t * Abc_SclPerformBufferingOne( Abc_Obj_t * pObj, int Degree, int fVerbo // collect fanouts and sort by reverse level vFanouts = Vec_PtrAlloc( Abc_ObjFanoutNum(pObj) ); Abc_NodeCollectFanouts( pObj, vFanouts ); - Vec_PtrSort( vFanouts, Abc_NodeCompareLevels ); + Vec_PtrSort( vFanouts, (int (*)(void))Abc_NodeCompareLevels ); // select the first Degree fanouts pBuffer = Abc_NtkCreateNodeBuf( pObj->pNtk, NULL ); // check if it is possible to not increase level diff --git a/src/map/scl/sclInt.h b/src/map/scl/sclInt.h index bf2ee0f5..9474e24d 100644 --- a/src/map/scl/sclInt.h +++ b/src/map/scl/sclInt.h @@ -198,8 +198,8 @@ static inline SC_Cell * SC_LibCell( SC_Lib * p, int i ) { return (SC_ static inline SC_Pin * SC_CellPin( SC_Cell * p, int i ) { return (SC_Pin *)Vec_PtrEntry(p->vPins, i); } static inline Vec_Wrd_t * SC_CellFunc( SC_Cell * p ) { return SC_CellPin(p, p->n_inputs)->vFunc; } -static inline double SC_LibCapFf( SC_Lib * p, double cap ) { return cap * p->unit_cap_fst * pow(10, 15 - p->unit_cap_snd); } -static inline double SC_LibTimePs( SC_Lib * p, double time ) { return time * pow(10, 12 - p->unit_time); } +static inline double SC_LibCapFf( SC_Lib * p, double cap ) { return cap * p->unit_cap_fst * pow(10.0, 15 - p->unit_cap_snd); } +static inline double SC_LibTimePs( SC_Lib * p, double time ) { return time * pow(10.0, 12 - p->unit_time); } #define SC_LibForEachCell( p, pCell, i ) Vec_PtrForEachEntry( SC_Cell *, p->vCells, pCell, i ) #define SC_LibForEachCellClass( p, pCell, i ) Vec_PtrForEachEntry( SC_Cell *, p->vCellClasses, pCell, i ) diff --git a/src/map/scl/sclUtil.c b/src/map/scl/sclUtil.c index f3a88e72..6a1f6a36 100644 --- a/src/map/scl/sclUtil.c +++ b/src/map/scl/sclUtil.c @@ -20,6 +20,7 @@ #include "sclInt.h" #include "map/mio/mio.h" +#include "bool/kit/kit.h" ABC_NAMESPACE_IMPL_START @@ -135,7 +136,7 @@ void Abc_SclLinkCells( SC_Lib * p ) Vec_PtrPush( vList, pCell ); qsort( (void *)Vec_PtrArray(vList), Vec_PtrSize(vList), sizeof(void *), (int(*)(const void *,const void *))Abc_SclCompareCells ); // create new representative - pRepr = Vec_PtrEntry( vList, 0 ); + pRepr = (SC_Cell *)Vec_PtrEntry( vList, 0 ); pRepr->pNext = pRepr->pPrev = pRepr; pRepr->Order = 0; // relink cells @@ -152,7 +153,6 @@ void Abc_SclLinkCells( SC_Lib * p ) } void Abc_SclPrintCells( SC_Lib * p ) { - extern void Kit_DsdPrintFromTruth( unsigned * pTruth, int nVars ); SC_Cell * pCell, * pRepr; int i, k, j, nLength = 0; assert( Vec_PtrSize(p->vCellClasses) > 0 ); |