Commit 5158c711 by Alan Mishchenko

Added switch -n to 'sop'.

parent edf3622c
...@@ -382,9 +382,11 @@ int Abc_NtkBddToSop( Abc_Ntk_t * pNtk, int fDirect, int nCubeLimit ) ...@@ -382,9 +382,11 @@ int Abc_NtkBddToSop( Abc_Ntk_t * pNtk, int fDirect, int nCubeLimit )
//printf( "The total number of cubes = %d.\n", nCubes ); //printf( "The total number of cubes = %d.\n", nCubes );
} }
if ( fDirect ) if ( fDirect == 2 ) // negative polarity only
fMode = 0;
else if ( fDirect == 1 ) // positive polarity only
fMode = 1; fMode = 1;
else else // both polarities
fMode = -1; fMode = -1;
assert( Abc_NtkHasBdd(pNtk) ); assert( Abc_NtkHasBdd(pNtk) );
......
...@@ -7889,13 +7889,12 @@ usage: ...@@ -7889,13 +7889,12 @@ usage:
int Abc_CommandSop( Abc_Frame_t * pAbc, int argc, char ** argv ) int Abc_CommandSop( Abc_Frame_t * pAbc, int argc, char ** argv )
{ {
Abc_Ntk_t * pNtk = Abc_FrameReadNtk(pAbc); Abc_Ntk_t * pNtk = Abc_FrameReadNtk(pAbc);
int fDirect, nCubeLimit = 1000000; int fDirect = 0, nCubeLimit = 1000000;
int c; int c;
// set defaults // set defaults
fDirect = 0;
Extra_UtilGetoptReset(); Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "Cdh" ) ) != EOF ) while ( ( c = Extra_UtilGetopt( argc, argv, "Cdnh" ) ) != EOF )
{ {
switch ( c ) switch ( c )
{ {
...@@ -7911,7 +7910,10 @@ int Abc_CommandSop( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -7911,7 +7910,10 @@ int Abc_CommandSop( Abc_Frame_t * pAbc, int argc, char ** argv )
goto usage; goto usage;
break; break;
case 'd': case 'd':
fDirect ^= 1; fDirect = 1;
break;
case 'n':
fDirect = 2;
break; break;
case 'h': case 'h':
goto usage; goto usage;
...@@ -7940,7 +7942,7 @@ usage: ...@@ -7940,7 +7942,7 @@ usage:
Abc_Print( -2, "usage: sop [-C num] [-dh]\n" ); Abc_Print( -2, "usage: sop [-C num] [-dh]\n" );
Abc_Print( -2, "\t converts node functions to SOP\n" ); Abc_Print( -2, "\t converts node functions to SOP\n" );
Abc_Print( -2, "\t-C num : the limit on the total cube count of all nodes [default = %d]\n", nCubeLimit ); Abc_Print( -2, "\t-C num : the limit on the total cube count of all nodes [default = %d]\n", nCubeLimit );
Abc_Print( -2, "\t-d : toggles using both phases or only positive [default = %s]\n", fDirect? "direct": "both" ); Abc_Print( -2, "\t-d : toggles using both phases or only positive [default = %s]\n", fDirect? (fDirect == 1? "direct":"negated"): "both" );
Abc_Print( -2, "\t-h : print the command usage\n"); Abc_Print( -2, "\t-h : print the command usage\n");
return 1; return 1;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment