From 91120cfbec86724f356d936c3c991c01922002e7 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Wed, 11 Jan 2017 18:30:48 +0100
Subject: [PATCH] -2cw7: use rdbg instead of lurettetop to launch osim
BTW, add a missing module (L2lCheckCKeyWord) introduced in the previous change
(necessary for the v6 rdbg plugin)
---
_oasis | 4 ++--
src/lustre-v6.mldylib | 3 ++-
src/lustre-v6.mllib | 3 ++-
src/lv6version.ml | 4 ++--
src/soc2c.ml | 8 ++++----
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/_oasis b/_oasis
index fc8ae77e..418233bb 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lustre-v6
-Version: 1.680
+Version: 1.681
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
(1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
@@ -50,5 +50,5 @@ Library "lustre-v6"
BuildDepends: str,unix,num,rdbg-plugin (>= 1.51)
Install:true
XMETAEnable: true
- InternalModules: SocExecValue,SocUtils,Lv6util,Lv6version,Lv6errors,Lxm,Lv6MainArgs,Lv6Verbose,Soc,SocPredef,Lv6Id,SocExecDbg,SocExec,SocExecEvalPredef,Lv6Compile,AstTab,AstTabSymbol,AstInstanciateModel,Lv6parserUtils,AstV6,FilenameExtras,LicTab,LicDump,AstPredef,Lic,AstCore,FreshName,IdSolver,EvalConst,LicEvalConst,LicEvalType,UnifyType,Ast2lic,AstV6Dump,EvalClock,UnifyClock,LicEvalClock,EvalType,LicPrg,LicMetaOp,L2lCheckOutputs,Lv6Misc,L2lRmPoly,L2lExpandMetaOp,L2lSplit,L2lExpandNodes,L2lExpandArrays,L2lCheckLoops,L2lCheckMemSafe,L2lOptimIte,Lv6lexer,Lv6parser,AstRecognizePredef,Lic2soc,Action,ActionsDeps,SocVar,TopoSort,SortActions,SortActionsExpe,L2lCheckKcgKeyWord,L2lWhenOnId,L2lNoWhenNot
+ InternalModules: SocExecValue,SocUtils,Lv6util,Lv6version,Lv6errors,Lxm,Lv6MainArgs,Lv6Verbose,Soc,SocPredef,Lv6Id,SocExecDbg,SocExec,SocExecEvalPredef,Lv6Compile,AstTab,AstTabSymbol,AstInstanciateModel,Lv6parserUtils,AstV6,FilenameExtras,LicTab,LicDump,AstPredef,Lic,AstCore,FreshName,IdSolver,EvalConst,LicEvalConst,LicEvalType,UnifyType,Ast2lic,AstV6Dump,EvalClock,UnifyClock,LicEvalClock,EvalType,LicPrg,LicMetaOp,L2lCheckOutputs,Lv6Misc,L2lRmPoly,L2lExpandMetaOp,L2lSplit,L2lExpandNodes,L2lExpandArrays,L2lCheckLoops,L2lCheckMemSafe,L2lOptimIte,Lv6lexer,Lv6parser,AstRecognizePredef,Lic2soc,Action,ActionsDeps,SocVar,TopoSort,SortActions,SortActionsExpe,L2lCheckCKeyWord,L2lCheckKcgKeyWord,L2lWhenOnId,L2lNoWhenNot
# Comment se passer de cette liste à la Prevert ?
diff --git a/src/lustre-v6.mldylib b/src/lustre-v6.mldylib
index 4ad02e04..0524bd33 100644
--- a/src/lustre-v6.mldylib
+++ b/src/lustre-v6.mldylib
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 947c6e5c637ee65500076881d3852ffe)
+# DO NOT EDIT (digest: 51160e1ba024346b4fe83f6ddd3ec9d4)
Lus2licRun
SocExecValue
SocUtils
@@ -61,6 +61,7 @@ SocVar
TopoSort
SortActions
SortActionsExpe
+L2lCheckCKeyWord
L2lCheckKcgKeyWord
L2lWhenOnId
L2lNoWhenNot
diff --git a/src/lustre-v6.mllib b/src/lustre-v6.mllib
index 4ad02e04..0524bd33 100644
--- a/src/lustre-v6.mllib
+++ b/src/lustre-v6.mllib
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 947c6e5c637ee65500076881d3852ffe)
+# DO NOT EDIT (digest: 51160e1ba024346b4fe83f6ddd3ec9d4)
Lus2licRun
SocExecValue
SocUtils
@@ -61,6 +61,7 @@ SocVar
TopoSort
SortActions
SortActionsExpe
+L2lCheckCKeyWord
L2lCheckKcgKeyWord
L2lWhenOnId
L2lNoWhenNot
diff --git a/src/lv6version.ml b/src/lv6version.ml
index 3e2c05aa..7f74b50f 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
(** Automatically generated from Makefile *)
let tool = "lus2lic"
let branch = "master"
-let commit = "680"
-let sha_1 = "85804240652117595d47f55e0b8ac6765fa9120c"
+let commit = "681"
+let sha_1 = "2b8578b2a47f71b209731302d7216c1f25b600e7"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "jahier@imag.fr"
diff --git a/src/soc2c.ml b/src/soc2c.ml
index c06d3d2a..5b235a5e 100644
--- a/src/soc2c.ml
+++ b/src/soc2c.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 10/01/2017 (at 14:37) by Erwan Jahier> *)
+(* Time-stamp: <modified the 11/01/2017 (at 18:26) by Erwan Jahier> *)
(* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
@@ -1060,9 +1060,9 @@ then
"($OGENSIM "^ogensim_exe^" -ul 1 \\\n\t-e $main_step"^
" -cl $n.cycles -lp $freeport \\\n\t-iol $n.io > $n_n"^
".ogensim.log 2>&1&) && \n\nsleep 1 &&\n"^
- "(lurettetop -l 1000 -go -ns2c -o ogensim.rif \\\n\t \
- -rp \"sut:socket:127.0.0.1:$freeport:\" \\\n\t \
- -rp \"env:lutin:_${n}_env.lut:${n}_env\" || true)) &&\n\n"^
+ "(rdbg-batch -lurette -l 1000 -o ogensim.rif \\\n\t \
+ --sut-socket \"127.0.0.1:$freeport\" \\\n\t \
+ --env-stdio \"lutin -boot -rif _${n}_env.lut -n ${n}_env\" || true)) &&\n\n"^
"getstat.r $n.cycles $WCET > $n.stat
fi
if [ \"$xpdf\" = \"true\" ]
--
GitLab