diff --git a/MPSoC/Makefile.forsoclib b/MPSoC/Makefile.forsoclib index ff16e546613a8578c74672131880a8f9f4f08fac..60cb76d27758621cfc654fd80e499cb6aec59c6e 100755 --- a/MPSoC/Makefile.forsoclib +++ b/MPSoC/Makefile.forsoclib @@ -16,7 +16,10 @@ export PATH updateruntime: cp src/*.c mutekh/libavatar/ cp src/*.h mutekh/libavatar/include/ -# cp src/Makefile mutekh/libavatar/ + cp mutekh/libmwmr/*.c mutekh/examples/avatar + cp mutekh/libmwmr/*.c mutekh/libavatar + cp mutekh/libmwmr/include/mwmr/mwmr.h mutekh/examples/avatar + cp mutekh/libmwmr/include/mwmr/mwmr.h mutekh/libavatar updategeneratedcode: cp src/defs.h mutekh/examples/avatar diff --git a/bin/config.xml b/bin/config.xml index bbae106e0e8af931f5f172be81f09b8b51906286..f64ad6ae86cc52a6441f841829b710deb424c8bc 100755 --- a/bin/config.xml +++ b/bin/config.xml @@ -48,7 +48,7 @@ <ProVerifVerifierHost data="localhost" /> <AVATARExecutableCodeDirectory data="../executablecode/" /> <AVATARMPSoCCodeDirectory data="../MPSoC/" /> -<AVATARMPSoCCompileCommand data="make -C ../MPSoC updategeneratedcode compilesoclib" /> +<AVATARMPSoCCompileCommand data="make -C ../MPSoC updateruntime updategeneratedcode compilesoclib" /> <AVATARExecutableCodeHost data="localhost"/> <AVATARExecutableCodeCompileCommand data="make -C ../executablecode" /> <AVATARExecutableCodeExecuteCommand data="../executablecode/run.x" /> @@ -63,7 +63,7 @@ <ExternalCommand2Host data="localhost"/> <ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/> -<LastOpenFile data="/users/enseig/genius/modeling-dg/miniAsynchronousDeploy2DD.xml"/> +<LastOpenFile data="/users/enseig/genius/modeling-dg/miniAsynchronousDeploy.xml"/> diff --git a/src/avatartranslator/AvatarSignal.java b/src/avatartranslator/AvatarSignal.java index 4f697ced1528bd97ae5272967e2cf1b9b8f747ea..1fa12f2c09cca625e1e5941e4a66a7a538a2b8e4 100644 --- a/src/avatartranslator/AvatarSignal.java +++ b/src/avatartranslator/AvatarSignal.java @@ -117,6 +117,16 @@ public class AvatarSignal extends AvatarMethod { return ret; } + public int getNbParams(){ + int cpt = 0; + + for(AvatarAttribute attribute: parameters) { + cpt ++; + } + return cpt; + } + + public AvatarSignal advancedClone(AvatarStateMachineOwner _block) { AvatarSignal as = new AvatarSignal(getName(), getInOut(), getReferenceObject()); setAdvancedClone((AvatarMethod)as, _block); diff --git a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java index b3ff949903db0e975ac86e429dc56f384aa4a16d..73dcc23310ca43fb59cfb3389e9a18e6f459dec6 100755 --- a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java +++ b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java @@ -239,9 +239,14 @@ public class TasksAndMainGenerator { mainFile.appendToMainCode(getChannelName(ar, i) + "_status.usage = 0;" + CR); mainFile.appendToMainCode(getChannelName(ar, i) + "_status.lock = 0;" + CR2); //DG 10.0.2 width=1?? - mainFile.appendToMainCode(getChannelName(ar, i) + ".width = 1;" + CR); - // mainFile.appendToMainCode(getChannelName(ar, i) + ".depth = 4;" + CR);//DG 10.02.2017 systematiquement des entiers pour le moment -mainFile.appendToMainCode(getChannelName(ar, i) + ".depth = 32;" + CR);//DG 14.02. + //mainFile.appendToMainCode(getChannelName(ar, i) + ".width = 1;" + CR); + + mainFile.appendToMainCode(getChannelName(ar, i) + ".width = 4;" + CR); + //DG 16.02. + AvatarSignal sig = ar.getSignal1(0);//DG boucle? + int nbParams= sig.getNbParams(); + + mainFile.appendToMainCode(getChannelName(ar, i) + ".depth = "+(nbParams*4)+";" + CR); mainFile.appendToMainCode(getChannelName(ar, i) + ".gdepth = " +getChannelName(ar, i)+".depth;" + CR); mainFile.appendToMainCode(getChannelName(ar, i) + ".buffer = "+getChannelName(ar, i)+"_data;" + CR); mainFile.appendToMainCode(getChannelName(ar, i) + ".status = &"+getChannelName(ar, i)+"_status;" + CR2); diff --git a/ttool.exe b/ttool.exe index 6379af8f6abc1ef016e1ead5fedc1de202f45dfb..8fb3d730f7097674386b2d8d1e8217ce1d4b13cb 100755 --- a/ttool.exe +++ b/ttool.exe @@ -2,6 +2,6 @@ java -version cd bin; -java -Xmx1024m -Djavax.net.ssl.trustStore=ServerKeyStore -Djavax.net.ssl.trustStorePassword=123456 -jar ttool.jar -config config-daniela.xml -experimental -debug -avatar -uppaal -launcher +java -Xmx1024m -Djavax.net.ssl.trustStore=ServerKeyStore -Djavax.net.ssl.trustStorePassword=123456 -jar ttool.jar -config config.xml -experimental -debug -avatar -uppaal -launcher