From 011ab7d787caac1c4baa973e710b0a5cef99f8a5 Mon Sep 17 00:00:00 2001
From: Daniela Genius <genius@debussy.soc.lip6.fr>
Date: Mon, 24 Oct 2016 15:00:22 +0200
Subject: [PATCH] bugfix
---
MPSoC/Makefile.forsoclib | 24 ++---
MPSoC/generated_src/Block0.c | 1 -
MPSoC/generated_src/Block1.c | 1 -
MPSoC/generated_src/main.c | 7 --
MPSoC/generated_topcell/deployinfo.h | 6 +-
bin/config.xml | 4 +-
src/ddtranslatorSoclib/AvatarBridge.java | 41 ++++++++
src/ddtranslatorSoclib/AvatarBus.java | 40 ++++++++
src/ddtranslatorSoclib/AvatarCPU.java | 2 +
src/ddtranslatorSoclib/AvatarChannel.java | 40 ++++++++
src/ddtranslatorSoclib/AvatarComponent.java | 43 ++++++++
.../AvatarConnectingPoint.java | 42 ++++++++
src/ddtranslatorSoclib/AvatarConnector.java | 42 ++++++++
src/ddtranslatorSoclib/AvatarCoproMWMR.java | 70 ++++++++++---
src/ddtranslatorSoclib/AvatarCrossbar.java | 44 ++++++++-
src/ddtranslatorSoclib/AvatarICU.java | 43 ++++++++
.../AvatarMappedObject.java | 43 ++++++++
src/ddtranslatorSoclib/AvatarRAM.java | 43 ++++++++
src/ddtranslatorSoclib/AvatarTTY.java | 43 ++++++++
src/ddtranslatorSoclib/AvatarTask.java | 44 +++++++++
src/ddtranslatorSoclib/AvatarTimer.java | 43 ++++++++
src/ddtranslatorSoclib/AvatarVgmn.java | 43 ++++++++
.../AvatarddSpecification.java | 55 +++++++++++
src/ddtranslatorSoclib/toTopCell/Code.java | 41 ++++++++
.../toTopCell/Declaration.java | 61 +++++++++++-
.../toTopCell/Deployinfo.java | 42 ++++++++
src/ddtranslatorSoclib/toTopCell/Header.java | 41 ++++++++
src/ddtranslatorSoclib/toTopCell/Loader.java | 39 ++++++++
.../toTopCell/MappingTable.java | 41 ++++++++
src/ddtranslatorSoclib/toTopCell/NetList.java | 60 +++++++++++-
.../toTopCell/Platforminfo.java | 43 +++++++-
src/ddtranslatorSoclib/toTopCell/Signal.java | 53 +++++++++-
.../toTopCell/Simulation.java | 41 ++++++++
.../toTopCell/TopCellGenerator.java | 41 ++++++++
src/ui/MainGUI.java | 0
src/ui/TDiagramPanel.java | 98 ++++++++-----------
src/ui/TGComponent.java | 2 -
37 files changed, 1262 insertions(+), 105 deletions(-)
mode change 100755 => 100644 src/ui/MainGUI.java
diff --git a/MPSoC/Makefile.forsoclib b/MPSoC/Makefile.forsoclib
index 01092f89fe..d933a69223 100755
--- a/MPSoC/Makefile.forsoclib
+++ b/MPSoC/Makefile.forsoclib
@@ -14,22 +14,22 @@ PATH+=/opt/mutekh/bin
export PATH
updateruntime:
- cp ~/TURTLE/MPSoC/src/*.c ~/Prog/mutekh/libavatar/
- cp ~/TURTLE/MPSoC/src/*.h ~/Prog/mutekh/libavatar/include/
- //cp ~/TURTLE/MPSoC/src/Makefile ~/Prog/mutekh/libavatar/
+ cp ~/TTool/MPSoC/src/*.c ~/Prog/mutekh/libavatar/
+ cp ~/TTool/MPSoC/src/*.h ~/Prog/mutekh/libavatar/include/
+ //cp ~/TTool/MPSoC/src/Makefile ~/Prog/mutekh/libavatar/
updategeneratedcode:
- cp ~/TURTLE/MPSoC/generated_src/*.h ~/Prog/mutekh/examples/avatar
- cp ~/TURTLE/MPSoC/generated_src/*.c ~/Prog/mutekh/examples/avatar
- cp ~/TURTLE/MPSoC/Makefile.soclib ~/Prog/mutekh/examples/avatar/Makefile
+ cp ~/TTool/MPSoC/generated_src/*.h ~/Prog/mutekh/examples/avatar
+ cp ~/TTool/MPSoC/generated_src/*.c ~/Prog/mutekh/examples/avatar
+ cp ~/TTool/MPSoC/Makefile.soclib ~/Prog/mutekh/examples/avatar/Makefile
compilesoclib:
- cp ~/TURTLE/MPSoC/generated_topcell/top.cc ~/Prog/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/
- cp ~/TURTLE/MPSoC/generated_topcell/deployinfo.h ~/Prog/mutekh/arch/soclib/
- cp ~/TURTLE/MPSoC/generated_topcell/deployinfo_map.h ~/Prog/mutekh/arch/soclib/
- cp ~/TURTLE/MPSoC/generated_topcell/platform_desc ~/Prog/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/platform_desc
- cat ~/TURTLE/MPSoC/generated_topcell/config_noproc ~/TURTLE/MPSoC/generated_topcell/nbproc > ~/TURTLE/MPSoC/generated_topcell/config
- cp ~/TURTLE/MPSoC/generated_topcell/config ~/Prog/mutekh/examples/avatar/
+ cp ~/TTool/MPSoC/generated_topcell/top.cc ~/Prog/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/
+ cp ~/TTool/MPSoC/generated_topcell/deployinfo.h ~/Prog/mutekh/arch/soclib/
+ cp ~/TTool/MPSoC/generated_topcell/deployinfo_map.h ~/Prog/mutekh/arch/soclib/
+ cp ~/TTool/MPSoC/generated_topcell/platform_desc ~/Prog/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/platform_desc
+ cat ~/TTool/MPSoC/generated_topcell/config_noproc ~/TTool/MPSoC/generated_topcell/nbproc > ~/TTool/MPSoC/generated_topcell/config
+ cp ~/TTool/MPSoC/generated_topcell/config ~/Prog/mutekh/examples/avatar/
cd ~/Prog/mutekh; make CONF=examples/avatar/config BUILD=soclib-$(MUTEKH_CPU):pf-tutorial
runsoclib-trace:
diff --git a/MPSoC/generated_src/Block0.c b/MPSoC/generated_src/Block0.c
index 70a4437a0c..1c0c45f840 100644
--- a/MPSoC/generated_src/Block0.c
+++ b/MPSoC/generated_src/Block0.c
@@ -34,7 +34,6 @@ void *mainFunc__Block0(struct mwmr_s *channels_Block0[]){
switch(__currentState) {
case STATE__START__STATE:
traceStateEntering(__myname, "__StartState");
- debug2Msg(__myname, "-> (=====) Entering state + state0");
__currentState = STATE__state0;
break;
diff --git a/MPSoC/generated_src/Block1.c b/MPSoC/generated_src/Block1.c
index d8825b4c8c..2c16371ea7 100644
--- a/MPSoC/generated_src/Block1.c
+++ b/MPSoC/generated_src/Block1.c
@@ -34,7 +34,6 @@ void *mainFunc__Block1(struct mwmr_s *channels_Block1[]){
switch(__currentState) {
case STATE__START__STATE:
traceStateEntering(__myname, "__StartState");
- debug2Msg(__myname, "-> (=====) Entering state + state0");
__currentState = STATE__state0;
break;
diff --git a/MPSoC/generated_src/main.c b/MPSoC/generated_src/main.c
index c9117b956f..4165fd4b28 100644
--- a/MPSoC/generated_src/main.c
+++ b/MPSoC/generated_src/main.c
@@ -88,8 +88,6 @@ int main(int argc, char *argv[]) {
} else {
activeTracingInConsole();
}
- /* Activating debug messages */
- activeDebug();
/* Activating randomness */
initRandom();
/* Initializing the main mutex */
@@ -99,7 +97,6 @@ if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
__user_init();
- debugMsg("Starting tasks");
struct mwmr_s *channels_array_Block1[1];
channels_array_Block1[0]=&Block0_val__Block1_val;
@@ -109,7 +106,6 @@ if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
pthread_attr_affinity(attr_t, 0);
- debugMsg("Starting tasks");
pthread_create(&thread__Block1, attr_t, mainFunc__Block1, (void *)channels_array_Block1);
struct mwmr_s *channels_array_Block0[1];
@@ -121,17 +117,14 @@ if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
pthread_attr_affinity(attr_t, 1);
- debugMsg("Starting tasks");
pthread_create(&thread__Block0, attr_t, mainFunc__Block0, (void *)channels_array_Block0);
- debugMsg("Joining tasks");
pthread_join(thread__Block1, NULL);
pthread_join(thread__Block0, NULL);
- debugMsg("Application terminated");
return 0;
}
diff --git a/MPSoC/generated_topcell/deployinfo.h b/MPSoC/generated_topcell/deployinfo.h
index 4405e6a540..6e62ce8967 100644
--- a/MPSoC/generated_topcell/deployinfo.h
+++ b/MPSoC/generated_topcell/deployinfo.h
@@ -1,7 +1,7 @@
#define CACHED_RAM0_NAME cram0
#define CACHED_RAM0_ADDR 0x10000000
-#define CACHED_RAM0_SIZE 0x8000
+#define CACHED_RAM0_SIZE 0x80000
#define DEPLOY_RAM0_NAME uram0
-#define DEPLOY_RAM0_ADDR 0x10200000
-#define DEPLOY_RAM0_SIZE 0x8000
+#define DEPLOY_RAM0_ADDR 0x10280000
+#define DEPLOY_RAM0_SIZE 0x80000
diff --git a/bin/config.xml b/bin/config.xml
index ca00036c08..ffb3445f55 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -63,11 +63,11 @@
<ExternalCommand2Host data="localhost"/>
<ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/>
-<LastOpenFile data="../modeling/BENCH3_new.xml"/>
+<LastOpenFile data="/users/enseig/genius/TTool/modeling/miniAsynchronousDeploy.xml"/>
-<LastWindowAttributes x="-8" y="-8" width="1382" height="744" max="true" />
+<LastWindowAttributes x="758" y="181" width="790" height="596" max="false" />
<ProVerifHash data=""/>
diff --git a/src/ddtranslatorSoclib/AvatarBridge.java b/src/ddtranslatorSoclib/AvatarBridge.java
index e23d6c98d0..ee7accf382 100755
--- a/src/ddtranslatorSoclib/AvatarBridge.java
+++ b/src/ddtranslatorSoclib/AvatarBridge.java
@@ -1,3 +1,44 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarBus.java b/src/ddtranslatorSoclib/AvatarBus.java
index b41f0000e6..a24289e199 100755
--- a/src/ddtranslatorSoclib/AvatarBus.java
+++ b/src/ddtranslatorSoclib/AvatarBus.java
@@ -1,3 +1,43 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarCPU.java b/src/ddtranslatorSoclib/AvatarCPU.java
index 7ae8a08cbb..5d95cb05e2 100755
--- a/src/ddtranslatorSoclib/AvatarCPU.java
+++ b/src/ddtranslatorSoclib/AvatarCPU.java
@@ -1,3 +1,5 @@
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarChannel.java b/src/ddtranslatorSoclib/AvatarChannel.java
index 38167957c2..a9cc8affe8 100755
--- a/src/ddtranslatorSoclib/AvatarChannel.java
+++ b/src/ddtranslatorSoclib/AvatarChannel.java
@@ -1,3 +1,43 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarComponent.java b/src/ddtranslatorSoclib/AvatarComponent.java
index 8909037881..d014d72370 100755
--- a/src/ddtranslatorSoclib/AvatarComponent.java
+++ b/src/ddtranslatorSoclib/AvatarComponent.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarConnectingPoint.java b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
index b310c0fc4f..d6f17ba700 100755
--- a/src/ddtranslatorSoclib/AvatarConnectingPoint.java
+++ b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
@@ -1,3 +1,45 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarConnector.java b/src/ddtranslatorSoclib/AvatarConnector.java
index 1f4714c6ab..5344ae611f 100755
--- a/src/ddtranslatorSoclib/AvatarConnector.java
+++ b/src/ddtranslatorSoclib/AvatarConnector.java
@@ -1,3 +1,45 @@
+
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarCoproMWMR.java b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
index 1599eb304e..d8c9b2cec5 100755
--- a/src/ddtranslatorSoclib/AvatarCoproMWMR.java
+++ b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
@@ -1,3 +1,45 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
@@ -6,7 +48,7 @@ import java.util.*;
public class AvatarCoproMWMR extends AvatarComponent{
- private String timerName;
+ private String coprocName;
private int srcid ;
private int tgtid ;
private int plaps ;
@@ -21,9 +63,9 @@ public class AvatarCoproMWMR extends AvatarComponent{
private AvatarConnectingPoint[] connectingsPoints;
private int nbConnectingPoint = 16 ;
- public AvatarCoproMWMR(String _timerName,int srcid, int _srcid, int _tgtid, int _plaps, int _fifoToCoprocDepth,int _fifoFromCoproDepth, int _nToCopro, int _nFromCopro, int _nConfig, int _nStatus, boolean _useLLSC)
+ public AvatarCoproMWMR(String _coprocName,int srcid, int _srcid, int _tgtid, int _plaps, int _fifoToCoprocDepth,int _fifoFromCoproDepth, int _nToCopro, int _nFromCopro, int _nConfig, int _nStatus, boolean _useLLSC)
{
- timerName = _timerName;
+ coprocName = _coprocName;
srcid = _srcid;
tgtid = _tgtid;
plaps = _plaps ;
@@ -51,42 +93,42 @@ public class AvatarCoproMWMR extends AvatarComponent{
connectingsPoints[_indexConnectingPoint].setConnector(_connector);
}
- String getTimerName(){
- return timerName;
+ public String getCoprocName(){
+ return coprocName;
}
- int getSrcid(){
+ public int getSrcid(){
return srcid;
}
- int getTgtid(){
+ public int getTgtid(){
return tgtid;
}
- int getPalpas(){
+ public int getPlaps(){
return plaps;
}
- int getFifoToCoProcDepth(){
+ public int getFifoToCoProcDepth(){
return fifoToCoprocDepth;
}
- int getNToCopro(){
+ public int getNToCopro(){
return nToCopro;
}
- int getNFromCopro(){
+ public int getNFromCopro(){
return nFromCopro;
}
- int getNConfig(){
+ public int getNConfig(){
return nConfig;
}
- int getNStatus(){
+ public int getNStatus(){
return nStatus;
}
- boolean getUseLLSC(){
+ public boolean getUseLLSC(){
return useLLSC;
}
diff --git a/src/ddtranslatorSoclib/AvatarCrossbar.java b/src/ddtranslatorSoclib/AvatarCrossbar.java
index a42edac62d..21b710d503 100755
--- a/src/ddtranslatorSoclib/AvatarCrossbar.java
+++ b/src/ddtranslatorSoclib/AvatarCrossbar.java
@@ -1,5 +1,47 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* * @version 1.0 07/07/2015
- * @author Julien Henon, Daniela Genius */
+ * @author Daniela Genius */
package ddtranslatorSoclib;
import java.util.*;
diff --git a/src/ddtranslatorSoclib/AvatarICU.java b/src/ddtranslatorSoclib/AvatarICU.java
index 62be8b6adc..8b30b2102d 100755
--- a/src/ddtranslatorSoclib/AvatarICU.java
+++ b/src/ddtranslatorSoclib/AvatarICU.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarMappedObject.java b/src/ddtranslatorSoclib/AvatarMappedObject.java
index 00685ae6b6..6f67844d4e 100755
--- a/src/ddtranslatorSoclib/AvatarMappedObject.java
+++ b/src/ddtranslatorSoclib/AvatarMappedObject.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarRAM.java b/src/ddtranslatorSoclib/AvatarRAM.java
index 522f4464c5..b8bb4092fa 100755
--- a/src/ddtranslatorSoclib/AvatarRAM.java
+++ b/src/ddtranslatorSoclib/AvatarRAM.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarTTY.java b/src/ddtranslatorSoclib/AvatarTTY.java
index 4e3071b134..b6b0403e23 100755
--- a/src/ddtranslatorSoclib/AvatarTTY.java
+++ b/src/ddtranslatorSoclib/AvatarTTY.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarTask.java b/src/ddtranslatorSoclib/AvatarTask.java
index e335158a94..f8f8b2901e 100755
--- a/src/ddtranslatorSoclib/AvatarTask.java
+++ b/src/ddtranslatorSoclib/AvatarTask.java
@@ -1,3 +1,47 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarTimer.java b/src/ddtranslatorSoclib/AvatarTimer.java
index 22751b6901..60b0b613f2 100755
--- a/src/ddtranslatorSoclib/AvatarTimer.java
+++ b/src/ddtranslatorSoclib/AvatarTimer.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarVgmn.java b/src/ddtranslatorSoclib/AvatarVgmn.java
index 133511bd97..a46d70240f 100755
--- a/src/ddtranslatorSoclib/AvatarVgmn.java
+++ b/src/ddtranslatorSoclib/AvatarVgmn.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
diff --git a/src/ddtranslatorSoclib/AvatarddSpecification.java b/src/ddtranslatorSoclib/AvatarddSpecification.java
index 08611286bb..e790c176d4 100755
--- a/src/ddtranslatorSoclib/AvatarddSpecification.java
+++ b/src/ddtranslatorSoclib/AvatarddSpecification.java
@@ -1,3 +1,46 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
+
/* * @version 1.0 07/07/2015
* @author Julien Henon, Daniela Genius */
@@ -152,6 +195,18 @@ There always is a RAM0, a TTY and an interconnect (Bus or VGMN or crossbar) othe
}
return crossbars;
}
+
+ /* public LinkedList<AvatarBridge> getAllBridge(){
+ LinkedList<AvatarBridge> bridges = new LinkedList<AvatarBridge>();
+ for (AvatarComponent bridge : components )
+ {
+ if (bridges instanceof AvatarBridge){
+ bridges.add((AvatarBridge)bridge);
+ }
+ }
+ return bridges;
+ }*/
+
//Currently, we define 1 crossbar = 1 cluster
public int getNbClusters(){
diff --git a/src/ddtranslatorSoclib/toTopCell/Code.java b/src/ddtranslatorSoclib/toTopCell/Code.java
index 0d8977524b..2d74d8d828 100755
--- a/src/ddtranslatorSoclib/toTopCell/Code.java
+++ b/src/ddtranslatorSoclib/toTopCell/Code.java
@@ -1,4 +1,45 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* authors: v1.0 Raja GATGOUT 2014
v2.0 Daniela GENIUS, Julien HENON 2015 */
diff --git a/src/ddtranslatorSoclib/toTopCell/Declaration.java b/src/ddtranslatorSoclib/toTopCell/Declaration.java
index ed58a37eb9..c1fd8907e8 100755
--- a/src/ddtranslatorSoclib/toTopCell/Declaration.java
+++ b/src/ddtranslatorSoclib/toTopCell/Declaration.java
@@ -1,4 +1,43 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
/* authors: v1.0 Raja GATGOUT 2014
v2.0 Daniela GENIUS, Julien HENON 2015
v2.1 Daniela GENIUS, summer 2016*/
@@ -257,7 +296,27 @@ if(nb_clusters==0){
i++;
}
}
- }
+ }
+
+ /* VciMwmrController(
+ sc_module_name name,
+ const MappingTable &mt,
+ const IntTab &srcid,
+ const IntTab &tgtid,
+ const size_t plaps,
+ const size_t fifo_to_coproc_depth,
+ const size_t fifo_from_coproc_depth,
+ const size_t n_to_coproc,
+ const size_t n_from_coproc,
+ const size_t n_config,
+ const size_t n_status,
+ const bool use_llsc );
+ */
+
+ //only non-clustered version
+ for (AvatarCoproMWMR copro : TopCellGenerator.avatardd.getAllCoproMWMR()){
+ declaration += "caba::VciMwmrController<vci_param> " + copro.getCoprocName()+ "(\"" + copro.getCoprocName()+ "\", maptab, IntTab("+copro.getSrcid() + "), IntTab("+copro.getTgtid() + "),copro.getPlaps(),copro.getFifoToCoProcDepth(),copro.getNToCopro(),copro.getNFromCopro(),copro.getNConfig(),copro.getNStatus(), copro.getUseLLSC());"+ CR;
+ i++;}
// if VGMN was not last in input file, update here
vgmn.setNbOfAttachedInitiators(TopCellGenerator.avatardd.getNb_init());
diff --git a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
index d15d19be10..1610ec7793 100755
--- a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
@@ -1,3 +1,45 @@
+
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* This class generates the deployment info for the ldscript*/
diff --git a/src/ddtranslatorSoclib/toTopCell/Header.java b/src/ddtranslatorSoclib/toTopCell/Header.java
index a814ebba39..4e1474949c 100755
--- a/src/ddtranslatorSoclib/toTopCell/Header.java
+++ b/src/ddtranslatorSoclib/toTopCell/Header.java
@@ -1,3 +1,44 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* this class produces the lines containing essentially the initial #includes; we include all potential components event if they are not used in the deployment diagram*/
/* authors: v1.0 Raja GATGOUT 2014
diff --git a/src/ddtranslatorSoclib/toTopCell/Loader.java b/src/ddtranslatorSoclib/toTopCell/Loader.java
index 64f151d717..d33bf23d05 100755
--- a/src/ddtranslatorSoclib/toTopCell/Loader.java
+++ b/src/ddtranslatorSoclib/toTopCell/Loader.java
@@ -1,4 +1,43 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
/* authors: v1.0 Daniela GENIUS, Julien HENON 2015 */
diff --git a/src/ddtranslatorSoclib/toTopCell/MappingTable.java b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
index 907400d398..d0b5516f79 100755
--- a/src/ddtranslatorSoclib/toTopCell/MappingTable.java
+++ b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
@@ -1,3 +1,44 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* this class produces the lines pertaining to the segment table. Except the segments containing CHANNEL channels and those corresponding to targets in shared memory, they need not be sepcified by the user of the deployment diagram */
/* authors: v1.0 Raja GATGOUT 2014
diff --git a/src/ddtranslatorSoclib/toTopCell/NetList.java b/src/ddtranslatorSoclib/toTopCell/NetList.java
index c81b2dfcc6..06891c37bb 100755
--- a/src/ddtranslatorSoclib/toTopCell/NetList.java
+++ b/src/ddtranslatorSoclib/toTopCell/NetList.java
@@ -1,3 +1,44 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* authors: v1.0 Raja GATGOUT 2014
v2.0 Daniela GENIUS, Julien HENON 2015 */
@@ -290,7 +331,24 @@ public class NetList {
netlist = netlist + "vcilocks.p_clk(signal_clk);" + CR;
netlist = netlist + "vcilocks.p_resetn(signal_resetn);" + CR;
netlist = netlist + "vcilocks.p_vci(signal_vci_vcilocks);" + CR;
-
+
+ ////////////////MWMR controller; hypothesis 1 per coprocessor
+ // if(nb_cluster == 0){
+ i=0;
+ for (AvatarCoproMWMR copro : TopCellGenerator.avatardd.getAllCoproMWMR()){
+ //a coprocessor with FIFO interface
+ netlist = netlist +copro.getCoprocName()+".p_clk(signal_clk);" + CR;
+ netlist = netlist +copro.getCoprocName()+".p_resetn(signal_resetn);" + CR;
+ netlist = netlist + copro.getCoprocName()+".p_"+i+"_ctrl(signal_fifo_"+i+"_ctrl);" + CR;
+ //and its mwmr controller
+ netlist = netlist + "mwmr"+i+".p_clk(signal_clk);" + CR;
+ netlist = netlist + "mwmr"+i+".p_resetn(signal_resetn);" + CR;
+ netlist = netlist + "mwmr"+i+".p_vci_initiator(signal_mwmr_"+i+"initiator);" + CR;
+ netlist = netlist + "mwmr"+i+".p_vci_target(signal_mwmr_"+i+"_target);" + CR;
+ netlist = netlist + copro.getCoprocName()+".p_"+i+"_ctrl(signal_fifo_"+i+"_ctrl);" + CR;
+ }
+ // }
+
//int j;
/* netlist for connecting the monitoring infrastructure */
/* Which VCI interfaces are marked for full log, with a spy sign? */
diff --git a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
index 6546176d90..25a25e4857 100755
--- a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
@@ -1,7 +1,48 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* This class generates the platform_desc file t*/
-/* authors: v1.0 Daniela GENIUS auguts 2016 */
+/* authors: v1.0 Daniela GENIUS august 2016 */
package ddtranslatorSoclib.toTopCell;
import ddtranslatorSoclib.*;
diff --git a/src/ddtranslatorSoclib/toTopCell/Signal.java b/src/ddtranslatorSoclib/toTopCell/Signal.java
index 76dc78cec2..0ef15361c1 100755
--- a/src/ddtranslatorSoclib/toTopCell/Signal.java
+++ b/src/ddtranslatorSoclib/toTopCell/Signal.java
@@ -1,3 +1,44 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* This class generates the lines of the topcell where the signals are declared*/
/* authors: v1.0 Raja GATGOUT 2014
@@ -38,13 +79,19 @@ signal = signal +"caba::VciSignals<vci_param> signal_vci_vcilocks(\"signal_vci_v
signal = signal +"caba::VciSignals<vci_param> signal_vci_ethernett;"+ CR;
signal = signal +""+ CR;
signal = signal + "sc_clock signal_clk(\"signal_clk\");" + CR;
- signal = signal + "sc_signal<bool> signal_resetn(\"" + NAME_RST + "\");" + CR2;
+ signal = signal + "sc_signal<bool> signal_resetn(\"" + NAME_RST + "\");" + CR2;
+ int i=0;
+ for (AvatarCoproMWMR copro : TopCellGenerator.avatardd.getAllCoproMWMR()){
+ signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_initiator;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_mwmr_"+i+"_target;"+ CR;
+ signal = signal +"caba::VciSignals<vci_param> signal_fifo_"+i+"_ctrl;"+ CR;
+ }
if(TopCellGenerator.avatardd.getAllCrossbar().size()==0){
for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM())
signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + ram.getNo_ram()
+ "(\"signal_vci_vciram" + ram.getNo_ram() + "\");" + CR2;
- int i = 0;
+ i = 0;
for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()){
//signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+tty.getNo_tty()+"(\"signal_vci_tty"+tty.getNo_tty()+"\");" + CR2;
@@ -59,7 +106,7 @@ i++;
else{
for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM())
signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_vciram" + ram.getNo_ram()
- + "(\"signal_vci_vciram" + ram.getNo_ram() + "\");" + CR2; int i=0;
+ + "(\"signal_vci_vciram" + ram.getNo_ram() + "\");" + CR2; i=0;
for (AvatarTTY tty : TopCellGenerator.avatardd.getAllTTY()){
// signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+tty.getNo_tty()+"(\"signal_vci_tty"+tty.getNo_tty()+"\");" + CR2;
signal = signal + "soclib::caba::VciSignals<vci_param> signal_vci_tty"+i+"(\"signal_vci_tty"+i+"\");" + CR2;
diff --git a/src/ddtranslatorSoclib/toTopCell/Simulation.java b/src/ddtranslatorSoclib/toTopCell/Simulation.java
index 81bd8ab74c..c7248f87a9 100755
--- a/src/ddtranslatorSoclib/toTopCell/Simulation.java
+++ b/src/ddtranslatorSoclib/toTopCell/Simulation.java
@@ -1,3 +1,44 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* authors: v1.0 Raja GATGOUT 2014
v2.0 Daniela GENIUS, Julien HENON 2015 */
diff --git a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
index 3f02d7a89a..dbe450d526 100755
--- a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
+++ b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
@@ -1,3 +1,44 @@
+
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ Daniela Genius, Lip6, UMR 7606
+
+ ludovic.apvrille AT enst.fr
+ daniela.genius@lip6.fr
+
+ This software is a computer program whose purpose is to allow the
+ edition of TURTLE analysis, design and deployment diagrams, to
+ allow the generation of RT-LOTOS or Java code from this diagram,
+ and at last to allow the analysis of formal validation traces
+ obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ from INRIA Rhone-Alpes.
+
+ This software is governed by the CeCILL license under French law and
+ abiding by the rules of distribution of free software. You can use,
+ modify and/ or redistribute the software under the terms of the CeCILL
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty and the software's author, the holder of the
+ economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and, more generally, to use and operate it in the
+ same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL license and that you accept its terms.
+*/
+
/* Generator of the top cell for simulation with SoCLib virtual component
library */
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
old mode 100755
new mode 100644
diff --git a/src/ui/TDiagramPanel.java b/src/ui/TDiagramPanel.java
index f41f1cd07f..0f7dbac6f9 100755
--- a/src/ui/TDiagramPanel.java
+++ b/src/ui/TDiagramPanel.java
@@ -46,61 +46,47 @@
package ui;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Vector;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.RepaintManager;
-
-import myutil.GenericTree;
-import myutil.GraphicLib;
-import myutil.SVGGraphics;
-import myutil.TraceManager;
-import ui.atd.ATDBlock;
-import ui.avatarad.AvatarADActivity;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+
+import java.awt.image.*;
+
+
+import myutil.*;
+import ui.oscd.*;
+import ui.cd.*;
+import ui.window.*;
+import ui.tree.*;
+import ui.tmlcd.*;
+import ui.tmlcompd.*;
+import ui.req.*;
+import ui.ncdd.*;
+
+import ui.atd.*;
+
+
// AVATAR
-import ui.avatarbd.AvatarBDBlock;
-import ui.avatarbd.AvatarBDDataType;
-import ui.avatarbd.AvatarBDLibraryFunction;
-import ui.avatarcd.AvatarCDBlock;
-import ui.avatarmad.AvatarMADAssumption;
-import ui.avatarrd.AvatarRDRequirement;
-import ui.avatarsmd.AvatarSMDState;
-import ui.cd.TCDCompositionOperatorWithSynchro;
-import ui.cd.TCDSynchroGateList;
-import ui.cd.TCDTClass;
-import ui.cd.TCDTData;
-import ui.cd.TCDTObject;
-import ui.cd.TGConnectorAssociation;
-import ui.ncdd.NCConnectorNode;
-import ui.ncdd.NCEqNode;
-import ui.ncdd.NCRouteArtifact;
-import ui.ncdd.NCSwitchNode;
-import ui.ncdd.NCTrafficArtifact;
-import ui.oscd.TOSClass;
-import ui.req.Requirement;
-import ui.tmlcd.TMLTaskOperator;
-import ui.tmlcompd.TMLCCompositeComponent;
-import ui.tmlcompd.TMLCPrimitiveComponent;
-import ui.tmlcompd.TMLCRecordComponent;
-import ui.window.JDialogCode;
-import ui.window.JDialogNote;
-import ui.window.JDialogSearchBox;
+import ui.avatarbd.*;
+import ui.avatarsmd.*;
+import ui.avatarrd.*;
+import ui.avatarmad.*;
+import ui.avatarad.*;
+import ui.avatarcd.*;
+
+// Added by Solange
+import ui.procsd.*;
+
+import java.text.*;
+import java.awt.Rectangle;
+import java.awt.Graphics2D;
+import java.awt.Color;
+import java.awt.font.*;
+import java.awt.geom.*;
+import java.io.Writer;
+import java.io.OutputStreamWriter;
+import java.io.IOException;
@@ -167,7 +153,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
protected final int increment = 500;
private double zoom = 1.0;
- //private boolean zoomed = false;
+ private boolean zoomed = false;
private boolean draw;
@@ -616,7 +602,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
StringBuffer s;
//Added by Solange to see the components in the list
- //LinkedList<TGComponent> ruteoList=this.componentList;
+ LinkedList<TGComponent> ruteoList=this.componentList;
//
for (TGComponent tgc: this.componentList)
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index b9d53e00b3..dca685bb1f 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -1080,7 +1080,6 @@ public abstract class TGComponent implements CDElement, GenericTree {
}
}
}
- synchronized(this) {
Map<String, String> statMap = tdp.getMGUI().getStatus(getDIPLOID());
for (String name:statMap.keySet()){
String stat =statMap.get(name);
@@ -1098,7 +1097,6 @@ public abstract class TGComponent implements CDElement, GenericTree {
}
}
- }
/*if (this instanceof TMLArchiCPUNode) {
}
--
GitLab