From 32445d46a412315159c8fa857bc366d3c438dee8 Mon Sep 17 00:00:00 2001 From: Ludovic Jacomme Date: Tue, 26 Mar 2002 14:59:50 +0000 Subject: [PATCH] gloups --- alliance/src/fmi/src/fmi_bdd.c | 12 +-- alliance/src/fmi/src/fmi_main.c | 12 +-- alliance/src/fmi/src/fmi_optim.c | 12 +-- alliance/src/fmi/src/fmi_parse.c | 12 +-- alliance/src/fmi/src/fsa_bdd.c | 128 ------------------------------- 5 files changed, 24 insertions(+), 152 deletions(-) delete mode 100644 alliance/src/fmi/src/fsa_bdd.c diff --git a/alliance/src/fmi/src/fmi_bdd.c b/alliance/src/fmi/src/fmi_bdd.c index 01e5a81a..6d6ffe07 100644 --- a/alliance/src/fmi/src/fmi_bdd.c +++ b/alliance/src/fmi/src/fmi_bdd.c @@ -18,12 +18,12 @@ # include # include -# include MUT_H -# include AUT_H -# include ABL_H -# include BDD_H -# include FSM_H -# include FTL_H +# include "mut.h" +# include "aut.h" +# include "abl.h" +# include "bdd.h" +# include "fsm.h" +# include "ftl.h" # include "fmi_bdd.h" diff --git a/alliance/src/fmi/src/fmi_main.c b/alliance/src/fmi/src/fmi_main.c index 683323b1..bd5208c1 100644 --- a/alliance/src/fmi/src/fmi_main.c +++ b/alliance/src/fmi/src/fmi_main.c @@ -42,12 +42,12 @@ | | \------------------------------------------------------------*/ -# include MUT_H -# include AUT_H -# include ABL_H -# include BDD_H -# include FSM_H -# include FTL_H +# include "mut.h" +# include "aut.h" +# include "abl.h" +# include "bdd.h" +# include "fsm.h" +# include "ftl.h" # include # include diff --git a/alliance/src/fmi/src/fmi_optim.c b/alliance/src/fmi/src/fmi_optim.c index b2efa099..cf465615 100644 --- a/alliance/src/fmi/src/fmi_optim.c +++ b/alliance/src/fmi/src/fmi_optim.c @@ -20,13 +20,13 @@ # include # include -# include MUT_H +# include "mut.h" # include LOG_H -# include AUT_H -# include ABL_H -# include BDD_H -# include FSM_H -# include FTL_H +# include "aut.h" +# include "abl.h" +# include "bdd.h" +# include "fsm.h" +# include "ftl.h" # include "fmi_optim.h" diff --git a/alliance/src/fmi/src/fmi_parse.c b/alliance/src/fmi/src/fmi_parse.c index ccf5c103..d8d001ee 100644 --- a/alliance/src/fmi/src/fmi_parse.c +++ b/alliance/src/fmi/src/fmi_parse.c @@ -20,12 +20,12 @@ # include # include -# include MUT_H -# include AUT_H -# include ABL_H -# include BDD_H -# include FSM_H -# include FTL_H +# include "mut.h" +# include "aut.h" +# include "abl.h" +# include "bdd.h" +# include "fsm.h" +# include "ftl.h" # include "fmi_parse.h" diff --git a/alliance/src/fmi/src/fsa_bdd.c b/alliance/src/fmi/src/fsa_bdd.c deleted file mode 100644 index 6c9644ae..00000000 --- a/alliance/src/fmi/src/fsa_bdd.c +++ /dev/null @@ -1,128 +0,0 @@ -/*------------------------------------------------------------\ -| | -| Tool : FSA | -| | -| File : fsa_bdd.c | -| | -| Authors : Jacomme Ludovic | -| | -| Date : 04.12.96 | -| | -\------------------------------------------------------------*/ -/*------------------------------------------------------------\ -| | -| Include Files | -| | -\------------------------------------------------------------*/ - -# include -# include - -# include MUT_H -# include AUT_H -# include ABL_H -# include BDD_H -# include FSM_H -# include FTL_H -# include PAT_H -# include PPT_H - -# include "fsa_error.h" -# include "fsa_bdd.h" - -/*------------------------------------------------------------\ -| | -| Constants | -| | -\------------------------------------------------------------*/ -/*------------------------------------------------------------\ -| | -| Types | -| | -\------------------------------------------------------------*/ -/*------------------------------------------------------------\ -| | -| Variables | -| | -\------------------------------------------------------------*/ -/*------------------------------------------------------------\ -| | -| Private variables | -| | -\------------------------------------------------------------*/ -/*------------------------------------------------------------\ -| | -| Functions | -| | -\------------------------------------------------------------*/ -/*------------------------------------------------------------\ -| | -| Fsa Fsm Make Bdd Circuit | -| | -\------------------------------------------------------------*/ - -bddcircuit *FsaFsmMakeBddCircuit( FsmFigure ) - - fsmfig_list *FsmFigure; -{ - fsmin_list *ScanIn; - fsmout_list *ScanOut; - bddsystem *BddSystem; - bddcircuit *BddCircuit; - - BddSystem = createbddsystem( 50, 10000, 1000, 900000 ); - - reorderbddsystemdynamic( BddSystem, reorderbddsystemsimple, 100000, 50 ); - - BddCircuit = createbddcircuit( FsmFigure->NAME, - FsmFigure->NUMBER_IN + FsmFigure->NUMBER_OUT, - FsmFigure->NUMBER_STATE, BddSystem ); - - for ( ScanIn = FsmFigure->IN; - ScanIn != (fsmin_list *)0; - ScanIn = ScanIn->NEXT ) - { - addbddcircuitin( (bddcircuit *)0, ScanIn->NAME, - (bddindex )0, BDD_IN_MODE_LAST ); - } - - for ( ScanOut = FsmFigure->OUT; - ScanOut != (fsmout_list *)0; - ScanOut = ScanOut->NEXT ) - { - addbddcircuitin( (bddcircuit *)0, ScanOut->NAME, - (bddindex )0, BDD_IN_MODE_LAST ); - } - - FsmFigure->CIRCUIT = BddCircuit; - - makefsmbddnode( FsmFigure ); - reorderbddsystemwindow( BddSystem ); - - return( BddCircuit ); -} - -/*------------------------------------------------------------\ -| | -| Fsa Fsm Convert Bdd Circuit | -| | -\------------------------------------------------------------*/ - -void FsaFsmConvertBddCircuit( FsmFigure ) - - fsmfig_list *FsmFigure; -{ - bddcircuit *BddCircuit; - bddsystem *BddSystem; - - BddCircuit = FsmFigure->CIRCUIT; - BddSystem = BddCircuit->BDD_SYSTEM; - - reorderbddsystemwindow( BddSystem ); - convertfsmbddnodeabl( FsmFigure ); - - destroybddcircuit( BddCircuit ); - destroybddsystem( BddSystem ); - - FsmFigure->CIRCUIT = (bddcircuit *)0; -}