Improvements to NDR to represent hierarchical designs.

src/aig/miniaig/ndr.h

@@ -379,7 +379,7 @@ static inline void Ndr_WriteVerilogModule( FILE * pFile, void * pDesign, int Mod
             fprintf( pFile, "  %s ", pNames[Ndr_ObjReadEntry(p, Type-256, NDR_NAME)] );
             if ( Ndr_ObjReadBody(p, Obj, NDR_NAME) )
                 fprintf( pFile, "%s ", pNames[Ndr_ObjReadBody(p, Obj, NDR_NAME)] );
-            fprintf( pFile, "( ", pNames[Ndr_ObjReadEntry(p, Type-256, NDR_NAME)] );
+            fprintf( pFile, "( " );
             nArray = Ndr_ObjReadArray( p, Obj, NDR_INPUT, &pArray );
             for ( i = 0; i < nArray; i++ )
                 fprintf( pFile, "%s%s ", pNames[pArray[i]], i==nArray-1 ? "":"," );

src/base/abci/abc.c

@@ -64,7 +64,6 @@
 #include "opt/nwk/nwkMerge.h"
 #include "base/acb/acbPar.h"
 
-#include "aig/miniaig/ndr.h"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -13051,7 +13050,7 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
 //        Cba_PrsReadBlifTest();
     }
 //    Abc_NtkComputePaths( Abc_FrameReadNtk(pAbc) );
-    Ndr_ModuleTestHierarchy();
+//    Psl_FileTest();
     return 0;
 usage:
     Abc_Print( -2, "usage: test [-CKDNM] [-aovwh] <file_name>\n" );