summaryrefslogtreecommitdiffstats
path: root/src/base
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2012-07-07 18:41:02 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2012-07-07 18:41:02 -0700
commitea98a2497e3e3df73ebfd27d3974d2de0e3c1bf8 (patch)
treebe95e2d530a62b6fe45a8882f5c1bfa43d303a34 /src/base
parent4760983a461142eacceeed45ddcf5598e6a389a2 (diff)
downloadabc-ea98a2497e3e3df73ebfd27d3974d2de0e3c1bf8.tar.gz
abc-ea98a2497e3e3df73ebfd27d3974d2de0e3c1bf8.tar.bz2
abc-ea98a2497e3e3df73ebfd27d3974d2de0e3c1bf8.zip
Fixing time primtouts throughout the code.
Diffstat (limited to 'src/base')
-rw-r--r--src/base/abci/abcPrint.c6
-rw-r--r--src/base/abci/abcResub.c2
-rw-r--r--src/base/io/ioWriteBlif.c3
3 files changed, 6 insertions, 5 deletions
diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c
index c0f97530..afedabc2 100644
--- a/src/base/abci/abcPrint.c
+++ b/src/base/abci/abcPrint.c
@@ -37,10 +37,10 @@ ABC_NAMESPACE_IMPL_START
//extern int s_TotalNodes = 0;
//extern int s_TotalChanges = 0;
-int s_MappingTime = 0;
+clock_t s_MappingTime = 0;
int s_MappingMem = 0;
-int s_ResubTime = 0;
-int s_ResynTime = 0;
+clock_t s_ResubTime = 0;
+clock_t s_ResynTime = 0;
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///
diff --git a/src/base/abci/abcResub.c b/src/base/abci/abcResub.c
index 6e2b95c3..8ae4795a 100644
--- a/src/base/abci/abcResub.c
+++ b/src/base/abci/abcResub.c
@@ -117,7 +117,7 @@ static Dec_Graph_t * Abc_ManResubDivs3( Abc_ManRes_t * p, int Required );
static Vec_Ptr_t * Abc_CutFactorLarge( Abc_Obj_t * pNode, int nLeavesMax );
static int Abc_CutVolumeCheck( Abc_Obj_t * pNode, Vec_Ptr_t * vLeaves );
-extern int s_ResubTime;
+extern clock_t s_ResubTime;
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///
diff --git a/src/base/io/ioWriteBlif.c b/src/base/io/ioWriteBlif.c
index e7e8cff3..eff37870 100644
--- a/src/base/io/ioWriteBlif.c
+++ b/src/base/io/ioWriteBlif.c
@@ -684,8 +684,9 @@ char * Io_NtkDeriveSop( Mem_Flex_t * pMem, word uTruth, int nVars, Vec_Int_t * v
// check the case of constant cover
if ( Vec_IntSize(vCover) == 0 || (Vec_IntSize(vCover) == 1 && Vec_IntEntry(vCover,0) == 0) )
{
+ char * pStr0 = " 0\n", * pStr1 = " 1\n";
assert( RetValue == 0 );
- return Vec_IntSize(vCover) == 0 ? " 0\n" : " 1\n";
+ return Vec_IntSize(vCover) == 0 ? pStr0 : pStr1;
}
// derive the AIG for that tree
pSop = Abc_SopCreateFromIsop( pMem, nVars, vCover );