From 148a786b694b5cad9035e53f35a349d6274f0291 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Thu, 3 Mar 2011 12:28:52 -0800 Subject: Made abc.h independent of CUDD and Extra. --- src/opt/dec/decFactor.c | 3 ++- src/opt/dec/decUtil.c | 1 + src/opt/fxu/fxu.h | 2 +- src/opt/fxu/fxuCreate.c | 1 - src/opt/fxu/fxuInt.h | 2 +- src/opt/mfs/mfsInt.h | 1 + src/opt/res/resSim.c | 1 + src/opt/res/resStrash.c | 1 + src/opt/rwr/rwrDec.c | 1 + src/opt/rwr/rwrEva.c | 1 + src/opt/rwr/rwrExp.c | 1 + src/opt/rwr/rwrLib.c | 1 + src/opt/rwr/rwrMan.c | 1 + src/opt/rwr/rwrPrint.c | 1 + src/opt/rwr/rwrTemp.c | 1 + src/opt/rwr/rwrUtil.c | 1 + src/opt/sim/simMan.c | 1 + src/opt/sim/simSat.c | 1 + src/opt/sim/simSeq.c | 1 + src/opt/sim/simSupp.c | 1 + src/opt/sim/simSwitch.c | 1 + src/opt/sim/simSym.c | 1 + src/opt/sim/simSymSat.c | 1 + src/opt/sim/simSymSim.c | 1 + src/opt/sim/simSymStr.c | 1 + src/opt/sim/simUtils.c | 1 + 26 files changed, 26 insertions(+), 4 deletions(-) (limited to 'src/opt') diff --git a/src/opt/dec/decFactor.c b/src/opt/dec/decFactor.c index aa9d9c8a..06ccf9ca 100644 --- a/src/opt/dec/decFactor.c +++ b/src/opt/dec/decFactor.c @@ -366,7 +366,8 @@ Mvc_Cover_t * Dec_ConvertSopToMvc( char * pSop ) ***********************************************************************/ int Dec_FactorVerify( char * pSop, Dec_Graph_t * pFForm ) { - extern DdNode * Dec_GraphDeriveBdd( DdManager * dd, Dec_Graph_t * pGraph ); + extern DdNode * Abc_ConvertSopToBdd( DdManager * dd, char * pSop ); + extern DdNode * Dec_GraphDeriveBdd( DdManager * dd, Dec_Graph_t * pGraph ); DdManager * dd = (DdManager *)Abc_FrameReadManDd(); DdNode * bFunc1, * bFunc2; int RetValue; diff --git a/src/opt/dec/decUtil.c b/src/opt/dec/decUtil.c index adf216f6..d2b5631e 100644 --- a/src/opt/dec/decUtil.c +++ b/src/opt/dec/decUtil.c @@ -17,6 +17,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "dec.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/fxu/fxu.h b/src/opt/fxu/fxu.h index db855f3b..282b1d2b 100644 --- a/src/opt/fxu/fxu.h +++ b/src/opt/fxu/fxu.h @@ -60,7 +60,7 @@ struct FxuDataStruct Vec_Ptr_t * vSopsNew; // the SOPs for each node in the network after extraction Vec_Ptr_t * vFaninsNew; // the fanins of each node in the network after extraction // the SOP manager - Extra_MmFlex_t * pManSop; + Mem_Flex_t * pManSop; // statistics int nNodesOld; // the old number of nodes int nNodesNew; // the number of divisors actually extracted diff --git a/src/opt/fxu/fxuCreate.c b/src/opt/fxu/fxuCreate.c index 3466b520..76c534e3 100644 --- a/src/opt/fxu/fxuCreate.c +++ b/src/opt/fxu/fxuCreate.c @@ -16,7 +16,6 @@ ***********************************************************************/ -#include "abc.h" #include "fxuInt.h" #include "fxu.h" diff --git a/src/opt/fxu/fxuInt.h b/src/opt/fxu/fxuInt.h index 96bec083..bbceac47 100644 --- a/src/opt/fxu/fxuInt.h +++ b/src/opt/fxu/fxuInt.h @@ -24,8 +24,8 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// +#include "abc.h" #include "extra.h" -#include "vec.h" ABC_NAMESPACE_HEADER_START diff --git a/src/opt/mfs/mfsInt.h b/src/opt/mfs/mfsInt.h index 28a68bd8..650a154a 100644 --- a/src/opt/mfs/mfsInt.h +++ b/src/opt/mfs/mfsInt.h @@ -27,6 +27,7 @@ //////////////////////////////////////////////////////////////////////// #include "abc.h" +#include "extra.h" #include "mfs.h" #include "aig.h" #include "cnf.h" diff --git a/src/opt/res/resSim.c b/src/opt/res/resSim.c index 560acc43..740b7d0a 100644 --- a/src/opt/res/resSim.c +++ b/src/opt/res/resSim.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "resInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/res/resStrash.c b/src/opt/res/resStrash.c index 9740af4c..1ee84957 100644 --- a/src/opt/res/resStrash.c +++ b/src/opt/res/resStrash.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "resInt.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwr/rwrDec.c b/src/opt/rwr/rwrDec.c index 76d8ac51..a280f5f1 100644 --- a/src/opt/rwr/rwrDec.c +++ b/src/opt/rwr/rwrDec.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" #include "dec.h" diff --git a/src/opt/rwr/rwrEva.c b/src/opt/rwr/rwrEva.c index 8f0c1821..4dc6c082 100644 --- a/src/opt/rwr/rwrEva.c +++ b/src/opt/rwr/rwrEva.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" #include "dec.h" #include "ivy.h" diff --git a/src/opt/rwr/rwrExp.c b/src/opt/rwr/rwrExp.c index c4664fbf..fa75f066 100644 --- a/src/opt/rwr/rwrExp.c +++ b/src/opt/rwr/rwrExp.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwr/rwrLib.c b/src/opt/rwr/rwrLib.c index 731871d0..a7c01047 100644 --- a/src/opt/rwr/rwrLib.c +++ b/src/opt/rwr/rwrLib.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwr/rwrMan.c b/src/opt/rwr/rwrMan.c index ffc5fcae..0f32c0da 100644 --- a/src/opt/rwr/rwrMan.c +++ b/src/opt/rwr/rwrMan.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" #include "main.h" #include "dec.h" diff --git a/src/opt/rwr/rwrPrint.c b/src/opt/rwr/rwrPrint.c index 11a084d3..5574df88 100644 --- a/src/opt/rwr/rwrPrint.c +++ b/src/opt/rwr/rwrPrint.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwr/rwrTemp.c b/src/opt/rwr/rwrTemp.c index 6a670c3a..654e37c1 100644 --- a/src/opt/rwr/rwrTemp.c +++ b/src/opt/rwr/rwrTemp.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/rwr/rwrUtil.c b/src/opt/rwr/rwrUtil.c index 7a836d63..7613691a 100644 --- a/src/opt/rwr/rwrUtil.c +++ b/src/opt/rwr/rwrUtil.c @@ -18,6 +18,7 @@ ***********************************************************************/ +#include "extra.h" #include "rwr.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simMan.c b/src/opt/sim/simMan.c index 234aa412..f3a9650b 100644 --- a/src/opt/sim/simMan.c +++ b/src/opt/sim/simMan.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSat.c b/src/opt/sim/simSat.c index 29fc6975..5654c493 100644 --- a/src/opt/sim/simSat.c +++ b/src/opt/sim/simSat.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSeq.c b/src/opt/sim/simSeq.c index db05226f..fd75ba8d 100644 --- a/src/opt/sim/simSeq.c +++ b/src/opt/sim/simSeq.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSupp.c b/src/opt/sim/simSupp.c index 563f98ac..67ac5efe 100644 --- a/src/opt/sim/simSupp.c +++ b/src/opt/sim/simSupp.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "fraig.h" #include "sim.h" diff --git a/src/opt/sim/simSwitch.c b/src/opt/sim/simSwitch.c index 4f675082..a9045ca1 100644 --- a/src/opt/sim/simSwitch.c +++ b/src/opt/sim/simSwitch.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSym.c b/src/opt/sim/simSym.c index d8a1eb4f..c6b588ac 100644 --- a/src/opt/sim/simSym.c +++ b/src/opt/sim/simSym.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSymSat.c b/src/opt/sim/simSymSat.c index 4f6690e5..bdc8fbee 100644 --- a/src/opt/sim/simSymSat.c +++ b/src/opt/sim/simSymSat.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" #include "fraig.h" diff --git a/src/opt/sim/simSymSim.c b/src/opt/sim/simSymSim.c index 85ba56fb..af942a19 100644 --- a/src/opt/sim/simSymSim.c +++ b/src/opt/sim/simSymSim.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simSymStr.c b/src/opt/sim/simSymStr.c index e9a25905..4d83dc61 100644 --- a/src/opt/sim/simSymStr.c +++ b/src/opt/sim/simSymStr.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START diff --git a/src/opt/sim/simUtils.c b/src/opt/sim/simUtils.c index 25d4cd44..aa3fc8af 100644 --- a/src/opt/sim/simUtils.c +++ b/src/opt/sim/simUtils.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "abc.h" +#include "extra.h" #include "sim.h" ABC_NAMESPACE_IMPL_START -- cgit v1.2.3