diff options
Diffstat (limited to 'src/base/abci/abcGen.c')
| -rw-r--r-- | src/base/abci/abcGen.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/base/abci/abcGen.c b/src/base/abci/abcGen.c index 3299a968..55191021 100644 --- a/src/base/abci/abcGen.c +++ b/src/base/abci/abcGen.c @@ -18,8 +18,7 @@ ***********************************************************************/ -#include "abc.h" -#include "extra.h" +#include "src/base/abc/abc.h" ABC_NAMESPACE_IMPL_START @@ -122,7 +121,7 @@ void Abc_GenSorter( char * pFileName, int nVars ) fprintf( pFile, "\n" ); Counter = 0; - nDigits = Extra_Base10Log( (nVars-2)*nVars ); + nDigits = Abc_Base10Log( (nVars-2)*nVars ); if ( nVars == 2 ) fprintf( pFile, ".subckt Comp a=x00 b=x01 x=y00 y=y01\n" ); else @@ -427,7 +426,7 @@ void Abc_GenFpga( char * pFileName, int nLutSize, int nLuts, int nVars ) int fGenerateFunc = 1; FILE * pFile; int nVarsLut = (1 << nLutSize); // the number of LUT variables - int nVarsLog = Extra_Base2Log( nVars + nLuts - 1 ); // the number of encoding vars + int nVarsLog = Abc_Base2Log( nVars + nLuts - 1 ); // the number of encoding vars int nVarsDeg = (1 << nVarsLog); // the number of LUT variables (total) int nParsLut = nLuts * (1 << nLutSize); // the number of LUT params int nParsVar = nLuts * nLutSize * nVarsLog; // the number of var params @@ -548,12 +547,12 @@ void Abc_GenOneHot( char * pFileName, int nVars ) fprintf( pFile, "# One-hotness condition for %d vars generated by ABC on %s\n", nVars, Extra_TimeStamp() ); fprintf( pFile, ".model 1hot_%dvars\n", nVars ); fprintf( pFile, ".inputs" ); - nDigitsIn = Extra_Base10Log( nVars ); + nDigitsIn = Abc_Base10Log( nVars ); for ( i = 0; i < nVars; i++ ) fprintf( pFile, " i%0*d", nDigitsIn, i ); fprintf( pFile, "\n" ); fprintf( pFile, ".outputs" ); - nDigitsOut = Extra_Base10Log( nVars * (nVars - 1) / 2 ); + nDigitsOut = Abc_Base10Log( nVars * (nVars - 1) / 2 ); for ( i = 0; i < nVars * (nVars - 1) / 2; i++ ) fprintf( pFile, " o%0*d", nDigitsOut, i ); fprintf( pFile, "\n" ); @@ -598,12 +597,12 @@ void Abc_GenOneHotIntervals( char * pFileName, int nPis, int nRegs, Vec_Ptr_t * fprintf( pFile, "}\n" ); fprintf( pFile, ".model 1hot_%dvars_%dregs\n", nPis, nRegs ); fprintf( pFile, ".inputs" ); - nDigitsIn = Extra_Base10Log( nPis+nRegs ); + nDigitsIn = Abc_Base10Log( nPis+nRegs ); for ( i = 0; i < nPis+nRegs; i++ ) fprintf( pFile, " i%0*d", nDigitsIn, i ); fprintf( pFile, "\n" ); fprintf( pFile, ".outputs" ); - nDigitsOut = Extra_Base10Log( Counter ); + nDigitsOut = Abc_Base10Log( Counter ); for ( i = 0; i < Counter; i++ ) fprintf( pFile, " o%0*d", nDigitsOut, i ); fprintf( pFile, "\n" ); @@ -626,7 +625,7 @@ void Abc_GenOneHotIntervals( char * pFileName, int nPis, int nRegs, Vec_Ptr_t * ABC_NAMESPACE_IMPL_END -#include "aig.h" +#include "src/aig/aig/aig.h" ABC_NAMESPACE_IMPL_START @@ -646,7 +645,7 @@ void Abc_GenRandom( char * pFileName, int nPis ) { FILE * pFile; unsigned * pTruth; - int i, b, w, nWords = Aig_TruthWordNum( nPis ); + int i, b, w, nWords = Abc_TruthWordNum( nPis ); int nDigitsIn; Aig_ManRandom( 1 ); pTruth = ABC_ALLOC( unsigned, nWords ); @@ -656,18 +655,18 @@ void Abc_GenRandom( char * pFileName, int nPis ) fprintf( pFile, "# Random function with %d inputs generated by ABC on %s\n", nPis, Extra_TimeStamp() ); fprintf( pFile, ".model rand%d\n", nPis ); fprintf( pFile, ".inputs" ); - nDigitsIn = Extra_Base10Log( nPis ); + nDigitsIn = Abc_Base10Log( nPis ); for ( i = 0; i < nPis; i++ ) fprintf( pFile, " i%0*d", nDigitsIn, i ); fprintf( pFile, "\n" ); fprintf( pFile, ".outputs f\n" ); fprintf( pFile, ".names" ); - nDigitsIn = Extra_Base10Log( nPis ); + nDigitsIn = Abc_Base10Log( nPis ); for ( i = 0; i < nPis; i++ ) fprintf( pFile, " i%0*d", nDigitsIn, i ); fprintf( pFile, " f\n" ); for ( i = 0; i < (1<<nPis); i++ ) - if ( Aig_InfoHasBit(pTruth, i) ) + if ( Abc_InfoHasBit(pTruth, i) ) { for ( b = nPis-1; b >= 0; b-- ) fprintf( pFile, "%d", (i>>b)&1 ); |