Inlined version of mission control

compiler/global/global_printer.ml

@@ -77,7 +77,7 @@ let rec print_static_exp_desc ff sed = match sed with
   | Sarray_power (se, n_list) ->
       fprintf ff "%a^%a" print_static_exp se (print_list print_static_exp """^""") n_list
   | Sarray se_list ->
-      fprintf ff "@[<2>%a@]" (print_list_r print_static_exp "["";""]") se_list
+      fprintf ff "@[<2>%a@]" (print_list_r print_static_exp "["",""]") se_list
   | Stuple se_list -> print_static_exp_tuple ff se_list
   | Srecord f_se_list ->
       print_record (print_couple print_qualname

examples/MC_inlined/build

@@ -1,6 +1,6 @@
 #!/bin/bash
 HEPTC=../../heptc
-HEPTC_OPTIONS="-flatten"
+HEPTC_OPTIONS=""
 
 GCC=gcc
 GCC_OPTIONS="-g -O2 -std=c99 -I ../../../lib/c"
@@ -9,7 +9,7 @@ VERBOSE=1
 
 interfaces=(mctypes.epi)
 ext_libs=(mc_ext.epi mathext.epi)
-sources=(mc.ept)
+sources=()
 
 for f in ${interfaces[@]}; do
     if [ $VERBOSE ] ; then
@@ -32,7 +32,7 @@ for f in ${sources[@]}; do
     $HEPTC $HEPTC_OPTIONS -target c $f
 done
 
-#$HEPTC $HEPTC_OPTIONS -target c -s dv_fighterdebug mc.ept
+$HEPTC $HEPTC_OPTIONS -target c -s dv_fighterdebug mcinlined.ept
 
 source_dirs=(mctypes_c mc_c)
 other_files=(main.c mathext.c mathext.h mc_ext.c mc_ext.h)

examples/MC_inlined/mc.ept

@@ -239,8 +239,8 @@ let
       if setnewtracknumber then currenttracknumber + 1 else currenttracknumber;
     previoustracknumber =
       fold <<ksizemissiontracksarray>> missiontrackexist
-      (missiontrack^ksizemissiontracksarray,
-      previousmissiontracks, 0);
+      <(missiontrack)>
+      (previousmissiontracks, 0);
     newmissiontrack =
       setmissiontracknumber(missiontrack, if setnewtracknumber
         then newtracknumber
@@ -449,8 +449,6 @@ let
   re_Output = not (re_Input -> pre re_Input) & re_Input;
 tel
 
-const trackarrayinit : bool = false
-
 (* safe state machine for the computing of radar or iff state
    state ident: state.0  *)
 node statecmd(onoffbuttonpressed : bool (*last = false*);
@@ -858,8 +856,8 @@ node mc_tracks_prio(missiontracks : tmissiontracksarray)
 var prioritytracknumbers : tpriorityList;
 let
     missiontrackswithprio =
-      map<<ksizemissiontracksarray>> prio_setpriorityinmissiontrackarray(
-        prioritytracknumbers^ksizemissiontracksarray, missiontracks);
+      map<<ksizemissiontracksarray>> prio_setpriorityinmissiontrackarray
+        <(prioritytracknumbers)> (missiontracks);
     prioritytracknumbers =
       prio_selectprioritarymissiontracks(missiontracks,
         prio_selectprioritarymissiontracks(missiontracks,
@@ -875,8 +873,8 @@ var l81 : int;
 let
     (withtracknumber, l81) =
       mapfold<<ksizemissiontracksarray>> calculatemissiontracknumber
-          ((kinitmissiontrackarray -> pre withtracknumber)^ksizemissiontracksarray,
-           withouttracknb, 0 -> pre l81);
+          <(kinitmissiontrackarray -> pre withtracknumber)>
+           (withouttracknb, 0 -> pre l81);
 tel
 
 (* 1) merge tracks data received from both radar and iff sensors

examples/MC_inlined/mctypes.epi

@@ -142,3 +142,5 @@ type tpriorityList = int^4
 type trdrmode = TRdrMode_WIDE | TRdrMode_NARROW
 
 type tsensorstate =  TState_OFF | TState_ON | TState_FAIL
+
+const trackarrayinit:bool = false

examples/MC_memalloc/build

@@ -1,6 +1,6 @@
 #!/bin/bash
 HEPTC=../../heptc
-HEPTC_OPTIONS=""
+HEPTC_OPTIONS="-memalloc"
 
 GCC=gcc
 GCC_OPTIONS="-g -O2 -std=c99 -I ../../../lib/c"