From 973f8dbcc10b38289a02f6323be32b64285697eb Mon Sep 17 00:00:00 2001
From: Daniela Genius <genius@debussy.soc.lip6.fr>
Date: Wed, 5 Jul 2017 14:30:37 +0200
Subject: [PATCH] bygsix
---
.../toSoclib/TasksAndMainGenerator.java | 51 +++----------------
1 file changed, 6 insertions(+), 45 deletions(-)
diff --git a/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index 19e15d0baf..5851b0646b 100755
--- a/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -232,41 +232,13 @@ public class TasksAndMainGenerator {
AvatarSignal sig = ar.getSignal1(i);
int nbParams= sig.getNbParams();
- // int nbOfMaxParams = _block.getMaxNbOfParams();
- //DG 13.06. variant dans le code C
-
- //ainsi on declare les attributs au debut d'une tache:
-
- //s += makeAttributesDeclaration(_block, _taskFile);
- //fonction dans tasksAndMainGenerator
-
- /*mainFile.appendToMainCode("sizeParams = sizeof(" );
- int cpt = 0;
- for(AvatarAttribute attribute: parameters) {
- String param_type = getCTypeOf(attribute);//Attention sizeof(bool)=sizeof(int)
- mainFile.appendToMainCode(attribute.getName() + "sizeof("+ret);
- }
- mainFile.appendToMainCode(");"+ CR);*/
int sizeParams = 0;
- // DG 13.06. variant calcule mais risque que cela ne cqpte pqs les data types
- //for(AvatarAttribute attribute: parameters) {
- // sizeParams+=4;//soit int soit bool?
- //}
-
- //ici variant calcule
+
if (nbParams>0)
mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ (nbParams*4)+";" + CR);
- //mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ sizeParams +";" + CR);
- //mainFile.appendToMainCode(getChannelName(ar, i) + ".width = sizeParams;" + CR);
-
- //int sizeParams= sig.getCumulSizeParams();
- //DG 13.06. Attention paramaters have not all size 4!!
- //if (nbParams>0)
- //mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ (nbParams*4) +";" + CR);
- //mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ sizeParams +";" + CR);
- //else mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ 4 +";" + CR);
- else mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ 4 +";" + CR);//DG 13.06.
+
+ else mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ 4 +";" + CR);
mainFile.appendToMainCode(getChannelName(ar, i) + ".depth = 100;" + CR);
mainFile.appendToMainCode(getChannelName(ar, i) + ".gdepth = " +getChannelName(ar, i)+".depth;" + CR);
@@ -329,22 +301,11 @@ public class TasksAndMainGenerator {
mainFile.appendToMainCode(getChannelName(ar, i) + "_status.lock = 0;" + CR2);
- AvatarSignal sig = ar.getSignal1(0);
- int nbParams= sig.getNbParams();
- //int sizeParams= sig.getCumulSizeParams();
- //DG 13.06. Attention paramaters have not all size 4!!
-
- //mainFile.appendToMainCode("sizeParams = sizeof(" );
- //int cpt = 0;
- //for(AvatarAttribute attribute: parameters) {
- // mainFile.appendToMainCode(attribute.getName() + "sizeof(");
- //}
- //mainFile.appendToMainCode(");"+ CR);
+ AvatarSignal sig = ar.getSignal1(i);
+ int nbParams= sig.getNbParams();
if (nbParams>0)
- mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ (nbParams*4)+";" + CR);
- //mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ sizeParams +";" + CR);
- //mainFile.appendToMainCode(getChannelName(ar, i) + ".width = sizeParams;" + CR);
+ mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ (nbParams*4)+";" + CR);
else mainFile.appendToMainCode(getChannelName(ar, i) + ".width = "+ 4 +";" + CR);
mainFile.appendToMainCode(getChannelName(ar, i) + ".depth = "+ ar.getSizeOfFIFO()+";" + CR);
--
GitLab