diff options
Diffstat (limited to 'src/bdd')
79 files changed, 104 insertions, 105 deletions
diff --git a/src/bdd/cas/cas.h b/src/bdd/cas/cas.h index 33958325..9ef6f1fa 100644 --- a/src/bdd/cas/cas.h +++ b/src/bdd/cas/cas.h @@ -18,8 +18,8 @@ ***********************************************************************/ -#ifndef __CAS_H__ -#define __CAS_H__ +#ifndef ABC__bdd__cas__cas_h +#define ABC__bdd__cas__cas_h //////////////////////////////////////////////////////////////////////// diff --git a/src/bdd/cas/casCore.c b/src/bdd/cas/casCore.c index 5511b8e7..b73b5b3f 100644 --- a/src/bdd/cas/casCore.c +++ b/src/bdd/cas/casCore.c @@ -23,9 +23,9 @@ #include <string.h> #include <time.h> -#include "main.h" -#include "cmd.h" -#include "extra.h" +#include "src/base/main/main.h" +#include "src/base/cmd/cmd.h" +#include "src/misc/extra/extraBdd.h" #include "cas.h" ABC_NAMESPACE_IMPL_START @@ -112,7 +112,7 @@ int Abc_CascadeExperiment( char * pFileGeneric, DdManager * dd, DdNode ** pOutpu // create the variables to encode the outputs - nVarsEnc = Extra_Base2Log( nOuts ); + nVarsEnc = Abc_Base2Log( nOuts ); for ( i = 0; i < nVarsEnc; i++ ) pbVarsEnc[i] = Cudd_bddNewVarAtLevel( dd, i ); @@ -704,7 +704,7 @@ DdNode * GetSingleOutputFunctionRemappedNewDD( DdManager * dd, DdNode ** pOutput } // select the encoding variables to follow immediately after the original variables - nVarsEnc = Extra_Base2Log(nOuts); + nVarsEnc = Abc_Base2Log(nOuts); /* for ( v = 0; v < nVarsEnc; v++ ) if ( nVarsMax + v < dd->size ) diff --git a/src/bdd/cas/casDec.c b/src/bdd/cas/casDec.c index 111f559e..ea132540 100644 --- a/src/bdd/cas/casDec.c +++ b/src/bdd/cas/casDec.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <time.h> -#include "extra.h" +#include "src/misc/extra/extraBdd.h" #include "cas.h" ABC_NAMESPACE_IMPL_START @@ -175,7 +175,7 @@ int CreateDecomposedNetwork( DdManager * dd, DdNode * aFunc, char ** pNames, int p->nIns = s_LutSize; p->nInsP = PrevMulti; p->nCols = Profile[nNames-(nVarsRem-(s_LutSize-PrevMulti))]; - p->nMulti = Extra_Base2Log(p->nCols); + p->nMulti = Abc_Base2Log(p->nCols); p->Level = nNames-nVarsRem; nVarsRem = nVarsRem-(s_LutSize-PrevMulti); diff --git a/src/bdd/cudd/cudd.h b/src/bdd/cudd/cudd.h index 9231b5ab..fb1d6d58 100644 --- a/src/bdd/cudd/cudd.h +++ b/src/bdd/cudd/cudd.h @@ -54,16 +54,16 @@ ******************************************************************************/ -#ifndef _CUDD -#define _CUDD +#ifndef ABC__bdd__cudd__cudd_h +#define ABC__bdd__cudd__cudd_h /*---------------------------------------------------------------------------*/ /* Nested includes */ /*---------------------------------------------------------------------------*/ -#include "mtr.h" -#include "epd.h" +#include "src/bdd/mtr/mtr.h" +#include "src/bdd/epd/epd.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/cudd/cuddAPI.c b/src/bdd/cudd/cuddAPI.c index e2926ea2..6456d17c 100644 --- a/src/bdd/cudd/cuddAPI.c +++ b/src/bdd/cudd/cuddAPI.c @@ -191,7 +191,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddAbs.c b/src/bdd/cudd/cuddAddAbs.c index f420f99e..44c77d94 100644 --- a/src/bdd/cudd/cuddAddAbs.c +++ b/src/bdd/cudd/cuddAddAbs.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddApply.c b/src/bdd/cudd/cuddAddApply.c index 7bea5871..ec77229c 100644 --- a/src/bdd/cudd/cuddAddApply.c +++ b/src/bdd/cudd/cuddAddApply.c @@ -69,7 +69,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddFind.c b/src/bdd/cudd/cuddAddFind.c index 4d63965d..57343b1a 100644 --- a/src/bdd/cudd/cuddAddFind.c +++ b/src/bdd/cudd/cuddAddFind.c @@ -54,7 +54,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddInv.c b/src/bdd/cudd/cuddAddInv.c index cae00ca1..e15da46e 100644 --- a/src/bdd/cudd/cuddAddInv.c +++ b/src/bdd/cudd/cuddAddInv.c @@ -51,7 +51,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddIte.c b/src/bdd/cudd/cuddAddIte.c index 67f1cf14..b9b8c3e3 100644 --- a/src/bdd/cudd/cuddAddIte.c +++ b/src/bdd/cudd/cuddAddIte.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddNeg.c b/src/bdd/cudd/cuddAddNeg.c index c21c995a..192ea513 100644 --- a/src/bdd/cudd/cuddAddNeg.c +++ b/src/bdd/cudd/cuddAddNeg.c @@ -53,7 +53,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAddWalsh.c b/src/bdd/cudd/cuddAddWalsh.c index e8e8a641..0ad53418 100644 --- a/src/bdd/cudd/cuddAddWalsh.c +++ b/src/bdd/cudd/cuddAddWalsh.c @@ -53,7 +53,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAndAbs.c b/src/bdd/cudd/cuddAndAbs.c index b42f376d..00ba67b4 100644 --- a/src/bdd/cudd/cuddAndAbs.c +++ b/src/bdd/cudd/cuddAndAbs.c @@ -52,7 +52,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddAnneal.c b/src/bdd/cudd/cuddAnneal.c index 7a08b5ae..943265cc 100644 --- a/src/bdd/cudd/cuddAnneal.c +++ b/src/bdd/cudd/cuddAnneal.c @@ -62,7 +62,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddApa.c b/src/bdd/cudd/cuddApa.c index 82547b54..8515ee0a 100644 --- a/src/bdd/cudd/cuddApa.c +++ b/src/bdd/cudd/cuddApa.c @@ -70,7 +70,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddApprox.c b/src/bdd/cudd/cuddApprox.c index 1fdb595f..203c438d 100644 --- a/src/bdd/cudd/cuddApprox.c +++ b/src/bdd/cudd/cuddApprox.c @@ -78,7 +78,7 @@ #else #define DBL_MAX_EXP 1024 #endif -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBddAbs.c b/src/bdd/cudd/cuddBddAbs.c index 9bcb32ad..7dc3ef56 100644 --- a/src/bdd/cudd/cuddBddAbs.c +++ b/src/bdd/cudd/cuddBddAbs.c @@ -62,7 +62,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBddCorr.c b/src/bdd/cudd/cuddBddCorr.c index 62f48bde..4606ea48 100644 --- a/src/bdd/cudd/cuddBddCorr.c +++ b/src/bdd/cudd/cuddBddCorr.c @@ -57,7 +57,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBddIte.c b/src/bdd/cudd/cuddBddIte.c index b4921fb2..d3386088 100644 --- a/src/bdd/cudd/cuddBddIte.c +++ b/src/bdd/cudd/cuddBddIte.c @@ -72,7 +72,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddBridge.c b/src/bdd/cudd/cuddBridge.c index c051666d..75a5fa2a 100644 --- a/src/bdd/cudd/cuddBridge.c +++ b/src/bdd/cudd/cuddBridge.c @@ -71,7 +71,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCache.c b/src/bdd/cudd/cuddCache.c index b8978ab6..31545bd6 100644 --- a/src/bdd/cudd/cuddCache.c +++ b/src/bdd/cudd/cuddCache.c @@ -63,7 +63,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCheck.c b/src/bdd/cudd/cuddCheck.c index 5526aaf2..c4b9b5c2 100644 --- a/src/bdd/cudd/cuddCheck.c +++ b/src/bdd/cudd/cuddCheck.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddClip.c b/src/bdd/cudd/cuddClip.c index 028474fe..6d4216a9 100644 --- a/src/bdd/cudd/cuddClip.c +++ b/src/bdd/cudd/cuddClip.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCof.c b/src/bdd/cudd/cuddCof.c index 004689c2..f2d3c118 100644 --- a/src/bdd/cudd/cuddCof.c +++ b/src/bdd/cudd/cuddCof.c @@ -56,7 +56,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddCompose.c b/src/bdd/cudd/cuddCompose.c index 7c99ac62..6264513f 100644 --- a/src/bdd/cudd/cuddCompose.c +++ b/src/bdd/cudd/cuddCompose.c @@ -82,7 +82,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddDecomp.c b/src/bdd/cudd/cuddDecomp.c index 34eaef0c..99aa9348 100644 --- a/src/bdd/cudd/cuddDecomp.c +++ b/src/bdd/cudd/cuddDecomp.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddEssent.c b/src/bdd/cudd/cuddEssent.c index b3264715..dfd5bd9d 100644 --- a/src/bdd/cudd/cuddEssent.c +++ b/src/bdd/cudd/cuddEssent.c @@ -71,7 +71,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddExact.c b/src/bdd/cudd/cuddExact.c index 19fcbcd4..54560a44 100644 --- a/src/bdd/cudd/cuddExact.c +++ b/src/bdd/cudd/cuddExact.c @@ -67,7 +67,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddExport.c b/src/bdd/cudd/cuddExport.c index c0cac4ec..2f19e504 100644 --- a/src/bdd/cudd/cuddExport.c +++ b/src/bdd/cudd/cuddExport.c @@ -62,7 +62,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddGenCof.c b/src/bdd/cudd/cuddGenCof.c index 35c380c0..f5597f3d 100644 --- a/src/bdd/cudd/cuddGenCof.c +++ b/src/bdd/cudd/cuddGenCof.c @@ -75,7 +75,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddGenetic.c b/src/bdd/cudd/cuddGenetic.c index 8c168440..8c65875e 100644 --- a/src/bdd/cudd/cuddGenetic.c +++ b/src/bdd/cudd/cuddGenetic.c @@ -80,7 +80,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddGroup.c b/src/bdd/cudd/cuddGroup.c index fc848259..598cc9a1 100644 --- a/src/bdd/cudd/cuddGroup.c +++ b/src/bdd/cudd/cuddGroup.c @@ -76,7 +76,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddHarwell.c b/src/bdd/cudd/cuddHarwell.c index 75e328ea..b61af2e0 100644 --- a/src/bdd/cudd/cuddHarwell.c +++ b/src/bdd/cudd/cuddHarwell.c @@ -48,7 +48,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddInit.c b/src/bdd/cudd/cuddInit.c index 857e638c..c0dbaa0c 100644 --- a/src/bdd/cudd/cuddInit.c +++ b/src/bdd/cudd/cuddInit.c @@ -56,7 +56,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddInt.h b/src/bdd/cudd/cuddInt.h index ba8da8cf..3d4b3db9 100644 --- a/src/bdd/cudd/cuddInt.h +++ b/src/bdd/cudd/cuddInt.h @@ -48,8 +48,8 @@ ******************************************************************************/ -#ifndef _CUDDINT -#define _CUDDINT +#ifndef ABC__bdd__cudd__cuddInt_h +#define ABC__bdd__cudd__cuddInt_h /*---------------------------------------------------------------------------*/ @@ -59,8 +59,8 @@ #ifdef DD_MIS #include "array.h" #include "list.h" -#include "st.h" -#include "espresso.h" +#include "src/misc/st/st.h" +#include "src/misc/espresso/espresso.h" #include "node.h" #ifdef SIS #include "graph.h" @@ -71,7 +71,7 @@ #include <math.h> #include "cudd.h" -#include "st.h" +#include "src/misc/st/st.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/cudd/cuddInteract.c b/src/bdd/cudd/cuddInteract.c index 1d335c2a..b0757d00 100644 --- a/src/bdd/cudd/cuddInteract.c +++ b/src/bdd/cudd/cuddInteract.c @@ -74,7 +74,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLCache.c b/src/bdd/cudd/cuddLCache.c index 2d66264e..e08e0f00 100644 --- a/src/bdd/cudd/cuddLCache.c +++ b/src/bdd/cudd/cuddLCache.c @@ -72,7 +72,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLevelQ.c b/src/bdd/cudd/cuddLevelQ.c index 43e730d6..987d39b4 100644 --- a/src/bdd/cudd/cuddLevelQ.c +++ b/src/bdd/cudd/cuddLevelQ.c @@ -77,7 +77,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLinear.c b/src/bdd/cudd/cuddLinear.c index e137484c..601b6496 100644 --- a/src/bdd/cudd/cuddLinear.c +++ b/src/bdd/cudd/cuddLinear.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddLiteral.c b/src/bdd/cudd/cuddLiteral.c index b5895fcf..bc7ac3a0 100644 --- a/src/bdd/cudd/cuddLiteral.c +++ b/src/bdd/cudd/cuddLiteral.c @@ -52,7 +52,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddMatMult.c b/src/bdd/cudd/cuddMatMult.c index f78d037d..b3989e9e 100644 --- a/src/bdd/cudd/cuddMatMult.c +++ b/src/bdd/cudd/cuddMatMult.c @@ -56,7 +56,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddPriority.c b/src/bdd/cudd/cuddPriority.c index 188d2c9e..2ecc1636 100644 --- a/src/bdd/cudd/cuddPriority.c +++ b/src/bdd/cudd/cuddPriority.c @@ -73,7 +73,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddRead.c b/src/bdd/cudd/cuddRead.c index 06789589..8cb555d2 100644 --- a/src/bdd/cudd/cuddRead.c +++ b/src/bdd/cudd/cuddRead.c @@ -50,7 +50,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddRef.c b/src/bdd/cudd/cuddRef.c index 183d30ca..9592f4c2 100644 --- a/src/bdd/cudd/cuddRef.c +++ b/src/bdd/cudd/cuddRef.c @@ -65,7 +65,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddReorder.c b/src/bdd/cudd/cuddReorder.c index f9c08772..fef0768a 100644 --- a/src/bdd/cudd/cuddReorder.c +++ b/src/bdd/cudd/cuddReorder.c @@ -72,7 +72,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSat.c b/src/bdd/cudd/cuddSat.c index c3a161b4..a01268e6 100644 --- a/src/bdd/cudd/cuddSat.c +++ b/src/bdd/cudd/cuddSat.c @@ -69,7 +69,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSign.c b/src/bdd/cudd/cuddSign.c index 75d1f60c..5ece24ad 100644 --- a/src/bdd/cudd/cuddSign.c +++ b/src/bdd/cudd/cuddSign.c @@ -52,7 +52,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSolve.c b/src/bdd/cudd/cuddSolve.c index 47570bf1..a1fb77ca 100644 --- a/src/bdd/cudd/cuddSolve.c +++ b/src/bdd/cudd/cuddSolve.c @@ -55,7 +55,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSplit.c b/src/bdd/cudd/cuddSplit.c index 4ac243b5..d650ecbc 100644 --- a/src/bdd/cudd/cuddSplit.c +++ b/src/bdd/cudd/cuddSplit.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSubsetHB.c b/src/bdd/cudd/cuddSubsetHB.c index 68902b09..21daf9ed 100644 --- a/src/bdd/cudd/cuddSubsetHB.c +++ b/src/bdd/cudd/cuddSubsetHB.c @@ -73,7 +73,7 @@ #else #define DBL_MAX_EXP 1024 #endif -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSubsetSP.c b/src/bdd/cudd/cuddSubsetSP.c index cddc58ed..5eb3e099 100644 --- a/src/bdd/cudd/cuddSubsetSP.c +++ b/src/bdd/cudd/cuddSubsetSP.c @@ -68,7 +68,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddSymmetry.c b/src/bdd/cudd/cuddSymmetry.c index 3386e798..630c3778 100644 --- a/src/bdd/cudd/cuddSymmetry.c +++ b/src/bdd/cudd/cuddSymmetry.c @@ -65,7 +65,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddTable.c b/src/bdd/cudd/cuddTable.c index c83d1073..f64f1f8e 100644 --- a/src/bdd/cudd/cuddTable.c +++ b/src/bdd/cudd/cuddTable.c @@ -80,7 +80,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddUtil.c b/src/bdd/cudd/cuddUtil.c index ec21e928..046c1957 100644 --- a/src/bdd/cudd/cuddUtil.c +++ b/src/bdd/cudd/cuddUtil.c @@ -105,7 +105,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddWindow.c b/src/bdd/cudd/cuddWindow.c index 0a7c6705..d07f188f 100644 --- a/src/bdd/cudd/cuddWindow.c +++ b/src/bdd/cudd/cuddWindow.c @@ -58,7 +58,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddCount.c b/src/bdd/cudd/cuddZddCount.c index a422ad99..c91ef92b 100644 --- a/src/bdd/cudd/cuddZddCount.c +++ b/src/bdd/cudd/cuddZddCount.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddFuncs.c b/src/bdd/cudd/cuddZddFuncs.c index 41f7c64c..f4bae0aa 100644 --- a/src/bdd/cudd/cuddZddFuncs.c +++ b/src/bdd/cudd/cuddZddFuncs.c @@ -75,7 +75,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddGroup.c b/src/bdd/cudd/cuddZddGroup.c index 5d0409de..2d2a5049 100644 --- a/src/bdd/cudd/cuddZddGroup.c +++ b/src/bdd/cudd/cuddZddGroup.c @@ -67,7 +67,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddIsop.c b/src/bdd/cudd/cuddZddIsop.c index 1de9110a..a1e3b7b8 100644 --- a/src/bdd/cudd/cuddZddIsop.c +++ b/src/bdd/cudd/cuddZddIsop.c @@ -61,7 +61,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddLin.c b/src/bdd/cudd/cuddZddLin.c index c6e11561..09777b2f 100644 --- a/src/bdd/cudd/cuddZddLin.c +++ b/src/bdd/cudd/cuddZddLin.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddMisc.c b/src/bdd/cudd/cuddZddMisc.c index 4d28f6a7..14250322 100644 --- a/src/bdd/cudd/cuddZddMisc.c +++ b/src/bdd/cudd/cuddZddMisc.c @@ -60,7 +60,7 @@ ******************************************************************************/ #include <math.h> -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddPort.c b/src/bdd/cudd/cuddZddPort.c index 76b46ca5..fbca346e 100644 --- a/src/bdd/cudd/cuddZddPort.c +++ b/src/bdd/cudd/cuddZddPort.c @@ -59,7 +59,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddReord.c b/src/bdd/cudd/cuddZddReord.c index c5fcb9fb..8a7ae526 100644 --- a/src/bdd/cudd/cuddZddReord.c +++ b/src/bdd/cudd/cuddZddReord.c @@ -73,7 +73,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddSetop.c b/src/bdd/cudd/cuddZddSetop.c index b4726b63..ec0c467c 100644 --- a/src/bdd/cudd/cuddZddSetop.c +++ b/src/bdd/cudd/cuddZddSetop.c @@ -73,7 +73,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddSymm.c b/src/bdd/cudd/cuddZddSymm.c index 52e26d88..4979968a 100644 --- a/src/bdd/cudd/cuddZddSymm.c +++ b/src/bdd/cudd/cuddZddSymm.c @@ -67,7 +67,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/cudd/cuddZddUtil.c b/src/bdd/cudd/cuddZddUtil.c index 1e89c610..e87f5af8 100644 --- a/src/bdd/cudd/cuddZddUtil.c +++ b/src/bdd/cudd/cuddZddUtil.c @@ -66,7 +66,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "cuddInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/dsd/dsd.h b/src/bdd/dsd/dsd.h index 00b38625..7bb6111f 100644 --- a/src/bdd/dsd/dsd.h +++ b/src/bdd/dsd/dsd.h @@ -25,8 +25,8 @@ ***********************************************************************/ -#ifndef __DSD_H__ -#define __DSD_H__ +#ifndef ABC__bdd__dsd__dsd_h +#define ABC__bdd__dsd__dsd_h //////////////////////////////////////////////////////////////////////// diff --git a/src/bdd/dsd/dsdCheck.c b/src/bdd/dsd/dsdCheck.c index 4cecba59..4de75a92 100644 --- a/src/bdd/dsd/dsdCheck.c +++ b/src/bdd/dsd/dsdCheck.c @@ -68,7 +68,7 @@ void Dsd_CheckCacheAllocate( int nEntries ) memset( pCache, 0, sizeof(Dds_Cache_t) ); // check what is the size of the current cache - nRequested = Cudd_Prime( nEntries ); + nRequested = Abc_PrimeCudd( nEntries ); if ( pCache->nTableSize != nRequested ) { // the current size is different // deallocate the old, allocate the new diff --git a/src/bdd/dsd/dsdInt.h b/src/bdd/dsd/dsdInt.h index 78b7b154..11a8e82e 100644 --- a/src/bdd/dsd/dsdInt.h +++ b/src/bdd/dsd/dsdInt.h @@ -16,11 +16,11 @@ ***********************************************************************/ -#ifndef __DSD_INT_H__ -#define __DSD_INT_H__ +#ifndef ABC__bdd__dsd__dsdInt_h +#define ABC__bdd__dsd__dsdInt_h -#include "extra.h" +#include "src/misc/extra/extraBdd.h" #include "dsd.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/epd/epd.c b/src/bdd/epd/epd.c index 3f92af94..6a803e16 100644 --- a/src/bdd/epd/epd.c +++ b/src/bdd/epd/epd.c @@ -52,7 +52,7 @@ #include <stdlib.h> #include <string.h> #include <math.h> -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "epd.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/epd/epd.h b/src/bdd/epd/epd.h index 1ca033d2..012380ed 100644 --- a/src/bdd/epd/epd.h +++ b/src/bdd/epd/epd.h @@ -48,8 +48,8 @@ ******************************************************************************/ -#ifndef _EPD -#define _EPD +#ifndef ABC__bdd__epd__epd_h +#define ABC__bdd__epd__epd_h ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/mtr/mtr.h b/src/bdd/mtr/mtr.h index 5ac35313..db936ab8 100644 --- a/src/bdd/mtr/mtr.h +++ b/src/bdd/mtr/mtr.h @@ -56,8 +56,8 @@ ******************************************************************************/ -#ifndef __MTR -#define __MTR +#ifndef ABC__bdd__mtr__mtr_h +#define ABC__bdd__mtr__mtr_h /*---------------------------------------------------------------------------*/ /* Nested includes */ diff --git a/src/bdd/mtr/mtrBasic.c b/src/bdd/mtr/mtrBasic.c index a2420d4a..b710ef4a 100644 --- a/src/bdd/mtr/mtrBasic.c +++ b/src/bdd/mtr/mtrBasic.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "mtrInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/mtr/mtrGroup.c b/src/bdd/mtr/mtrGroup.c index 280108c9..b29fe32d 100644 --- a/src/bdd/mtr/mtrGroup.c +++ b/src/bdd/mtr/mtrGroup.c @@ -60,7 +60,7 @@ ******************************************************************************/ -#include "util_hack.h" +#include "src/misc/util/util_hack.h" #include "mtrInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/mtr/mtrInt.h b/src/bdd/mtr/mtrInt.h index 9c8c6e26..624c64a9 100644 --- a/src/bdd/mtr/mtrInt.h +++ b/src/bdd/mtr/mtrInt.h @@ -48,8 +48,8 @@ ******************************************************************************/ -#ifndef _MTRINT -#define _MTRINT +#ifndef ABC__bdd__mtr__mtrInt_h +#define ABC__bdd__mtr__mtrInt_h #include "mtr.h" diff --git a/src/bdd/parse/parse.h b/src/bdd/parse/parse.h index 5c97dd4e..584ec30a 100644 --- a/src/bdd/parse/parse.h +++ b/src/bdd/parse/parse.h @@ -16,8 +16,8 @@ ***********************************************************************/ -#ifndef __PARSE_H__ -#define __PARSE_H__ +#ifndef ABC__bdd__parse__parse_h +#define ABC__bdd__parse__parse_h ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/parse/parseEqn.c b/src/bdd/parse/parseEqn.c index ed2599ca..a0b9ada8 100644 --- a/src/bdd/parse/parseEqn.c +++ b/src/bdd/parse/parseEqn.c @@ -22,8 +22,8 @@ //////////////////////////////////////////////////////////////////////// #include "parseInt.h" -#include "vec.h" -#include "hop.h" +#include "src/misc/vec/vec.h" +#include "src/aig/hop/hop.h" ABC_NAMESPACE_IMPL_START diff --git a/src/bdd/parse/parseInt.h b/src/bdd/parse/parseInt.h index f0f3f302..78766612 100644 --- a/src/bdd/parse/parseInt.h +++ b/src/bdd/parse/parseInt.h @@ -16,8 +16,8 @@ ***********************************************************************/ -#ifndef __PARSE_INT_H__ -#define __PARSE_INT_H__ +#ifndef ABC__bdd__parse__parseInt_h +#define ABC__bdd__parse__parseInt_h //////////////////////////////////////////////////////////////////////// @@ -26,8 +26,7 @@ #include <stdio.h> -#include "extra.h" -#include "cuddInt.h" +#include "src/misc/extra/extraBdd.h" #include "parse.h" ABC_NAMESPACE_HEADER_START diff --git a/src/bdd/reo/reo.h b/src/bdd/reo/reo.h index 9d82329c..9381a350 100644 --- a/src/bdd/reo/reo.h +++ b/src/bdd/reo/reo.h @@ -16,13 +16,13 @@ ***********************************************************************/ -#ifndef __REO_H__ -#define __REO_H__ +#ifndef ABC__bdd__reo__reo_h +#define ABC__bdd__reo__reo_h #include <stdio.h> #include <stdlib.h> -#include "extra.h" +#include "src/misc/extra/extraBdd.h" //////////////////////////////////////////////////////////////////////// /// MACRO DEFINITIONS /// |