Commit fbd316f5 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

update lus2lic + minor changes

parent 951ddbcf
......@@ -255,8 +255,6 @@ LURETTE_SOURCES=\
$(OBJDIR)/graph.mli \
$(OBJDIR)/myGenlex.mli \
$(OBJDIR)/myGenlex.ml \
$(OBJDIR)/gnuplotRif.mli \
$(OBJDIR)/gnuplotRif.ml \
$(OBJDIR)/Ezdl.ml \
$(OBJDIR)/Ezdl.mli \
$(OBJDIR)/type.ml \
......@@ -370,7 +368,6 @@ LUTIN_SOURCES = \
$(OBJDIR)/lutProg.mli \
$(OBJDIR)/lucProg.ml \
$(OBJDIR)/lucProg.mli \
$(OBJDIR)/luciole.ml \
$(OBJDIR)/luc2alice.ml \
$(OBJDIR)/luc2c.mli \
$(OBJDIR)/luc2c.ml \
......
# well, finally, set it manually...
VERSION:=1.56
VERSION:=1.57
#
# When incrementing that version number, please don't forget to
# fill-in the RELEASE-NOTES file (using the git history).
......
......@@ -996,7 +996,7 @@ let (main : Exp.var list -> Exp.var list -> Exp.var list -> unit) =
exit 2
);
let var_to_vn_ct v = (Var.name v, Type.to_cstring (Var.typ v)) in
Luciole.gen_stubs false fn
Luciole.gen_stubs fn
(List.map var_to_vn_ct ins)
(List.map var_to_vn_ct outs)
| Scade -> ()
......
......@@ -138,7 +138,7 @@ let rec (main : unit -> 'a) =
let luciole_outputs = List.sort compare luciole_outputs in
let luciole_inputs = List.sort compare luciole_inputs in
let sut_str = Filename.basename (Filename.chop_extension flag.sut_header) in
Luciole.gen_stubs true sut_str luciole_outputs luciole_inputs
Luciole.gen_stubs sut_str luciole_outputs luciole_inputs
with e ->
......
......@@ -120,7 +120,7 @@ LUSTRE_SOURCES = \
$(OBJDIR)/licMetaOp.ml \
$(OBJDIR)/ast2lic.mli \
$(OBJDIR)/ast2lic.ml \
$(OBJDIR)/misc.ml \
$(OBJDIR)/lv6Misc.ml \
$(OBJDIR)/l2lCheckKcgKeyWord.ml \
$(OBJDIR)/l2lCheckMemSafe.mli \
$(OBJDIR)/l2lCheckMemSafe.ml \
......@@ -144,8 +144,8 @@ LUSTRE_SOURCES = \
$(OBJDIR)/l2lSplit.ml \
$(OBJDIR)/licTab.ml \
$(OBJDIR)/licTab.mli \
$(OBJDIR)/compile.mli \
$(OBJDIR)/compile.ml \
$(OBJDIR)/lv6Compile.mli \
$(OBJDIR)/lv6Compile.ml \
......
......@@ -24,7 +24,7 @@ let set_gnuplot b = LtopArg.args.LtopArg.display_gnuplot <- b
let set_sim2chro b = LtopArg.args.LtopArg.display_sim2chro <- b
let run () =
Event.event_nb :=0;
Event.set_nb 0;
RunDirect.start ()
let next e = e.next()
let terminate e = e.terminate
......
version = "1"
description = "an API to call the Lutin interpreter from ocaml"
requires = "str unix num rdbg-plugin"
archive(byte) = "lut4ocaml.cma"
archive(byte, plugin) = "lut4ocaml.cma"
archive(native) = "lut4ocaml.cmxa"
archive(native, plugin) = "lut4ocaml.cmxs"
exists_if = "lut4ocaml.cma"
......@@ -12,8 +12,8 @@ ifneq ($(HOSTTYPE),Darwin-x86_64)
#STATIC=yes
endif
OCAMLFLAGS += -I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
OCAMLFLAGS += -I +rdbg-plugin
OCAMLFLAGS +=-I $(OBJDIR) -I $(OCAMLLIB) -I $(PREFIX)/$(HOSTTYPE)/lib
OCAMLFLAGS += -I +oUnit2 -I +rdbg-plugin
IDLFLAGS=-nocpp
......@@ -27,7 +27,7 @@ OCAMLLDFLAGS= -cclib -lstdc++ -cclib -I/usr/lib/w32api $(OCAMLOPTFLAG) \
-cclib -l$(POLKA)_caml \
-cclib -l$(POLKA) -cclib -lgmp
endif
OCAMLLDFLAGS += -I +rdbg-plugin
OCAMLLDFLAGS += -I +ounit2 -I +rdbg-plugin
CC= $(GCC) $(DWIN32) -fPIC
......
This diff is collapsed.
......@@ -643,7 +643,7 @@ all_assert:
check:
echo "A faire dans le repertoire test, sinon, ca vaut pas !!! "
allw: clean lucky ltop show stubs gnuplot-rif gnuplot-socket call-via-socket gen_luc luc2luciole luc4c libluc4c_nc.a draw-all lut4ocaml-all
allw: clean lucky ltop show stubs gnuplot-socket call-via-socket gen_luc luc2luciole luc4c libluc4c_nc.a draw-all lut4ocaml-all
LUCKY_DEF=
......@@ -653,10 +653,10 @@ endif
old: lucky luc2luciole luc4c libluc4c_nc.a
compile_all: gen_version $(OBJDIR) gnuplot-rif gnuplot-socket call-via-socket lutin draw-all $(LUCKY_DEF) libluc4c_nc.a check-rif ltop lut4ocaml-clean lut4ocaml-all
compile_all: gen_version $(OBJDIR) gnuplot-socket call-via-socket lutin draw-all $(LUCKY_DEF) libluc4c_nc.a check-rif ltop lut4ocaml-clean lut4ocaml-all
rest: check-rif ltop lut4ocaml-clean lut4ocaml-all
allnc: clean lucky ltop show stubs gnuplot-rif gnuplot-socket call-via-socket gen_luc luc2luciole luc4c libluc4c_nc.a liblucky_nc.a draw-all lut4ocaml-all check-rif
allnc: clean lucky ltop show stubs gnuplot-socket call-via-socket gen_luc luc2luciole luc4c libluc4c_nc.a liblucky_nc.a draw-all lut4ocaml-all check-rif
static: lucky_static ltop_static show_static stubs_static gen_luc_static
......@@ -691,8 +691,7 @@ create_dirs:
[ -d $(LIB_INSTALL_DIR) ] || mkdir $(LIB_INSTALL_DIR) && \
[ -d $(INC_INSTALL_DIR) ] || mkdir $(INC_INSTALL_DIR)
cp: create_dirs lut4ocaml-cp draw-cp
cp $(OBJDIR)/gnuplot-rif$(EXE) $(BIN_INSTALL_DIR) ; \
cp: create_dirs lut4ocaml-cp draw-cp lutin-caml-install
cp $(OBJDIR)/gnuplot-socket$(EXE) $(BIN_INSTALL_DIR) ; \
cp $(OBJDIR)/call-via-socket$(EXE) $(BIN_INSTALL_DIR) ; \
cp $(OBJDIR)/gen_stubs_exe$(EXE) $(BIN_INSTALL_DIR) ; \
......@@ -730,7 +729,6 @@ LIB_VERIMAG_INSTALL_DIR= /usr/local/tools/lurette/lib/
INC_VERIMAG_INSTALL_DIR= /usr/local/tools/lurette/include/
cp-verimag:
cp $(PRE_RELEASE_DIR)/bin/sim2chrogtk$(EXE) $(BIN_VERIMAG_INSTALL_DIR) ; \
cp $(PRE_RELEASE_DIR)/bin/gnuplot-rif$(EXE) $(BIN_VERIMAG_INSTALL_DIR) ; \
cp $(PRE_RELEASE_DIR)/bin/gnuplot-socket$(EXE) $(BIN_VERIMAG_INSTALL_DIR) ; \
cp $(PRE_RELEASE_DIR)/bin/call-via-socket$(EXE) $(BIN_VERIMAG_INSTALL_DIR) ; \
cp $(PRE_RELEASE_DIR)/bin/gen_stubs_exe$(EXE) $(BIN_VERIMAG_INSTALL_DIR) ; \
......@@ -749,7 +747,6 @@ cp-verimag:
COMON_DIR=$(HOME)/dd/COMON/trunk/bin/WinNT/tools/
cp-comon:
cp $(PRE_RELEASE_DIR)/bin/gnuplot-rif$(EXE) $(COMON_DIR) ; \
cp $(PRE_RELEASE_DIR)/bin/gnuplot-socket$(EXE) $(COMON_DIR) ; \
cp $(PRE_RELEASE_DIR)/bin/call-via-socket$(EXE) $(COMON_DIR) ; \
cp $(PRE_RELEASE_DIR)/bin/check-rif$(EXE) $(COMON_DIR) ; \
......
(* Time-stamp: <modified the 02/09/2014 (at 14:53) by Erwan Jahier> *)
(* Time-stamp: <modified the 21/10/2015 (at 16:32) by Erwan Jahier> *)
open RdbgPlugin
type vars = (string * Data.t) list
......@@ -113,6 +113,7 @@ let (make_ec : string -> RdbgPlugin.t) =
}
in
{
id = "";
inputs = ec_in;
outputs= ec_out;
kill= kill;
......@@ -230,6 +231,7 @@ let (make_socket_do : string -> int -> in_channel * RdbgPlugin.t) =
}
in
let plugin = {
id = "";
inputs = vars_in;
outputs= vars_out;
kill= kill;
......@@ -332,6 +334,7 @@ let (make_ec_exe : string -> RdbgPlugin.t) =
}
in
{
id = "";
inputs = ec_in;
outputs= ec_out;
kill= kill;
......@@ -352,7 +355,7 @@ let (make_luciole : string -> vars -> vars ->
);
let luciole_outputs = List.map (fun (id,t) -> id, Data.type_to_string t) luciole_outputs in
let luciole_inputs = List.map (fun (id,t) -> id, Data.type_to_string t) luciole_inputs in
Luciole.gen_stubs true "lurette" luciole_outputs luciole_inputs;
Luciole.gen_stubs "lurette" luciole_outputs luciole_inputs;
Printf.eprintf "Luciole: generate lurette.dro from lurette_luciole.c\n";
flush stderr;
if Util2.c2dro "lurette_luciole.c" then () else
......
(* Time-stamp: <modified the 26/03/2014 (at 17:06) by Erwan Jahier> *)
(* Time-stamp: <modified the 21/10/2015 (at 11:52) by Erwan Jahier> *)
(**********************************************************************************)
type vars = (string * Data.t) list
......@@ -96,6 +96,7 @@ let make argv =
lut_out
in
{
id = String.concat " " (Array.to_list argv);
inputs = lut_in;
outputs= lut_out;
kill=(fun _ -> ());
......
(* Time-stamp: <modified the 26/02/2015 (at 13:50) by Erwan Jahier> *)
(* Time-stamp: <modified the 20/10/2015 (at 17:44) by Erwan Jahier> *)
open Lxm
open Lv6errors
open Lic
open Misc
open Lv6Misc
module IdMap = Map.Make(struct type t = Lv6Id.t let compare = compare end)
module IdSet = Set.Make(struct type t = Lv6Id.t let compare = compare end)
......
(* Time-stamp: <modified the 26/02/2015 (at 11:26) by Erwan Jahier> *)
(* Time-stamp: <modified the 20/10/2015 (at 17:44) by Erwan Jahier> *)
open Lxm
open Lv6errors
open Lic
open Misc
open Lv6Misc
(*********************************************************************************)
(** Used to represent how much defined a variable is. *)
......
(* Time-stamp: <modified the 18/06/2015 (at 15:08) by Erwan Jahier> *)
(* Time-stamp: <modified the 21/10/2015 (at 11:29) by Erwan Jahier> *)
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
*)
......@@ -27,8 +27,8 @@ let make argv =
Some (Lv6Id.idref_of_string opt.main_node)
in
if opt.outfile <> "" then opt.oc <- open_out opt.outfile;
let nsl = Compile.get_source_list opt opt.infiles in
let lic_prg = Compile.doit opt nsl main_node in
let nsl = Lv6Compile.get_source_list opt opt.infiles in
let lic_prg = Lv6Compile.doit opt nsl main_node in
let nk = (Lic.node_key_of_idref (Lv6Id.to_idref opt.main_node)) in
let sk, soc_tbl =
......@@ -93,6 +93,7 @@ let make argv =
let (mems_in : Data.subst list) = [] in (* XXX todo *)
let (mems_out : Data.subst list) = [] in (* XXX todo *)
{
id = String.concat " " (Array.to_list argv);
inputs = vntl_i;
outputs= vntl_o;
kill=(fun _ -> ());
......
(** Automatically generated from Makefile *)
let tool = "lus2lic"
let branch = "master"
let commit = "622"
let sha_1 = "953ed8bb2db2ee412fb4a3d1ab70b205cc1299bb"
let commit = "627"
let sha_1 = "309452a9a32a423e16e163efcd2e018892cc3d3f"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "jahier@imag.fr"
(* Time-stamp: <modified the 18/09/2015 (at 15:49) by Erwan Jahier> *)
(* Time-stamp: <modified the 20/10/2015 (at 17:48) by Erwan Jahier> *)
open Verbose
open AstV6
......@@ -238,7 +238,7 @@ let info msg =
let main () = (
(* Compile.init_appli () ; *)
(* Lv6Compile.init_appli () ; *)
(* parse_args (); *)
let opt = Lv6MainArgs.parse Sys.argv in
Verbose.exe ~level:3 (fun () ->
......@@ -254,8 +254,8 @@ let main () = (
in
if opt.outfile <> "" then opt.oc <- open_out opt.outfile;
(try (
let nsl = Compile.get_source_list opt opt.infiles in
let lic_prg = Compile.doit opt nsl main_node in
let nsl = Lv6Compile.get_source_list opt opt.infiles in
let lic_prg = Lv6Compile.doit opt nsl main_node in
if opt.print_interface then (
gen_rif_interface lic_prg main_node opt;
info "bye!";
......
(* Time-stamp: <modified the 18/06/2015 (at 15:08) by Erwan Jahier> *)
(* Time-stamp: <modified the 16/10/2015 (at 17:09) by Erwan Jahier> *)
open Soc
open Data
......@@ -284,7 +284,7 @@ let rec (do_step_dbg : Soc.tbl -> Soc.t -> Event.ctx -> SocExecValue.ctx ->
Event.outputs = ectx.Event.ctx_outputs;
Event.sinfo = None;
Event.data = ectx.Event.ctx_data;
Event.next = (fun () -> Event.event_nb := enb; cont ctx);
Event.next = (fun () -> Event.set_nb enb; cont ctx);
Event.terminate = ectx.Event.ctx_terminate;
}
in
......
......@@ -28,8 +28,6 @@ SOURCES_OCAML = \
$(OBJDIR)/util2.ml \
$(OBJDIR)/coverage.mli \
$(OBJDIR)/coverage.ml \
$(OBJDIR)/luciole.mli \
$(OBJDIR)/luciole.ml \
$(OBJDIR)/lustreRun.mli \
$(OBJDIR)/lustreRun.ml \
$(OBJDIR)/checkRif.ml
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment