Commit 4d78920e authored by assert's avatar assert
Browse files

* Merge QGen patches from ESA repository

    For issue #64
parent 6402581d
...@@ -78,7 +78,9 @@ property set AADL_Project is ...@@ -78,7 +78,9 @@ property set AADL_Project is
Simulink_6_5, Simulink_6_5,
System_C, System_C,
VHDL, VHDL,
ACN); ACN,
QGenC,
QGenAda);
Supported_Distributions: type enumeration (Fixed, Poisson); Supported_Distributions: type enumeration (Fixed, Poisson);
......
...@@ -270,6 +270,8 @@ package body Ocarina.Backends.Properties is ...@@ -270,6 +270,8 @@ package body Ocarina.Backends.Properties is
Language_Simulink_Name : Name_Id; Language_Simulink_Name : Name_Id;
Language_System_C_Name : Name_Id; Language_System_C_Name : Name_Id;
Language_VHDL_Name : Name_Id; Language_VHDL_Name : Name_Id;
Language_QGenAda_Name : Name_Id;
Language_QGenC_Name : Name_Id;
Thread_Periodic_Name : Name_Id; Thread_Periodic_Name : Name_Id;
Thread_Aperiodic_Name : Name_Id; Thread_Aperiodic_Name : Name_Id;
...@@ -1203,6 +1205,12 @@ package body Ocarina.Backends.Properties is ...@@ -1203,6 +1205,12 @@ package body Ocarina.Backends.Properties is
elsif Source_L = Language_LUA_Name then elsif Source_L = Language_LUA_Name then
return Language_Lua; return Language_Lua;
elsif Source_L = Language_QGenAda_Name then
return Language_QGenAda;
elsif Source_L = Language_QGenC_Name then
return Language_QGenC;
else else
Display_Located_Error Display_Located_Error
(AIN.Loc (E), (AIN.Loc (E),
...@@ -1385,7 +1393,7 @@ package body Ocarina.Backends.Properties is ...@@ -1385,7 +1393,7 @@ package body Ocarina.Backends.Properties is
return Subprogram_Unknown; return Subprogram_Unknown;
end if; end if;
when Language_Simulink => when Language_Simulink | Language_QGenC | Language_QGenAda =>
return Subprogram_Simulink; return Subprogram_Simulink;
when Language_Scade => when Language_Scade =>
...@@ -2898,6 +2906,8 @@ package body Ocarina.Backends.Properties is ...@@ -2898,6 +2906,8 @@ package body Ocarina.Backends.Properties is
Language_SDL_RTDS_Name := Get_String_Name ("sdl_rtds"); Language_SDL_RTDS_Name := Get_String_Name ("sdl_rtds");
Language_VHDL_Name := Get_String_Name ("vhdl"); Language_VHDL_Name := Get_String_Name ("vhdl");
Language_System_C_Name := Get_String_Name ("system_c"); Language_System_C_Name := Get_String_Name ("system_c");
Language_QGenAda_Name := Get_String_Name ("qgenada");
Language_QGenC_Name := Get_String_Name ("qgenc");
Thread_Periodic_Name := Get_String_Name ("periodic"); Thread_Periodic_Name := Get_String_Name ("periodic");
Thread_Aperiodic_Name := Get_String_Name ("aperiodic"); Thread_Aperiodic_Name := Get_String_Name ("aperiodic");
......
...@@ -75,6 +75,8 @@ package Ocarina.Backends.Properties is ...@@ -75,6 +75,8 @@ package Ocarina.Backends.Properties is
Language_Scade, Language_Scade,
Language_SDL, Language_SDL,
Language_Simulink, Language_Simulink,
Language_QGenC,
Language_QGenAda,
Language_System_C, Language_System_C,
Language_VHDL, Language_VHDL,
Language_None); Language_None);
......
...@@ -151,22 +151,22 @@ Evaluating theorem set_declaration_is_passing_through ...@@ -151,22 +151,22 @@ Evaluating theorem set_declaration_is_passing_through
* Iterate for variable: rma.erc32_node_a_task_1 * Iterate for variable: rma.erc32_node_a_task_1
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :3996 end to end flow spec anonymous end to end flow :3998 end to end flow spec
=> Result: TRUE => Result: TRUE
* Iterate for variable: rma.erc32_node_a_task_2 * Iterate for variable: rma.erc32_node_a_task_2
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :3996 end to end flow spec anonymous end to end flow :3998 end to end flow spec
=> Result: TRUE => Result: TRUE
* Iterate for variable: rma.erc32_node_a_task_12 * Iterate for variable: rma.erc32_node_a_task_12
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :3997 end to end flow spec anonymous end to end flow :3999 end to end flow spec
=> Result: TRUE => Result: TRUE
* Iterate for variable: rma.erc32_node_a_task_22 * Iterate for variable: rma.erc32_node_a_task_22
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :3997 end to end flow spec anonymous end to end flow :3999 end to end flow spec
=> Result: TRUE => Result: TRUE
theorem set_declaration_is_passing_through is: TRUE theorem set_declaration_is_passing_through is: TRUE
......
This diff is collapsed.
Markdown is supported
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