diff options
| -rw-r--r-- | src/base/cba/cbaPrs.h | 3 | ||||
| -rw-r--r-- | src/base/cba/cbaReadBlif.c | 2 | ||||
| -rw-r--r-- | src/base/cba/cbaReadVer.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/base/cba/cbaPrs.h b/src/base/cba/cbaPrs.h index 93f60913..5598ab2e 100644 --- a/src/base/cba/cbaPrs.h +++ b/src/base/cba/cbaPrs.h @@ -102,6 +102,7 @@ struct Prs_Man_t_ static inline Prs_Ntk_t * Prs_ManNtk( Vec_Ptr_t * vPrs, int i ) { return (Prs_Ntk_t *)Vec_PtrEntry(vPrs, i); } static inline Prs_Ntk_t * Prs_ManRoot( Vec_Ptr_t * vPrs ) { return Prs_ManNtk(vPrs, 0); } +static inline Abc_Nam_t * Prs_ManNameMan( Vec_Ptr_t * vPrs ) { return Prs_ManRoot(vPrs)->pStrs; } static inline int Prs_NtkId( Prs_Ntk_t * p ) { return p->iModuleName; } static inline int Prs_NtkPioNum( Prs_Ntk_t * p ) { return Vec_IntSize(&p->vInouts); } @@ -322,7 +323,7 @@ static inline int Prs_ManMemory( Vec_Ptr_t * vPrs ) int nMem = Vec_PtrMemory(vPrs); Vec_PtrForEachEntry( Prs_Ntk_t *, vPrs, pNtk, i ) nMem += Prs_NtkMemory( pNtk ); - nMem += Abc_NamMemUsed(pNtk->pStrs); + nMem += Abc_NamMemUsed(Prs_ManNameMan(vPrs)); return nMem; } diff --git a/src/base/cba/cbaReadBlif.c b/src/base/cba/cbaReadBlif.c index ce0bf3ea..0dafc16f 100644 --- a/src/base/cba/cbaReadBlif.c +++ b/src/base/cba/cbaReadBlif.c @@ -422,7 +422,7 @@ void Prs_ManReadBlifTest() Vec_Ptr_t * vPrs = Prs_ManReadBlif( "c/hie/dump/1/netlist_1_out8.blif" ); if ( !vPrs ) return; printf( "Finished reading %d networks. ", Vec_PtrSize(vPrs) ); - printf( "NameIDs = %d. ", Abc_NamObjNumMax(Prs_ManRoot(vPrs)->pStrs) ); + printf( "NameIDs = %d. ", Abc_NamObjNumMax(Prs_ManNameMan(vPrs)) ); printf( "Memory = %.2f MB. ", 1.0*Prs_ManMemory(vPrs)/(1<<20) ); Abc_PrintTime( 1, "Time", Abc_Clock() - clk ); // Abc_NamPrint( p->pStrs ); diff --git a/src/base/cba/cbaReadVer.c b/src/base/cba/cbaReadVer.c index bc5f5c95..6d5a31df 100644 --- a/src/base/cba/cbaReadVer.c +++ b/src/base/cba/cbaReadVer.c @@ -791,7 +791,7 @@ void Prs_ManReadVerilogTest( char * pFileName ) // Vec_Ptr_t * vPrs = Prs_ManReadVerilog( "aga/ray/ray_wide.v" ); if ( !vPrs ) return; printf( "Finished reading %d networks. ", Vec_PtrSize(vPrs) ); - printf( "NameIDs = %d. ", Abc_NamObjNumMax(Prs_ManRoot(vPrs)->pStrs) ); + printf( "NameIDs = %d. ", Abc_NamObjNumMax(Prs_ManNameMan(vPrs)) ); printf( "Memory = %.2f MB. ", 1.0*Prs_ManMemory(vPrs)/(1<<20) ); Abc_PrintTime( 1, "Time", Abc_Clock() - clk ); Prs_ManWriteVerilog( "c/hie/dump/1/netlist_1_out_new.v", vPrs ); |