summaryrefslogtreecommitdiffstats
path: root/src/aig/gia
diff options
context:
space:
mode:
Diffstat (limited to 'src/aig/gia')
-rw-r--r--src/aig/gia/giaIf.c2
-rw-r--r--src/aig/gia/giaLf.c30
-rw-r--r--src/aig/gia/giaMf.c6
-rw-r--r--src/aig/gia/giaNf.c2
-rw-r--r--src/aig/gia/giaStr.c2
-rw-r--r--src/aig/gia/giaSweep.c2
6 files changed, 22 insertions, 22 deletions
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c
index 45d2b49f..e295bdbb 100644
--- a/src/aig/gia/giaIf.c
+++ b/src/aig/gia/giaIf.c
@@ -2123,7 +2123,7 @@ Gia_Man_t * Gia_ManPerformMappingInt( Gia_Man_t * p, If_Par_t * pPars )
Gia_Man_t * Gia_ManPerformMapping( Gia_Man_t * p, void * pp )
{
Gia_Man_t * pNew;
- if ( p->pManTime && Tim_ManBoxNum(p->pManTime) && Gia_ManIsNormalized(p) )
+ if ( p->pManTime && Tim_ManBoxNum((Tim_Man_t*)p->pManTime) && Gia_ManIsNormalized(p) )
{
pNew = Gia_ManDupUnnormalize( p );
if ( pNew == NULL )
diff --git a/src/aig/gia/giaLf.c b/src/aig/gia/giaLf.c
index 851fa3b5..72deabeb 100644
--- a/src/aig/gia/giaLf.c
+++ b/src/aig/gia/giaLf.c
@@ -1511,12 +1511,12 @@ int Lf_ManSetMapRefs( Lf_Man_t * p )
if ( p->pGia->pManTime != NULL )
{
assert( Gia_ManBufNum(p->pGia) );
- Tim_ManIncrementTravId( p->pGia->pManTime );
+ Tim_ManIncrementTravId( (Tim_Man_t*)p->pGia->pManTime );
if ( p->pPars->fDoAverage )
for ( i = 0; i < Gia_ManCoNum(p->pGia); i++ )
- Tim_ManSetCoRequired( p->pGia->pManTime, i, (int)(Lf_ObjCoArrival(p, i) * (100.0 + p->pPars->nRelaxRatio) / 100.0) );
+ Tim_ManSetCoRequired( (Tim_Man_t*)p->pGia->pManTime, i, (int)(Lf_ObjCoArrival(p, i) * (100.0 + p->pPars->nRelaxRatio) / 100.0) );
else
- Tim_ManInitPoRequiredAll( p->pGia->pManTime, Delay );
+ Tim_ManInitPoRequiredAll( (Tim_Man_t*)p->pGia->pManTime, Delay );
Gia_ManForEachObjReverse1( p->pGia, pObj, i )
{
if ( Gia_ObjIsBuf(pObj) )
@@ -1527,11 +1527,11 @@ int Lf_ManSetMapRefs( Lf_Man_t * p )
Lf_ManSetMapRefsOne( p, i );
}
else if ( Gia_ObjIsCi(pObj) )
- Tim_ManSetCiRequired( p->pGia->pManTime, Gia_ObjCioId(pObj), Lf_ObjRequired(p, i) );
+ Tim_ManSetCiRequired( (Tim_Man_t*)p->pGia->pManTime, Gia_ObjCioId(pObj), Lf_ObjRequired(p, i) );
else if ( Gia_ObjIsCo(pObj) )
{
int iDriverId = Gia_ObjFaninId0(pObj, i);
- int reqTime = Tim_ManGetCoRequired( p->pGia->pManTime, Gia_ObjCioId(pObj) );
+ int reqTime = Tim_ManGetCoRequired( (Tim_Man_t*)p->pGia->pManTime, Gia_ObjCioId(pObj) );
Lf_ObjSetRequired( p, iDriverId, reqTime );
if ( Gia_ObjIsAndNotBuf(Gia_ObjFanin0(pObj)) )
Lf_ObjMapRefInc( p, iDriverId );
@@ -1615,12 +1615,12 @@ void Lf_ManCountMapRefs( Lf_Man_t * p )
Gia_ManCleanMark0(p->pGia);
if ( p->pGia->pManTime != NULL )
{
- Tim_ManIncrementTravId( p->pGia->pManTime );
+ Tim_ManIncrementTravId( (Tim_Man_t*)p->pGia->pManTime );
if ( p->pPars->fDoAverage )
for ( i = 0; i < Gia_ManCoNum(p->pGia); i++ )
- Tim_ManSetCoRequired( p->pGia->pManTime, i, (int)(Lf_ObjCoArrival(p, i) * (100.0 + p->pPars->nRelaxRatio) / 100.0) );
+ Tim_ManSetCoRequired( (Tim_Man_t*)p->pGia->pManTime, i, (int)(Lf_ObjCoArrival(p, i) * (100.0 + p->pPars->nRelaxRatio) / 100.0) );
else
- Tim_ManInitPoRequiredAll( p->pGia->pManTime, Delay );
+ Tim_ManInitPoRequiredAll( (Tim_Man_t*)p->pGia->pManTime, Delay );
Gia_ManForEachObjReverse1( p->pGia, pObj, i )
{
if ( Gia_ObjIsBuf(pObj) )
@@ -1631,10 +1631,10 @@ void Lf_ManCountMapRefs( Lf_Man_t * p )
Lf_ManCountMapRefsOne( p, i );
}
else if ( Gia_ObjIsCi(pObj) )
- Tim_ManSetCiRequired( p->pGia->pManTime, Gia_ObjCioId(pObj), Lf_ObjRequired(p, i) );
+ Tim_ManSetCiRequired( (Tim_Man_t*)p->pGia->pManTime, Gia_ObjCioId(pObj), Lf_ObjRequired(p, i) );
else if ( Gia_ObjIsCo(pObj) )
{
- int reqTime = Tim_ManGetCoRequired( p->pGia->pManTime, Gia_ObjCioId(pObj) );
+ int reqTime = Tim_ManGetCoRequired( (Tim_Man_t*)p->pGia->pManTime, Gia_ObjCioId(pObj) );
Lf_ObjSetRequired( p, Gia_ObjFaninId0(pObj, i), reqTime );
}
else assert( 0 );
@@ -2095,7 +2095,7 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
if ( p->pGia->pManTime != NULL )
{
assert( !Gia_ManBufNum(p->pGia) );
- Tim_ManIncrementTravId( p->pGia->pManTime );
+ Tim_ManIncrementTravId( (Tim_Man_t*)p->pGia->pManTime );
Gia_ManForEachObj1( p->pGia, pObj, i )
{
if ( Gia_ObjIsBuf(pObj) )
@@ -2104,13 +2104,13 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
Lf_ObjMergeOrder( p, i );
else if ( Gia_ObjIsCi(pObj) )
{
- arrTime = Tim_ManGetCiArrival( p->pGia->pManTime, Gia_ObjCioId(pObj) );
+ arrTime = Tim_ManGetCiArrival( (Tim_Man_t*)p->pGia->pManTime, Gia_ObjCioId(pObj) );
Lf_ObjSetCiArrival( p, Gia_ObjCioId(pObj), arrTime );
}
else if ( Gia_ObjIsCo(pObj) )
{
arrTime = Lf_ObjCoArrival( p, Gia_ObjCioId(pObj) );
- Tim_ManSetCoArrival( p->pGia->pManTime, Gia_ObjCioId(pObj), arrTime );
+ Tim_ManSetCoArrival( (Tim_Man_t*)p->pGia->pManTime, Gia_ObjCioId(pObj), arrTime );
}
else assert( 0 );
}
@@ -2128,7 +2128,7 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
Lf_ManCountMapRefs( p );
else
Lf_ManSetMapRefs( p );
- Lf_ManPrintStats( p, p->fUseEla ? "Ela " : (p->Iter ? "Area " : "Delay") );
+ Lf_ManPrintStats( p, (char *)(p->fUseEla ? "Ela " : (p->Iter ? "Area " : "Delay")) );
}
Gia_Man_t * Lf_ManPerformMappingInt( Gia_Man_t * pGia, Jf_Par_t * pPars )
{
@@ -2193,7 +2193,7 @@ Gia_Man_t * Lf_ManPerformMappingInt( Gia_Man_t * pGia, Jf_Par_t * pPars )
Gia_Man_t * Lf_ManPerformMapping( Gia_Man_t * p, Jf_Par_t * pPars )
{
Gia_Man_t * pNew;
- if ( p->pManTime && Tim_ManBoxNum(p->pManTime) && Gia_ManIsNormalized(p) )
+ if ( p->pManTime && Tim_ManBoxNum((Tim_Man_t*)p->pManTime) && Gia_ManIsNormalized(p) )
{
Tim_Man_t * pTimOld = (Tim_Man_t *)p->pManTime;
p->pManTime = Tim_ManDup( pTimOld, 1 );
diff --git a/src/aig/gia/giaMf.c b/src/aig/gia/giaMf.c
index b90e7bc9..086da95b 100644
--- a/src/aig/gia/giaMf.c
+++ b/src/aig/gia/giaMf.c
@@ -1469,7 +1469,7 @@ void Mf_ManComputeCuts( Mf_Man_t * p )
Gia_ManForEachAndId( p->pGia, i )
Mf_ObjMergeOrder( p, i );
Mf_ManSetMapRefs( p );
- Mf_ManPrintStats( p, p->fUseEla ? "Ela " : (p->Iter ? "Area " : "Delay") );
+ Mf_ManPrintStats( p, (char *)(p->fUseEla ? "Ela " : (p->Iter ? "Area " : "Delay")) );
}
/**Function*************************************************************
@@ -1570,7 +1570,7 @@ void Mf_ManComputeMapping( Mf_Man_t * p )
Gia_ManForEachAndId( p->pGia, i )
Mf_ObjComputeBestCut( p, i );
Mf_ManSetMapRefs( p );
- Mf_ManPrintStats( p, p->fUseEla ? "Ela " : (p->Iter ? "Area " : "Delay") );
+ Mf_ManPrintStats( p, (char *)(p->fUseEla ? "Ela " : (p->Iter ? "Area " : "Delay")) );
}
Gia_Man_t * Mf_ManPerformMapping( Gia_Man_t * pGia, Jf_Par_t * pPars )
{
@@ -1641,7 +1641,7 @@ Cnf_Dat_t * Mf_ManGenerateCnf( Gia_Man_t * pGia, int nLutSize, int fCnfObjIds, i
pNew = Mf_ManPerformMapping( pGia, pPars );
Gia_ManStopP( &pNew );
// Cnf_DataPrint( (Cnf_Dat_t *)pGia->pData, 1 );
- return pGia->pData;
+ return (Cnf_Dat_t*)pGia->pData;
}
void Mf_ManDumpCnf( Gia_Man_t * p, char * pFileName, int nLutSize, int fCnfObjIds, int fAddOrCla, int fVerbose )
{
diff --git a/src/aig/gia/giaNf.c b/src/aig/gia/giaNf.c
index 941aadd6..a7c6ef5d 100644
--- a/src/aig/gia/giaNf.c
+++ b/src/aig/gia/giaNf.c
@@ -2126,7 +2126,7 @@ Gia_Man_t * Nf_ManPerformMapping( Gia_Man_t * pGia, Jf_Par_t * pPars )
{
Nf_ManComputeMapping( p );
Nf_ManSetMapRefs( p );
- Nf_ManPrintStats( p, p->Iter ? "Area " : "Delay" );
+ Nf_ManPrintStats( p, (char *)(p->Iter ? "Area " : "Delay") );
}
/*
p->fUseEla = 1;
diff --git a/src/aig/gia/giaStr.c b/src/aig/gia/giaStr.c
index f3416683..ea44ebd6 100644
--- a/src/aig/gia/giaStr.c
+++ b/src/aig/gia/giaStr.c
@@ -1379,7 +1379,7 @@ Gia_Man_t * Gia_ManLutBalance( Gia_Man_t * p, int nLutSize, int fUseMuxes, int f
Str_Ntk_t * pNtk;
Gia_Man_t * pNew;
abctime clk = Abc_Clock();
- if ( p->pManTime && Tim_ManBoxNum(p->pManTime) && Gia_ManIsNormalized(p) )
+ if ( p->pManTime && Tim_ManBoxNum((Tim_Man_t*)p->pManTime) && Gia_ManIsNormalized(p) )
{
Tim_Man_t * pTimOld = (Tim_Man_t *)p->pManTime;
p->pManTime = Tim_ManDup( pTimOld, 16 );
diff --git a/src/aig/gia/giaSweep.c b/src/aig/gia/giaSweep.c
index 22d1bf55..e6ee618e 100644
--- a/src/aig/gia/giaSweep.c
+++ b/src/aig/gia/giaSweep.c
@@ -190,7 +190,7 @@ Gia_Man_t * Gia_ManDupWithBoxes( Gia_Man_t * p, int fSeq )
assert( p->pAigExtra != NULL );
assert( pNew->pAigExtra == NULL );
pNew->pAigExtra = Gia_ManUpdateExtraAig2( p->pManTime, p->pAigExtra, vBoxesLeft );
- assert( Gia_ManCiNum(pNew) == Tim_ManPiNum(pNew->pManTime) + Gia_ManCoNum(pNew->pAigExtra) );
+ assert( Gia_ManCiNum(pNew) == Tim_ManPiNum((Tim_Man_t*)pNew->pManTime) + Gia_ManCoNum(pNew->pAigExtra) );
Vec_IntFree( vBoxesLeft );
return pNew;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 18:01:47 +0000