Commit df673bee authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fix makefile

parent c4bae792
...@@ -33,7 +33,7 @@ test-python: ...@@ -33,7 +33,7 @@ test-python:
$(GNATBIND) -n -Llibog og $(GNATBIND) -n -Llibog og
$(GNATMAKE) -c -fPIC -gnat2012 b~og.adb $(GNATMAKE) -c -fPIC -gnat2012 b~og.adb
$(CC) -shared -fPIC -o libog.so b~og.o og.o adaasn1rtl.o taste_dataview.o -lgnat $(CC) -shared -fPIC -o libog.so b~og.o og.o adaasn1rtl.o taste_dataview.o -lgnat
python -c "from ctypes import *; test=CDLL('./libog.so'); test.liboginit(); test.og_for_a(); test.og_for_b(); test.og_for_a(); test.og_for_b()" python -c "from ctypes import *; test=CDLL('./libog.so'); test.liboginit();"
coverage: coverage:
......
...@@ -18,19 +18,19 @@ signal telemetry(tm_type); ...@@ -18,19 +18,19 @@ signal telemetry(tm_type);
PROCESS og; PROCESS og;
STATE AGGREGATION wait; STATE AGGREGATION wait;
SUBSTRUCTURE SUBSTRUCTURE
STATE mode_manager; STATE memory_manager;
SUBSTRUCTURE SUBSTRUCTURE
/* CIF START (359, 108), (70, 35) */ /* CIF START (259, 60), (70, 35) */
START; START;
/* CIF NEXTSTATE (331, 158), (126, 35) */ /* CIF NEXTSTATE (231, 110), (126, 35) */
NEXTSTATE wait_for_tc; NEXTSTATE wait_for_tc;
/* CIF STATE (331, 158), (126, 35) */ /* CIF STATE (231, 110), (126, 35) */
STATE wait_for_tc; STATE wait_for_tc;
/* CIF PROVIDED (170, 213), (451, 35) */ /* CIF PROVIDED (64, 165), (459, 35) */
PROVIDED got_tc=true and present(tc!content)=change_mode; PROVIDED got_tc=true and present(tc!content)=patch_memory;
/* CIF PROCEDURECALL (282, 263), (226, 35) */ /* CIF PROCEDURECALL (178, 215), (231, 35) */
CALL writeln('Change Mode'); CALL writeln('Patch Memory');
/* CIF NEXTSTATE (360, 313), (70, 35) */ /* CIF NEXTSTATE (258, 265), (70, 35) */
NEXTSTATE -; NEXTSTATE -;
ENDSTATE; ENDSTATE;
ENDSUBSTRUCTURE; ENDSUBSTRUCTURE;
...@@ -50,30 +50,30 @@ signal telemetry(tm_type); ...@@ -50,30 +50,30 @@ signal telemetry(tm_type);
NEXTSTATE -; NEXTSTATE -;
ENDSTATE; ENDSTATE;
ENDSUBSTRUCTURE; ENDSUBSTRUCTURE;
STATE memory_manager; STATE mode_manager;
SUBSTRUCTURE SUBSTRUCTURE
/* CIF START (259, 60), (70, 35) */ /* CIF START (359, 108), (70, 35) */
START; START;
/* CIF NEXTSTATE (231, 110), (126, 35) */ /* CIF NEXTSTATE (331, 158), (126, 35) */
NEXTSTATE wait_for_tc; NEXTSTATE wait_for_tc;
/* CIF STATE (231, 110), (126, 35) */ /* CIF STATE (331, 158), (126, 35) */
STATE wait_for_tc; STATE wait_for_tc;
/* CIF PROVIDED (64, 165), (459, 35) */ /* CIF PROVIDED (170, 213), (451, 35) */
PROVIDED got_tc=true and present(tc!content)=patch_memory; PROVIDED got_tc=true and present(tc!content)=change_mode;
/* CIF PROCEDURECALL (178, 215), (231, 35) */ /* CIF PROCEDURECALL (282, 263), (226, 35) */
CALL writeln('Patch Memory'); CALL writeln('Change Mode');
/* CIF NEXTSTATE (258, 265), (70, 35) */ /* CIF NEXTSTATE (360, 313), (70, 35) */
NEXTSTATE -; NEXTSTATE -;
ENDSTATE; ENDSTATE;
ENDSUBSTRUCTURE; ENDSUBSTRUCTURE;
/* CIF STATE (370, 97), (182, 35) */ /* CIF STATE (314, 191), (161, 35) */
STATE memory_manager; STATE mode_manager;
ENDSTATE; ENDSTATE;
/* CIF STATE (238, 111), (113, 35) */ /* CIF STATE (238, 111), (113, 35) */
STATE tc_router; STATE tc_router;
ENDSTATE; ENDSTATE;
/* CIF STATE (314, 191), (161, 35) */ /* CIF STATE (370, 97), (182, 35) */
STATE mode_manager; STATE memory_manager;
ENDSTATE; ENDSTATE;
ENDSUBSTRUCTURE; ENDSUBSTRUCTURE;
/* CIF TEXT (0, 310), (327, 208) */ /* CIF TEXT (0, 310), (327, 208) */
...@@ -88,19 +88,22 @@ dcl got_tc Boolean_type; ...@@ -88,19 +88,22 @@ dcl got_tc Boolean_type;
dcl anything boolean_Type := true; dcl anything boolean_Type := true;
/* CIF ENDTEXT */ /* CIF ENDTEXT */
/* CIF START (337, 297), (70, 35) */ /* CIF START (351, 297), (70, 35) */
START; START;
/* CIF NEXTSTATE (337, 348), (70, 35) */ /* CIF NEXTSTATE (337, 348), (99, 35) */
NEXTSTATE wait; NEXTSTATE starting;
/* CIF STATE (412, 344), (70, 35) */ /* CIF STATE (333, 575), (70, 35) */
STATE wait; STATE wait;
/* CIF PROVIDED (394, 399), (106, 35) */ ENDSTATE;
/* CIF STATE (485, 344), (99, 35) */
STATE starting;
/* CIF PROVIDED (481, 399), (106, 35) */
PROVIDED anything; PROVIDED anything;
/* CIF TASK (363, 449), (168, 35) */ /* CIF TASK (450, 449), (168, 35) */
TASK anything := false; TASK anything := false;
/* CIF PROCEDURECALL (359, 499), (177, 35) */ /* CIF PROCEDURECALL (446, 499), (177, 35) */
CALL writeln('Lets go'); CALL writeln('Lets go');
/* CIF NEXTSTATE (412, 549), (70, 35) */ /* CIF NEXTSTATE (499, 549), (70, 35) */
NEXTSTATE wait; NEXTSTATE wait;
ENDSTATE; ENDSTATE;
ENDPROCESS og; ENDPROCESS og;
......
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