From 71aa7458523822654be8b273fb6a474359844e5d Mon Sep 17 00:00:00 2001
From: Daniela GENIUS <daniela.genius@lip6.fr>
Date: Wed, 3 Apr 2019 17:13:56 +0200
Subject: [PATCH] modification noms fichiers
---
.../toSysCAMS_soclib/#HeaderSoclib.java# | 113 ++++++++++++++++++
...odeRodrigo.java => ClusterCodeSoclib.java} | 6 +-
.../{HeaderRodrigo.java => HeaderSoclib.java} | 0
...deRodrigo.java => MakefileCodeSoclib.java} | 8 +-
...eRodrigo.java => PrimitiveCodeSoclib.java} | 6 +-
...drigo.java => TopCellGeneratorSoclib.java} | 30 ++---
6 files changed, 138 insertions(+), 25 deletions(-)
create mode 100644 src/main/java/syscamstranslator/toSysCAMS_soclib/#HeaderSoclib.java#
rename src/main/java/syscamstranslator/toSysCAMS_soclib/{ClusterCodeRodrigo.java => ClusterCodeSoclib.java} (97%)
rename src/main/java/syscamstranslator/toSysCAMS_soclib/{HeaderRodrigo.java => HeaderSoclib.java} (100%)
rename src/main/java/syscamstranslator/toSysCAMS_soclib/{MakefileCodeRodrigo.java => MakefileCodeSoclib.java} (95%)
rename src/main/java/syscamstranslator/toSysCAMS_soclib/{PrimitiveCodeRodrigo.java => PrimitiveCodeSoclib.java} (96%)
rename src/main/java/syscamstranslator/toSysCAMS_soclib/{TopCellGeneratorRodrigo.java => TopCellGeneratorSoclib.java} (82%)
diff --git a/src/main/java/syscamstranslator/toSysCAMS_soclib/#HeaderSoclib.java# b/src/main/java/syscamstranslator/toSysCAMS_soclib/#HeaderSoclib.java#
new file mode 100644
index 0000000000..30ded73d56
--- /dev/null
+++ b/src/main/java/syscamstranslator/toSysCAMS_soclib/#HeaderSoclib.java#
@@ -0,0 +1,113 @@
+/* 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
+ v2.0 Daniela GENIUS, Julien HENON 2015 */
+
+package syscamstranslator.toSysCAMS;
+
+import java.util.LinkedList;
+
+import syscamstranslator.*;
+
+/**
+ * Class HeaderSoclib
+ * Header of files .h and .cpp
+ * Creation: 14/05/2018
+ * @version 1.0 14/05/2018
+ * @author Irina Kit Yan LEE
+*/
+
+public class HeaderSoclib {
+ static private String headerPrimitiveTDF;
+ static private String headerPrimitiveDE;
+ static private String headerCluster;
+
+ private final static String CR = "\n";
+ private final static String CR2 = "\n\n";
+
+ HeaderSoclib() {}
+
+ public static String getPrimitiveHeaderTDF(SysCAMSTBlockTDF tdf) {
+ if (tdf != null) {
+ headerPrimitiveTDF = "#ifndef " + tdf.getName().toUpperCase() + "_TDF_H"+ CR
+ + "#define " + tdf.getName().toUpperCase() + "_TDF_H" + CR2
+ + "#include <cmath>" + CR + "#include <iostream>" + CR + "#include <systemc-ams>" + CR2;
+ } else {
+ headerPrimitiveTDF = "";
+ }
+ return headerPrimitiveTDF;
+ }
+
+ public static String getPrimitiveHeaderDE(SysCAMSTBlockDE de) {
+ if (de != null) {
+ headerPrimitiveDE = "#ifndef " + de.getName().toUpperCase() + "_TDF_H"+ CR
+ + "#define " + de.getName().toUpperCase() + "_TDF_H" + CR2
+ + "#include <cmath>" + CR + "#include <iostream>" + CR + "#include <systemc>" + CR2;
+ } else {
+ headerPrimitiveDE = "";
+ }
+ return headerPrimitiveDE;
+ }
+
+ public static String getClusterHeader(SysCAMSTCluster cluster) {
+ if (cluster != null) {
+ LinkedList<SysCAMSTBlockTDF> tdf = cluster.getBlockTDF();
+ LinkedList<SysCAMSTBlockDE> de = cluster.getBlockDE();
+
+ headerCluster = "#ifndef " + cluster.getClusterName().toUpperCase() + "_TDF_H"+ CR
+ + "#define " + cluster.getClusterName().toUpperCase() + "_TDF_H" + CR2;
+ headerCluster += "#include <systemc-ams>" + CR;
+
+ for (SysCAMSTBlockTDF b : tdf) {
+ headerCluster = headerCluster + "#include \"" + b.getName() + "_tdf.h\"" + CR;
+ }
+ for (SysCAMSTBlockDE b : de) {
+ headerCluster = headerCluster + "#include \"" + b.getName() + "_tdf.h\"" + CR;
+ }
+ headerCluster = headerCluster + CR;
+ } else {
+ headerCluster = "";
+ }
+ return headerCluster;
+ }
+}
diff --git a/src/main/java/syscamstranslator/toSysCAMS_soclib/ClusterCodeRodrigo.java b/src/main/java/syscamstranslator/toSysCAMS_soclib/ClusterCodeSoclib.java
similarity index 97%
rename from src/main/java/syscamstranslator/toSysCAMS_soclib/ClusterCodeRodrigo.java
rename to src/main/java/syscamstranslator/toSysCAMS_soclib/ClusterCodeSoclib.java
index fa186bc8d1..73bd3aa4b5 100644
--- a/src/main/java/syscamstranslator/toSysCAMS_soclib/ClusterCodeRodrigo.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_soclib/ClusterCodeSoclib.java
@@ -50,19 +50,19 @@ import java.util.LinkedList;
import syscamstranslator.*;
/**
- * Class ClusterCodeRodrigo
+ * Class ClusterCodeSoclib
* Principal code of a cluster component
* Creation: 14/05/2018
* @version 1.0 14/05/2018
* @author Irina Kit Yan LEE
*/
-public class ClusterCodeRodrigo {
+public class ClusterCodeSoclib {
static private String corpsCluster;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
- ClusterCodeRodrigo() {}
+ ClusterCodeSoclib() {}
public static String getClusterCode(SysCAMSTCluster cluster, LinkedList<SysCAMSTConnector> connectors) {
int nb_con = 0;
diff --git a/src/main/java/syscamstranslator/toSysCAMS_soclib/HeaderRodrigo.java b/src/main/java/syscamstranslator/toSysCAMS_soclib/HeaderSoclib.java
similarity index 100%
rename from src/main/java/syscamstranslator/toSysCAMS_soclib/HeaderRodrigo.java
rename to src/main/java/syscamstranslator/toSysCAMS_soclib/HeaderSoclib.java
diff --git a/src/main/java/syscamstranslator/toSysCAMS_soclib/MakefileCodeRodrigo.java b/src/main/java/syscamstranslator/toSysCAMS_soclib/MakefileCodeSoclib.java
similarity index 95%
rename from src/main/java/syscamstranslator/toSysCAMS_soclib/MakefileCodeRodrigo.java
rename to src/main/java/syscamstranslator/toSysCAMS_soclib/MakefileCodeSoclib.java
index 0482f7b278..4021cf7d67 100644
--- a/src/main/java/syscamstranslator/toSysCAMS_soclib/MakefileCodeRodrigo.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_soclib/MakefileCodeSoclib.java
@@ -50,21 +50,21 @@ import java.util.LinkedList;
import syscamstranslator.*;
/**
- * Class MakefileCodeRodrigo Principal code of a makefile Creation: 02/06/2018
+ * Class MakefileCodeSoclib Principal code of a makefile Creation: 02/06/2018
*
* @version 1.0 02/06/2018
* @author Irina Kit Yan LEE
*/
-public class MakefileCodeRodrigo {
+public class MakefileCodeSoclib {
static private String corpsMakefile;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
- MakefileCodeRodrigo() {
+ MakefileCodeSoclib() {
}
- public static String getMakefileCodeRodrigo(LinkedList<SysCAMSTCluster> clusters) {
+ public static String getMakefileCodeSoclib(LinkedList<SysCAMSTCluster> clusters) {
if (clusters != null) {
corpsMakefile = "# Compiler and linker flags" + CR + "CXXFLAGS = -g -Wall -I. $(SYSTEMC_INCLUDE_DIRS)" + CR
+ "LDFLAGS = $(SYSTEMC_LIBRARY_DIRS)" + CR2 + "# List of all ecutables to be compiled" + CR
diff --git a/src/main/java/syscamstranslator/toSysCAMS_soclib/PrimitiveCodeRodrigo.java b/src/main/java/syscamstranslator/toSysCAMS_soclib/PrimitiveCodeSoclib.java
similarity index 96%
rename from src/main/java/syscamstranslator/toSysCAMS_soclib/PrimitiveCodeRodrigo.java
rename to src/main/java/syscamstranslator/toSysCAMS_soclib/PrimitiveCodeSoclib.java
index ef1f58c8cd..be3ae8a5eb 100644
--- a/src/main/java/syscamstranslator/toSysCAMS_soclib/PrimitiveCodeRodrigo.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_soclib/PrimitiveCodeSoclib.java
@@ -50,20 +50,20 @@ import java.util.LinkedList;
import syscamstranslator.*;
/**
- * Class PrimitiveCodeRodrigo
+ * Class PrimitiveCodeSoclib
* Principal code of a primive component
* Creation: 14/05/2018
* @version 1.0 14/05/2018
* @author Irina Kit Yan LEE
*/
-public class PrimitiveCodeRodrigo {
+public class PrimitiveCodeSoclib {
static private String corpsPrimitiveTDF;
static private String corpsPrimitiveDE;
private final static String CR = "\n";
private final static String CR2 = "\n\n";
- PrimitiveCodeRodrigo() {}
+ PrimitiveCodeSoclib() {}
public static String getPrimitiveCodeTDF(SysCAMSTBlockTDF tdf) {
corpsPrimitiveTDF = "";
diff --git a/src/main/java/syscamstranslator/toSysCAMS_soclib/TopCellGeneratorRodrigo.java b/src/main/java/syscamstranslator/toSysCAMS_soclib/TopCellGeneratorSoclib.java
similarity index 82%
rename from src/main/java/syscamstranslator/toSysCAMS_soclib/TopCellGeneratorRodrigo.java
rename to src/main/java/syscamstranslator/toSysCAMS_soclib/TopCellGeneratorSoclib.java
index 0d24c64c61..292785e9c9 100644
--- a/src/main/java/syscamstranslator/toSysCAMS_soclib/TopCellGeneratorRodrigo.java
+++ b/src/main/java/syscamstranslator/toSysCAMS_soclib/TopCellGeneratorSoclib.java
@@ -58,13 +58,13 @@ import java.util.LinkedList;
* @author Irina Kit Yan LEE
*/
-public class TopCellGeneratorRodrigo {
+public class TopCellGeneratorSoclib {
public static SysCAMSSpecification syscams;
private final static String GENERATED_PATH1 = "generated_CPP" + File.separator;
private final static String GENERATED_PATH2 = "generated_H" + File.separator;
- public TopCellGeneratorRodrigo(SysCAMSSpecification sys) {
+ public TopCellGeneratorSoclib(SysCAMSSpecification sys) {
syscams = sys;
}
@@ -72,31 +72,31 @@ public class TopCellGeneratorRodrigo {
if (c == null) {
System.out.println("***Warning: require at least one cluster***");
}
- if (TopCellGeneratorRodrigo.syscams.getNbBlockTDF() == 0) {
+ if (TopCellGeneratorSoclib.syscams.getNbBlockTDF() == 0) {
System.out.println("***Warning: require at least one TDF block***");
}
- if (TopCellGeneratorRodrigo.syscams.getNbPortTDF() == 0) {
+ if (TopCellGeneratorSoclib.syscams.getNbPortTDF() == 0) {
System.out.println("***Warning: require at least one TDF port***");
}
- if (TopCellGeneratorRodrigo.syscams.getNbBlockDE() == 0) {
+ if (TopCellGeneratorSoclib.syscams.getNbBlockDE() == 0) {
System.out.println("***Warning: require at least one DE block***");
}
- if (TopCellGeneratorRodrigo.syscams.getNbPortDE() == 0) {
+ if (TopCellGeneratorSoclib.syscams.getNbPortDE() == 0) {
System.out.println("***Warning: require at least one DE port***");
}
- if (TopCellGeneratorRodrigo.syscams.getNbPortConverter() == 0) {
+ if (TopCellGeneratorSoclib.syscams.getNbPortConverter() == 0) {
System.out.println("***Warning: require at least one converter port***");
}
- if (TopCellGeneratorRodrigo.syscams.getNbConnectorCluster() == 0) {
+ if (TopCellGeneratorSoclib.syscams.getNbConnectorCluster() == 0) {
System.out.println("***Warning: require at least one connector***");
}
- String top = HeaderRodrigo.getClusterHeader(c) + ClusterCodeRodrigo.getClusterCode(c, connectors);
+ String top = HeaderSoclib.getClusterHeader(c) + ClusterCodeSoclib.getClusterCode(c, connectors);
return (top);
}
public void saveFile(String path) {
- SysCAMSTCluster cluster = TopCellGeneratorRodrigo.syscams.getCluster();
- LinkedList<SysCAMSTConnector> connectors = TopCellGeneratorRodrigo.syscams.getAllConnectorCluster();
+ SysCAMSTCluster cluster = TopCellGeneratorSoclib.syscams.getCluster();
+ LinkedList<SysCAMSTConnector> connectors = TopCellGeneratorSoclib.syscams.getAllConnectorCluster();
String top;
@@ -123,9 +123,9 @@ public class TopCellGeneratorRodrigo {
try {
System.err.println(path + GENERATED_PATH2 + t.getName() + "_tdf.h");
FileWriter fw = new FileWriter(path + GENERATED_PATH2 + "/" + t.getName() + "_tdf.h");
- headerTDF = HeaderRodrigo.getPrimitiveHeaderTDF(t);
+ headerTDF = HeaderSoclib.getPrimitiveHeaderTDF(t);
fw.write(headerTDF);
- codeTDF = PrimitiveCodeRodrigo.getPrimitiveCodeTDF(t);
+ codeTDF = PrimitiveCodeSoclib.getPrimitiveCodeTDF(t);
fw.write(codeTDF);
fw.close();
} catch (Exception ex) {
@@ -136,9 +136,9 @@ public class TopCellGeneratorRodrigo {
try {
System.err.println(path + GENERATED_PATH2 + t.getName() + "_tdf.h");
FileWriter fw = new FileWriter(path + GENERATED_PATH2 + "/" + t.getName() + "_tdf.h");
- headerDE = HeaderRodrigo.getPrimitiveHeaderDE(t);
+ headerDE = HeaderSoclib.getPrimitiveHeaderDE(t);
fw.write(headerDE);
- codeDE = PrimitiveCodeRodrigo.getPrimitiveCodeDE(t);
+ codeDE = PrimitiveCodeSoclib.getPrimitiveCodeDE(t);
fw.write(codeDE);
fw.close();
} catch (Exception ex) {
--
GitLab