Several bug fixes and other improvements.

4 files changed, 10 insertions, 38 deletions

diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 9d30fee8..566762e3 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -855,6 +855,10 @@ void Abc_End( Abc_Frame_t * pAbc )
     Abc_FrameClearDesign(); 
 
     {
+//        extern void Au_TabManPrint();
+//        Au_TabManPrint();
+    }
+    {
         extern void If_LutLibFree( If_Lib_t * pLutLib );
         if ( Abc_FrameGetGlobalFrame()->pAbc8Lib )
             If_LutLibFree( (If_Lib_t *)Abc_FrameGetGlobalFrame()->pAbc8Lib );
@@ -8666,8 +8670,8 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
 
 /*
 {
-    extern Abc_Ntk_t * Abc_NtkBddDec( Abc_Ntk_t * pNtk, int fVerbose );
-    pNtkRes = Abc_NtkBddDec( pNtk, fVerbose );
+    extern Abc_Ntk_t * Au_ManDeriveFromAig( Abc_Ntk_t * pAig );
+    pNtkRes = Au_ManDeriveFromAig( pNtk );
     if ( pNtkRes == NULL )
     {
         Abc_Print( -1, "Command has failed.\n" );
@@ -8679,12 +8683,12 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
 */
 
 //    Abc_NtkCheckAbsorb( pNtk, 4 );
-
+/*
     if ( fBmc )
         Abc_NktMffcServerTest( pNtk );
     else
         Abc_ResPartitionTest( pNtk );
-
+*/
 //    Abc_NtkHelloWorld( pNtk );
 //    Abc_NktMffcTest( pNtk );
 //    Abc_NktMffcServerTest( pNtk );
diff --git a/src/base/abci/abcDar.c b/src/base/abci/abcDar.c
index 62f9b325..b28d3de4 100644
--- a/src/base/abci/abcDar.c
+++ b/src/base/abci/abcDar.c
@@ -231,7 +231,6 @@ Abc_Ntk_t * Abc_NtkFromDar( Abc_Ntk_t * pNtkOld, Aig_Man_t * pMan )
 {
     Vec_Ptr_t * vNodes;
     Abc_Ntk_t * pNtkNew;
-    Abc_Obj_t * pObjNew;
     Aig_Obj_t * pObj;
     int i;
     assert( pMan->nAsserts == 0 );
@@ -259,13 +258,6 @@ Abc_Ntk_t * Abc_NtkFromDar( Abc_Ntk_t * pNtkOld, Aig_Man_t * pMan )
         Abc_ObjAddFanin( Abc_NtkCo(pNtkNew, i), (Abc_Obj_t *)Aig_ObjChild0Copy(pObj) );
     }
     // if there are assertions, add them
-    if ( pMan->nAsserts > 0 )
-        Aig_ManForEachAssert( pMan, pObj, i )
-        {
-            pObjNew = Abc_NtkCreateAssert(pNtkNew);
-            Abc_ObjAssignName( pObjNew, "assert_", Abc_ObjName(pObjNew) );
-            Abc_ObjAddFanin( pObjNew, (Abc_Obj_t *)Aig_ObjChild0Copy(pObj) );
-        }
     if ( !Abc_NtkCheck( pNtkNew ) )
         fprintf( stdout, "Abc_NtkFromDar(): Network check has failed.\n" );
     return pNtkNew;
@@ -386,13 +378,6 @@ Abc_Ntk_t * Abc_NtkFromDarSeqSweep( Abc_Ntk_t * pNtkOld, Aig_Man_t * pMan )
         }
     }
     // if there are assertions, add them
-    if ( pMan->nAsserts > 0 )
-        Aig_ManForEachAssert( pMan, pObj, i )
-        {
-            pObjNew = Abc_NtkCreateAssert(pNtkNew);
-            Abc_ObjAssignName( pObjNew, "assert_", Abc_ObjName(pObjNew) );
-            Abc_ObjAddFanin( pObjNew, (Abc_Obj_t *)Aig_ObjChild0Copy(pObj) );
-        }
     if ( !Abc_NtkCheck( pNtkNew ) )
         fprintf( stdout, "Abc_NtkFromDar(): Network check has failed.\n" );
     return pNtkNew;
diff --git a/src/base/abci/abcMffc.c b/src/base/abci/abcMffc.c
index 1a1a81b2..0ffc6f1d 100644
--- a/src/base/abci/abcMffc.c
+++ b/src/base/abci/abcMffc.c
@@ -95,23 +95,11 @@ void Abc_MffcRef_rec( Abc_Obj_t * pNode )
 void Abc_MffcCollectNodes( Abc_Obj_t ** pNodes, int nNodes, Vec_Ptr_t * vNodes )
 {
     int i;
-/*
-    for ( i = 0; i < nNodes; i++ )
-    {
-        pNodes[i]->vFanouts.nSize += 100;
-//Abc_ObjPrint( stdout, pNodes[i] );
-    }
-//printf( "\n" );
-*/
-
     Vec_PtrClear( vNodes );
     for ( i = 0; i < nNodes; i++ )
         Abc_MffcDeref_rec( pNodes[i], vNodes );
     for ( i = 0; i < nNodes; i++ )
         Abc_MffcRef_rec( pNodes[i] );
-
-//    for ( i = 0; i < nNodes; i++ )
-//        pNodes[i]->vFanouts.nSize -= 100;
 }
 
 /**Function*************************************************************
diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c
index 9f52d71f..bd5f986f 100644
--- a/src/base/abci/abcPrint.c
+++ b/src/base/abci/abcPrint.c
@@ -693,7 +693,8 @@ void Abc_NtkPrintMffc( FILE * pFile, Abc_Ntk_t * pNtk )
     int i;
     extern void Abc_NodeMffcConeSuppPrint( Abc_Obj_t * pNode );
     Abc_NtkForEachNode( pNtk, pNode, i )
-        Abc_NodeMffcConeSuppPrint( pNode );
+        if ( Abc_ObjFanoutNum(pNode) > 1 )
+            Abc_NodeMffcConeSuppPrint( pNode );
 }
 
 /**Function*************************************************************
@@ -1147,9 +1148,6 @@ void Abc_ObjPrint( FILE * pFile, Abc_Obj_t * pObj )
         case ABC_OBJ_CONST1: 
             fprintf( pFile, "Const1 " );  
             break;
-        case ABC_OBJ_PIO:    
-            fprintf( pFile, "PIO    " );  
-            break;
         case ABC_OBJ_PI:     
             fprintf( pFile, "PI     " );  
             break;
@@ -1162,9 +1160,6 @@ void Abc_ObjPrint( FILE * pFile, Abc_Obj_t * pObj )
         case ABC_OBJ_BO:     
             fprintf( pFile, "BO     " );  
             break;
-        case ABC_OBJ_ASSERT:     
-            fprintf( pFile, "Assert " );  
-            break;
         case ABC_OBJ_NET:  
             fprintf( pFile, "Net    " );  
             break;