diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-09-18 09:58:06 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-09-18 09:58:06 -0700 |
| commit | 508b6f1b1356f87340d7e722c288b9ddccdd542e (patch) | |
| tree | 6c98ccef6140308f2fdde343cf52725370efbae8 | |
| parent | 6dc3a0a2469b4cf9b5d753dd66776a7b45583a56 (diff) | |
| download | abc-508b6f1b1356f87340d7e722c288b9ddccdd542e.tar.gz abc-508b6f1b1356f87340d7e722c288b9ddccdd542e.tar.bz2 abc-508b6f1b1356f87340d7e722c288b9ddccdd542e.zip | |
Fixing mismatch between declaration of the output value of Extra_CpuTime.
| -rw-r--r-- | src/base/abci/abc.c | 10 | ||||
| -rw-r--r-- | src/misc/extra/extra.h | 2 | ||||
| -rw-r--r-- | src/misc/util/util_hack.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 951a0e71..acb220aa 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -100,7 +100,7 @@ static int Abc_CommandEliminate ( Abc_Frame_t * pAbc, int argc, cha static int Abc_CommandDisjoint ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandLutpack ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandLutmin ( Abc_Frame_t * pAbc, int argc, char ** argv ); -static int Abc_CommandImfs ( Abc_Frame_t * pAbc, int argc, char ** argv ); +//static int Abc_CommandImfs ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandMfs ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandTrace ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandSpeedup ( Abc_Frame_t * pAbc, int argc, char ** argv ); @@ -552,7 +552,7 @@ void Abc_Init( Abc_Frame_t * pAbc ) Cmd_CommandAdd( pAbc, "Synthesis", "dsd", Abc_CommandDisjoint, 1 ); Cmd_CommandAdd( pAbc, "Synthesis", "lutpack", Abc_CommandLutpack, 1 ); Cmd_CommandAdd( pAbc, "Synthesis", "lutmin", Abc_CommandLutmin, 1 ); - Cmd_CommandAdd( pAbc, "Synthesis", "imfs", Abc_CommandImfs, 1 ); +// Cmd_CommandAdd( pAbc, "Synthesis", "imfs", Abc_CommandImfs, 1 ); Cmd_CommandAdd( pAbc, "Synthesis", "mfs", Abc_CommandMfs, 1 ); Cmd_CommandAdd( pAbc, "Synthesis", "trace", Abc_CommandTrace, 0 ); Cmd_CommandAdd( pAbc, "Synthesis", "speedup", Abc_CommandSpeedup, 1 ); @@ -3945,6 +3945,8 @@ usage: return 1; } +#if 0 + /**Function************************************************************* Synopsis [] @@ -4069,6 +4071,8 @@ usage: return 1; } +#endif + /**Function************************************************************* Synopsis [] @@ -8899,7 +8903,7 @@ usage: Abc_Print( -2, "\t (a) \"miter -i <onset.blif> <inter.blif>; iprove\"\n" ); Abc_Print( -2, "\t (b) \"miter -i <inter.blif> <offset_inv.blif>; iprove\"\n" ); Abc_Print( -2, "\t where <offset_inv.blif> is the network derived by complementing the\n" ); - Abc_Print( -2, "\t outputs of <offset.blif>: \"r <onset.blif>; st -i; w <offset_inv.blif>\"\n" ); + Abc_Print( -2, "\t outputs of <offset.blif>: \"r <offset.blif>; st -i; w <offset_inv.blif>\"\n" ); return 1; } diff --git a/src/misc/extra/extra.h b/src/misc/extra/extra.h index 8d3ba254..bb31dc1f 100644 --- a/src/misc/extra/extra.h +++ b/src/misc/extra/extra.h @@ -371,7 +371,7 @@ extern unsigned Extra_TruthSemiCanonicize( unsigned * pInOut, unsigned * pAux /*=== extraUtilUtil.c ================================================================*/ -extern long Extra_CpuTime(); +extern clock_t Extra_CpuTime(); extern double Extra_CpuTimeDouble(); extern int Extra_GetSoftDataLimit(); extern ABC_DLL void Extra_UtilGetoptReset(); diff --git a/src/misc/util/util_hack.h b/src/misc/util/util_hack.h index 505b8c99..4d611ef4 100644 --- a/src/misc/util/util_hack.h +++ b/src/misc/util/util_hack.h @@ -37,7 +37,7 @@ ABC_NAMESPACE_HEADER_START #define getSoftDataLimit Extra_GetSoftDataLimit #define MMoutOfMemory Extra_UtilMMoutOfMemory -extern long Extra_CpuTime(); +extern clock_t Extra_CpuTime(); extern int Extra_GetSoftDataLimit(); extern void (*Extra_UtilMMoutOfMemory)( long size ); |