From db43d6fbd894474024c13cb2af4691f290299b69 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Tue, 14 Jun 2016 20:43:50 -0700 Subject: Adding switch -P to command 'cover'. --- src/map/cov/cov.h | 4 ++-- src/map/cov/covCore.c | 4 ++-- src/map/cov/covMan.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/map/cov') diff --git a/src/map/cov/cov.h b/src/map/cov/cov.h index d32e1c4c..856788b4 100644 --- a/src/map/cov/cov.h +++ b/src/map/cov/cov.h @@ -88,9 +88,9 @@ extern Abc_Ntk_t * Abc_NtkCovDerive( Cov_Man_t * p, Abc_Ntk_t * pNtk ); extern Abc_Ntk_t * Abc_NtkCovDeriveClean( Cov_Man_t * p, Abc_Ntk_t * pNtk ); extern Abc_Ntk_t * Abc_NtkCovDeriveRegular( Cov_Man_t * p, Abc_Ntk_t * pNtk ); /*=== covCore.c ===========================================================*/ -extern Abc_Ntk_t * Abc_NtkSopEsopCover( Abc_Ntk_t * pNtk, int nFaninMax, int fUseEsop, int fUseSop, int fUseInvs, int fVerbose ); +extern Abc_Ntk_t * Abc_NtkSopEsopCover( Abc_Ntk_t * pNtk, int nFaninMax, int nCubesMax, int fUseEsop, int fUseSop, int fUseInvs, int fVerbose ); /*=== covMan.c ============================================================*/ -extern Cov_Man_t * Cov_ManAlloc( Abc_Ntk_t * pNtk, int nFaninMax ); +extern Cov_Man_t * Cov_ManAlloc( Abc_Ntk_t * pNtk, int nFaninMax, int nCubesMax ); extern void Cov_ManFree( Cov_Man_t * p ); extern void Abc_NodeCovDropData( Cov_Man_t * p, Abc_Obj_t * pObj ); /*=== covTest.c ===========================================================*/ diff --git a/src/map/cov/covCore.c b/src/map/cov/covCore.c index 5d7f52dd..b4faf308 100644 --- a/src/map/cov/covCore.c +++ b/src/map/cov/covCore.c @@ -57,7 +57,7 @@ static Min_Cube_t * Abc_NodeCovSum( Cov_Man_t * p, Min_Cube_t * pCover0, Min_Cub SeeAlso [] ***********************************************************************/ -Abc_Ntk_t * Abc_NtkSopEsopCover( Abc_Ntk_t * pNtk, int nFaninMax, int fUseEsop, int fUseSop, int fUseInvs, int fVerbose ) +Abc_Ntk_t * Abc_NtkSopEsopCover( Abc_Ntk_t * pNtk, int nFaninMax, int nCubesMax, int fUseEsop, int fUseSop, int fUseInvs, int fVerbose ) { Abc_Ntk_t * pNtkNew; Cov_Man_t * p; @@ -65,7 +65,7 @@ Abc_Ntk_t * Abc_NtkSopEsopCover( Abc_Ntk_t * pNtk, int nFaninMax, int fUseEsop, assert( Abc_NtkIsStrash(pNtk) ); // create the manager - p = Cov_ManAlloc( pNtk, nFaninMax ); + p = Cov_ManAlloc( pNtk, nFaninMax, nCubesMax ); p->fUseEsop = fUseEsop; p->fUseSop = fUseSop; pNtk->pManCut = p; diff --git a/src/map/cov/covMan.c b/src/map/cov/covMan.c index fb6353c7..64620a5a 100644 --- a/src/map/cov/covMan.c +++ b/src/map/cov/covMan.c @@ -42,7 +42,7 @@ ABC_NAMESPACE_IMPL_START SeeAlso [] ***********************************************************************/ -Cov_Man_t * Cov_ManAlloc( Abc_Ntk_t * pNtk, int nFaninMax ) +Cov_Man_t * Cov_ManAlloc( Abc_Ntk_t * pNtk, int nFaninMax, int nCubesMax ) { Cov_Man_t * pMan; Cov_Obj_t * pMem; @@ -54,7 +54,7 @@ Cov_Man_t * Cov_ManAlloc( Abc_Ntk_t * pNtk, int nFaninMax ) pMan = ABC_ALLOC( Cov_Man_t, 1 ); memset( pMan, 0, sizeof(Cov_Man_t) ); pMan->nFaninMax = nFaninMax; - pMan->nCubesMax = 2 * pMan->nFaninMax; + pMan->nCubesMax = nCubesMax; pMan->nWords = Abc_BitWordNum( nFaninMax * 2 ); // get the cubes -- cgit v1.2.3