diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-01-21 04:30:10 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-01-21 04:30:10 -0800 |
commit | 8014f25f6db719fa62336f997963532a14c568f6 (patch) | |
tree | c691ee91a3a2d452a2bd24ac89a8c717beaa7af7 /src/base/io | |
parent | c44cc5de9429e6b4f1c05045fcf43c9cb96437b5 (diff) | |
download | abc-8014f25f6db719fa62336f997963532a14c568f6.tar.gz abc-8014f25f6db719fa62336f997963532a14c568f6.tar.bz2 abc-8014f25f6db719fa62336f997963532a14c568f6.zip |
Major restructuring of the code.
Diffstat (limited to 'src/base/io')
-rw-r--r-- | src/base/io/io.c | 6 | ||||
-rw-r--r-- | src/base/io/ioAbc.h | 8 | ||||
-rw-r--r-- | src/base/io/ioInt.h | 4 | ||||
-rw-r--r-- | src/base/io/ioReadAiger.c | 6 | ||||
-rw-r--r-- | src/base/io/ioReadBblif.c | 4 | ||||
-rw-r--r-- | src/base/io/ioReadBlif.c | 4 | ||||
-rw-r--r-- | src/base/io/ioReadBlifAig.c | 5 | ||||
-rw-r--r-- | src/base/io/ioReadBlifMv.c | 9 | ||||
-rw-r--r-- | src/base/io/ioReadDsd.c | 2 | ||||
-rw-r--r-- | src/base/io/ioReadPla.c | 4 | ||||
-rw-r--r-- | src/base/io/ioReadVerilog.c | 2 | ||||
-rw-r--r-- | src/base/io/ioUtil.c | 2 | ||||
-rw-r--r-- | src/base/io/ioWriteAiger.c | 12 | ||||
-rw-r--r-- | src/base/io/ioWriteBblif.c | 2 | ||||
-rw-r--r-- | src/base/io/ioWriteBlif.c | 8 | ||||
-rw-r--r-- | src/base/io/ioWriteBlifMv.c | 4 | ||||
-rw-r--r-- | src/base/io/ioWriteBook.c | 6 | ||||
-rw-r--r-- | src/base/io/ioWriteCnf.c | 2 | ||||
-rw-r--r-- | src/base/io/ioWriteDot.c | 4 | ||||
-rw-r--r-- | src/base/io/ioWriteVerilog.c | 8 |
20 files changed, 51 insertions, 51 deletions
diff --git a/src/base/io/io.c b/src/base/io/io.c index 1cea2e37..92dbe9fc 100644 --- a/src/base/io/io.c +++ b/src/base/io/io.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "mainInt.h" -#include "saig.h" +#include "src/base/main/mainInt.h" +#include "src/aig/saig/saig.h" ABC_NAMESPACE_IMPL_START @@ -1998,7 +1998,7 @@ usage: ABC_NAMESPACE_IMPL_END -#include "fra.h" +#include "src/proof/fra/fra.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioAbc.h b/src/base/io/ioAbc.h index f3db4c15..7a38ae5c 100644 --- a/src/base/io/ioAbc.h +++ b/src/base/io/ioAbc.h @@ -18,16 +18,16 @@ ***********************************************************************/ -#ifndef __IO_H__ -#define __IO_H__ +#ifndef ABC__base__io__ioAbc_h +#define ABC__base__io__ioAbc_h //////////////////////////////////////////////////////////////////////// /// INCLUDES /// //////////////////////////////////////////////////////////////////////// -#include "abc.h" -#include "extra.h" +#include "src/base/abc/abc.h" +#include "src/misc/extra/extra.h" //////////////////////////////////////////////////////////////////////// /// PARAMETERS /// diff --git a/src/base/io/ioInt.h b/src/base/io/ioInt.h index 9ded63e4..fed639a4 100644 --- a/src/base/io/ioInt.h +++ b/src/base/io/ioInt.h @@ -18,8 +18,8 @@ ***********************************************************************/ -#ifndef __IO_INT_H__ -#define __IO_INT_H__ +#ifndef ABC__base__io__ioInt_h +#define ABC__base__io__ioInt_h ABC_NAMESPACE_HEADER_START diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c index 13987a1b..55ef16db 100644 --- a/src/base/io/ioReadAiger.c +++ b/src/base/io/ioReadAiger.c @@ -21,9 +21,9 @@ // The code in this file is developed in collaboration with Mark Jarvin of Toronto. -#include "bzlib.h" +#include "src/misc/bzlib/bzlib.h" #include "ioAbc.h" -#include "zlib.h" +#include "src/misc/zlib/zlib.h" ABC_NAMESPACE_IMPL_START @@ -358,7 +358,7 @@ Abc_Ntk_t * Io_ReadAiger( char * pFileName, int fCheck ) pObj = Abc_NtkCreatePo(pNtkNew); } // create the latches - nDigits = Extra_Base10Log( nLatches ); + nDigits = Abc_Base10Log( nLatches ); for ( i = 0; i < nLatches; i++ ) { pObj = Abc_NtkCreateLatch(pNtkNew); diff --git a/src/base/io/ioReadBblif.c b/src/base/io/ioReadBblif.c index 5b15c9d4..873a5671 100644 --- a/src/base/io/ioReadBblif.c +++ b/src/base/io/ioReadBblif.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "dec.h" -#include "bblif.h" +#include "src/bool/dec/dec.h" +#include "src/misc/bbl/bblif.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBlif.c b/src/base/io/ioReadBlif.c index 9fd41261..faf0f53e 100644 --- a/src/base/io/ioReadBlif.c +++ b/src/base/io/ioReadBlif.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "main.h" -#include "mio.h" +#include "src/base/main/main.h" +#include "src/map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBlifAig.c b/src/base/io/ioReadBlifAig.c index 1ef61196..f365cb4d 100644 --- a/src/base/io/ioReadBlifAig.c +++ b/src/base/io/ioReadBlifAig.c @@ -18,9 +18,8 @@ ***********************************************************************/ -#include "abc.h" -#include "extra.h" -#include "vecPtr.h" +#include "src/base/abc/abc.h" +#include "src/misc/vec/vecPtr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBlifMv.c b/src/base/io/ioReadBlifMv.c index 20ec8aa1..3e226824 100644 --- a/src/base/io/ioReadBlifMv.c +++ b/src/base/io/ioReadBlifMv.c @@ -18,9 +18,8 @@ ***********************************************************************/ -#include "abc.h" -#include "extra.h" -#include "vecPtr.h" +#include "src/base/abc/abc.h" +#include "src/misc/vec/vecPtr.h" #include "ioAbc.h" ABC_NAMESPACE_IMPL_START @@ -2029,8 +2028,8 @@ Io_MvVar_t * Abc_NtkMvVarDup( Abc_Ntk_t * pNtk, Io_MvVar_t * pVar ) ABC_NAMESPACE_IMPL_END -#include "mio.h" -#include "main.h" +#include "src/map/mio/mio.h" +#include "src/base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadDsd.c b/src/base/io/ioReadDsd.c index 3608507b..514c664a 100644 --- a/src/base/io/ioReadDsd.c +++ b/src/base/io/ioReadDsd.c @@ -241,7 +241,7 @@ Abc_Ntk_t * Io_ReadDsd( char * pForm ) nInputs = 0; for ( pCur = pForm; *pCur; pCur++ ) if ( *pCur >= 'a' && *pCur <= 'z' ) - nInputs = ABC_MAX( nInputs, *pCur - 'a' ); + nInputs = Abc_MaxInt( nInputs, *pCur - 'a' ); nInputs++; // create the network diff --git a/src/base/io/ioReadPla.c b/src/base/io/ioReadPla.c index 927cf7e5..46ab811e 100644 --- a/src/base/io/ioReadPla.c +++ b/src/base/io/ioReadPla.c @@ -158,7 +158,7 @@ Abc_Ntk_t * Io_ReadPlaNetwork( Extra_FileReader_t * p, int fZeros ) ABC_FREE( ppSops ); return NULL; } - nDigits = Extra_Base10Log( nInputs ); + nDigits = Abc_Base10Log( nInputs ); for ( i = 0; i < nInputs; i++ ) { sprintf( Buffer, "x%0*d", nDigits, i ); @@ -175,7 +175,7 @@ Abc_Ntk_t * Io_ReadPlaNetwork( Extra_FileReader_t * p, int fZeros ) ABC_FREE( ppSops ); return NULL; } - nDigits = Extra_Base10Log( nOutputs ); + nDigits = Abc_Base10Log( nOutputs ); for ( i = 0; i < nOutputs; i++ ) { sprintf( Buffer, "z%0*d", nDigits, i ); diff --git a/src/base/io/ioReadVerilog.c b/src/base/io/ioReadVerilog.c index 3a8c6045..da74d8d9 100644 --- a/src/base/io/ioReadVerilog.c +++ b/src/base/io/ioReadVerilog.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "ver.h" +#include "src/base/ver/ver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioUtil.c b/src/base/io/ioUtil.c index 9a50c0c8..e8a018c2 100644 --- a/src/base/io/ioUtil.c +++ b/src/base/io/ioUtil.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "main.h" +#include "src/base/main/main.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c index 9ab0905e..0f725be3 100644 --- a/src/base/io/ioWriteAiger.c +++ b/src/base/io/ioWriteAiger.c @@ -21,11 +21,11 @@ // The code in this file is developed in collaboration with Mark Jarvin of Toronto. -#include "bzlib.h" +#include "src/misc/bzlib/bzlib.h" #include "ioAbc.h" #include <stdarg.h> -#include "zlib.h" +#include "src/misc/zlib/zlib.h" ABC_NAMESPACE_IMPL_START @@ -770,8 +770,8 @@ void Io_WriteAiger( Abc_Ntk_t * pNtk, char * pFileName, int fWriteSymbols, int f } -#include "giaAig.h" -#include "saig.h" +#include "src/aig/gia/giaAig.h" +#include "src/aig/saig/saig.h" /**Function************************************************************* @@ -825,8 +825,8 @@ void Io_WriteAigerCex( Abc_Cex_t * pCex, Abc_Ntk_t * pNtk, void * pG, char * pFi { for ( k = 0; k < pCex->nPis; k++ ) { - fprintf( pFile, "%d", Aig_InfoHasBit(pCex->pData, b) ); - Aig_ManPi( pAig, k )->fMarkA = Aig_InfoHasBit(pCex->pData, b++); + fprintf( pFile, "%d", Abc_InfoHasBit(pCex->pData, b) ); + Aig_ManPi( pAig, k )->fMarkA = Abc_InfoHasBit(pCex->pData, b++); } fprintf( pFile, " " ); Aig_ManForEachNode( pAig, pObj, k ) diff --git a/src/base/io/ioWriteBblif.c b/src/base/io/ioWriteBblif.c index 5cace190..09bb1da9 100644 --- a/src/base/io/ioWriteBblif.c +++ b/src/base/io/ioWriteBblif.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "bblif.h" +#include "src/misc/bbl/bblif.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteBlif.c b/src/base/io/ioWriteBlif.c index 9dc96afb..d8d3f787 100644 --- a/src/base/io/ioWriteBlif.c +++ b/src/base/io/ioWriteBlif.c @@ -19,10 +19,10 @@ ***********************************************************************/ #include "ioAbc.h" -#include "main.h" -#include "mio.h" -#include "kit.h" -#include "if.h" +#include "src/base/main/main.h" +#include "src/map/mio/mio.h" +#include "src/bool/kit/kit.h" +#include "src/map/if/if.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteBlifMv.c b/src/base/io/ioWriteBlifMv.c index 62028606..fd054d5f 100644 --- a/src/base/io/ioWriteBlifMv.c +++ b/src/base/io/ioWriteBlifMv.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "main.h" -#include "mio.h" +#include "src/base/main/main.h" +#include "src/map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteBook.c b/src/base/io/ioWriteBook.c index 45807ce6..ae717c8d 100644 --- a/src/base/io/ioWriteBook.c +++ b/src/base/io/ioWriteBook.c @@ -18,9 +18,11 @@ ***********************************************************************/ +#include <math.h> + +#include "src/base/main/main.h" +#include "src/map/mio/mio.h" #include "ioAbc.h" -#include "main.h" -#include "mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteCnf.c b/src/base/io/ioWriteCnf.c index 6cb82a0a..d5d377cc 100644 --- a/src/base/io/ioWriteCnf.c +++ b/src/base/io/ioWriteCnf.c @@ -19,7 +19,7 @@ ***********************************************************************/ #include "ioAbc.h" -#include "satSolver.h" +#include "src/sat/bsat/satSolver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteDot.c b/src/base/io/ioWriteDot.c index c1b9befc..9a9bcd82 100644 --- a/src/base/io/ioWriteDot.c +++ b/src/base/io/ioWriteDot.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "main.h" -#include "mio.h" +#include "src/base/main/main.h" +#include "src/map/mio/mio.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioWriteVerilog.c b/src/base/io/ioWriteVerilog.c index 7f9bee95..511eb9f0 100644 --- a/src/base/io/ioWriteVerilog.c +++ b/src/base/io/ioWriteVerilog.c @@ -19,8 +19,8 @@ ***********************************************************************/ #include "ioAbc.h" -#include "main.h" -#include "mio.h" +#include "src/base/main/main.h" +#include "src/map/mio/mio.h" ABC_NAMESPACE_IMPL_START @@ -492,7 +492,7 @@ void Io_WriteVerilogObjects( FILE * pFile, Abc_Ntk_t * pNtk ) int i, k, Counter, nDigits, Length; // write boxes - nDigits = Extra_Base10Log( Abc_NtkBoxNum(pNtk)-Abc_NtkLatchNum(pNtk) ); + nDigits = Abc_Base10Log( Abc_NtkBoxNum(pNtk)-Abc_NtkLatchNum(pNtk) ); Counter = 0; Abc_NtkForEachBox( pNtk, pObj, i ) { @@ -517,7 +517,7 @@ void Io_WriteVerilogObjects( FILE * pFile, Abc_Ntk_t * pNtk ) if ( Abc_NtkHasMapping(pNtk) ) { Length = Mio_LibraryReadGateNameMax((Mio_Library_t *)pNtk->pManFunc); - nDigits = Extra_Base10Log( Abc_NtkNodeNum(pNtk) ); + nDigits = Abc_Base10Log( Abc_NtkNodeNum(pNtk) ); Counter = 0; Abc_NtkForEachNode( pNtk, pObj, k ) { |