Bug fixes in the Verilog parser.

4 files changed, 16 insertions, 6 deletions

diff --git a/src/base/abc/abcHie.c b/src/base/abc/abcHie.c
index f248d51c..a3ec3c5f 100644
--- a/src/base/abc/abcHie.c
+++ b/src/base/abc/abcHie.c
@@ -463,6 +463,8 @@ void Abc_NtkPrintBoxInfo( Abc_Ntk_t * pNtk )
         Abc_NtkForEachBox( pModel, pObj, k )
         {
             pBoxModel = (Abc_Ntk_t *)pObj->pData;
+            if ( pBoxModel == NULL )
+                continue;
             Num = Vec_PtrFind( vMods, pBoxModel );
             assert( Num >= 0 && Num < Vec_PtrSize(vMods) );
             Vec_IntAddToEntry( vCounts, Num, 1 );
@@ -474,7 +476,7 @@ void Abc_NtkPrintBoxInfo( Abc_Ntk_t * pNtk )
         printf( "PI=%6d ", Abc_NtkPiNum(pModel) );
         printf( "PO=%6d ", Abc_NtkPoNum(pModel) );
         printf( "BB=%6d ", Abc_NtkBoxNum(pModel) );
-        printf( "ND=%6d ", Abc_NtkNodeNum(pModel)-2 ); // sans constants
+        printf( "ND=%6d ", Abc_NtkNodeNum(pModel) ); // sans constants
         printf( "Lev=%5d ", Abc_NtkLevel(pModel) );
         printf( "\n" );
 
diff --git a/src/base/io/ioReadVerilog.c b/src/base/io/ioReadVerilog.c
index 94147745..3a8c6045 100644
--- a/src/base/io/ioReadVerilog.c
+++ b/src/base/io/ioReadVerilog.c
@@ -47,9 +47,9 @@ ABC_NAMESPACE_IMPL_START
 ***********************************************************************/
 Abc_Ntk_t * Io_ReadVerilog( char * pFileName, int fCheck )
 {
-    Abc_Ntk_t * pNtk;
+    Abc_Ntk_t * pNtk, * pTemp;
     Abc_Lib_t * pDesign;
-    int RetValue;
+    int i, RetValue;
 
     // parse the verilog file
     pDesign = Ver_ParseFile( pFileName, NULL, fCheck, 1 );
@@ -60,8 +60,13 @@ Abc_Ntk_t * Io_ReadVerilog( char * pFileName, int fCheck )
     RetValue = Abc_LibFindTopLevelModels( pDesign );
     pNtk = (Abc_Ntk_t *)Vec_PtrEntry( pDesign->vTops, 0 );
     if ( RetValue > 1 )
-        printf( "Warning: The design has %d root-level modules. The first one (%s) will be used.\n",
-            Vec_PtrSize(pDesign->vTops), pNtk->pName );
+    {
+        printf( "Warning: The design has %d root-level modules: ", Vec_PtrSize(pDesign->vTops) );
+        Vec_PtrForEachEntry( Abc_Ntk_t *, pDesign->vTops, pTemp, i )
+            printf( " %s", Abc_NtkName(pTemp) );
+        printf( "\n" );
+        printf( "The first one (%s) will be used.\n", pNtk->pName );
+    }
 
     // extract the master network
     pNtk->pDesign = pDesign;
@@ -83,6 +88,7 @@ Abc_Ntk_t * Io_ReadVerilog( char * pFileName, int fCheck )
     }
 
 //Io_WriteVerilog( pNtk, "_temp.v" );
+    Abc_NtkPrintBoxInfo( pNtk );
     return pNtk;
 }
 
diff --git a/src/base/ver/verCore.c b/src/base/ver/verCore.c
index eb036620..d2744402 100644
--- a/src/base/ver/verCore.c
+++ b/src/base/ver/verCore.c
@@ -1098,6 +1098,8 @@ int Ver_ParseAssign( Ver_Man_t * pMan, Abc_Ntk_t * pNtk )
         pWord = Ver_ParseGetName( pMan );
         if ( pWord == NULL )
             return 0;
+        if ( strcmp(pWord, "#1") == 0 )
+            continue;
         // check for vector-inputs
         if ( !Ver_ParseLookupSuffix( pMan, pWord, &nMsb, &nLsb ) )
             return 0;
diff --git a/src/base/ver/verParse.c b/src/base/ver/verParse.c
index 553d0348..c1ae1781 100644
--- a/src/base/ver/verParse.c
+++ b/src/base/ver/verParse.c
@@ -116,7 +116,7 @@ char * Ver_ParseGetName( Ver_Man_t * pMan )
     }
     else
         pWord = Ver_StreamGetWord( p, " \t\n\r(),;" );
-    if ( !Ver_ParseSkipComments( pMan ) )
+    if ( Ver_StreamIsOkey(p) && !Ver_ParseSkipComments( pMan ) )
         return NULL;
     return pWord;
 }