Skip to content
Snippets Groups Projects
Commit 91120cfb authored by Erwan Jahier's avatar Erwan Jahier
Browse files

-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)
parent 2b8578b2
No related branches found
No related tags found
No related merge requests found
OASISFormat: 0.4 OASISFormat: 0.4
Name: lustre-v6 Name: lustre-v6
Version: 1.680 Version: 1.681
Synopsis: The Lustre V6 Verimag compiler Synopsis: The Lustre V6 Verimag compiler
Description: This package contains: Description: This package contains:
(1) lus2lic: the (current) name of the compiler (and interpreter via -exec). (1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
...@@ -50,5 +50,5 @@ Library "lustre-v6" ...@@ -50,5 +50,5 @@ Library "lustre-v6"
BuildDepends: str,unix,num,rdbg-plugin (>= 1.51) BuildDepends: str,unix,num,rdbg-plugin (>= 1.51)
Install:true Install:true
XMETAEnable: 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 ? # Comment se passer de cette liste à la Prevert ?
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: 947c6e5c637ee65500076881d3852ffe) # DO NOT EDIT (digest: 51160e1ba024346b4fe83f6ddd3ec9d4)
Lus2licRun Lus2licRun
SocExecValue SocExecValue
SocUtils SocUtils
...@@ -61,6 +61,7 @@ SocVar ...@@ -61,6 +61,7 @@ SocVar
TopoSort TopoSort
SortActions SortActions
SortActionsExpe SortActionsExpe
L2lCheckCKeyWord
L2lCheckKcgKeyWord L2lCheckKcgKeyWord
L2lWhenOnId L2lWhenOnId
L2lNoWhenNot L2lNoWhenNot
......
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: 947c6e5c637ee65500076881d3852ffe) # DO NOT EDIT (digest: 51160e1ba024346b4fe83f6ddd3ec9d4)
Lus2licRun Lus2licRun
SocExecValue SocExecValue
SocUtils SocUtils
...@@ -61,6 +61,7 @@ SocVar ...@@ -61,6 +61,7 @@ SocVar
TopoSort TopoSort
SortActions SortActions
SortActionsExpe SortActionsExpe
L2lCheckCKeyWord
L2lCheckKcgKeyWord L2lCheckKcgKeyWord
L2lWhenOnId L2lWhenOnId
L2lNoWhenNot L2lNoWhenNot
......
(** Automatically generated from Makefile *) (** Automatically generated from Makefile *)
let tool = "lus2lic" let tool = "lus2lic"
let branch = "master" let branch = "master"
let commit = "680" let commit = "681"
let sha_1 = "85804240652117595d47f55e0b8ac6765fa9120c" let sha_1 = "2b8578b2a47f71b209731302d7216c1f25b600e7"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "jahier@imag.fr" let maintainer = "jahier@imag.fr"
(* 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 = *) (* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
...@@ -1060,9 +1060,9 @@ then ...@@ -1060,9 +1060,9 @@ then
"($OGENSIM "^ogensim_exe^" -ul 1 \\\n\t-e $main_step"^ "($OGENSIM "^ogensim_exe^" -ul 1 \\\n\t-e $main_step"^
" -cl $n.cycles -lp $freeport \\\n\t-iol $n.io > $n_n"^ " -cl $n.cycles -lp $freeport \\\n\t-iol $n.io > $n_n"^
".ogensim.log 2>&1&) && \n\nsleep 1 &&\n"^ ".ogensim.log 2>&1&) && \n\nsleep 1 &&\n"^
"(lurettetop -l 1000 -go -ns2c -o ogensim.rif \\\n\t \ "(rdbg-batch -lurette -l 1000 -o ogensim.rif \\\n\t \
-rp \"sut:socket:127.0.0.1:$freeport:\" \\\n\t \ --sut-socket \"127.0.0.1:$freeport\" \\\n\t \
-rp \"env:lutin:_${n}_env.lut:${n}_env\" || true)) &&\n\n"^ --env-stdio \"lutin -boot -rif _${n}_env.lut -n ${n}_env\" || true)) &&\n\n"^
"getstat.r $n.cycles $WCET > $n.stat "getstat.r $n.cycles $WCET > $n.stat
fi fi
if [ \"$xpdf\" = \"true\" ] if [ \"$xpdf\" = \"true\" ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment