Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
4d78920e
Commit
4d78920e
authored
Apr 21, 2016
by
assert
Browse files
* Merge QGen patches from ESA repository
For issue #64
parent
6402581d
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
resources/AADLv2/aadl_project.aadl
View file @
4d78920e
...
...
@@ -78,7 +78,9 @@ property set AADL_Project is
Simulink_6_5,
System_C,
VHDL,
ACN);
ACN,
QGenC,
QGenAda);
Supported_Distributions: type enumeration (Fixed, Poisson);
...
...
src/backends/ocarina-backends-properties.adb
View file @
4d78920e
...
...
@@ -270,6 +270,8 @@ package body Ocarina.Backends.Properties is
Language_Simulink_Name
:
Name_Id
;
Language_System_C_Name
:
Name_Id
;
Language_VHDL_Name
:
Name_Id
;
Language_QGenAda_Name
:
Name_Id
;
Language_QGenC_Name
:
Name_Id
;
Thread_Periodic_Name
:
Name_Id
;
Thread_Aperiodic_Name
:
Name_Id
;
...
...
@@ -1203,6 +1205,12 @@ package body Ocarina.Backends.Properties is
elsif
Source_L
=
Language_LUA_Name
then
return
Language_Lua
;
elsif
Source_L
=
Language_QGenAda_Name
then
return
Language_QGenAda
;
elsif
Source_L
=
Language_QGenC_Name
then
return
Language_QGenC
;
else
Display_Located_Error
(
AIN
.
Loc
(
E
),
...
...
@@ -1385,7 +1393,7 @@ package body Ocarina.Backends.Properties is
return
Subprogram_Unknown
;
end
if
;
when
Language_Simulink
=>
when
Language_Simulink
|
Language_QGenC
|
Language_QGenAda
=>
return
Subprogram_Simulink
;
when
Language_Scade
=>
...
...
@@ -2898,6 +2906,8 @@ package body Ocarina.Backends.Properties is
Language_SDL_RTDS_Name
:=
Get_String_Name
(
"sdl_rtds"
);
Language_VHDL_Name
:=
Get_String_Name
(
"vhdl"
);
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_Aperiodic_Name
:=
Get_String_Name
(
"aperiodic"
);
...
...
src/backends/ocarina-backends-properties.ads
View file @
4d78920e
...
...
@@ -75,6 +75,8 @@ package Ocarina.Backends.Properties is
Language_Scade
,
Language_SDL
,
Language_Simulink
,
Language_QGenC
,
Language_QGenAda
,
Language_System_C
,
Language_VHDL
,
Language_None
);
...
...
tests/real-annexes-execution/test_real_exec_02.aadl.out
View file @
4d78920e
...
...
@@ -151,22 +151,22 @@ Evaluating theorem set_declaration_is_passing_through
* Iterate for variable: rma.erc32_node_a_task_1
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :399
6
end to end flow spec
anonymous end to end flow :399
8
end to end flow spec
=> Result: TRUE
* Iterate for variable: rma.erc32_node_a_task_2
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :399
6
end to end flow spec
anonymous end to end flow :399
8
end to end flow spec
=> Result: TRUE
* Iterate for variable: rma.erc32_node_a_task_12
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :399
7
end to end flow spec
anonymous end to end flow :399
9
end to end flow spec
=> Result: TRUE
* Iterate for variable: rma.erc32_node_a_task_22
Content of set accessor_flows (test_real_exec_02.aadl:251:21) is
anonymous end to end flow :399
7
end to end flow spec
anonymous end to end flow :399
9
end to end flow spec
=> Result: TRUE
theorem set_declaration_is_passing_through is: TRUE
...
...
tests/test_tree_p2/test.aadl.out
View file @
4d78920e
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment