Commit de0d176e authored by yoogx's avatar yoogx

Merge branch 'master' of https://github.com/OpenAADL/ocarina into experimental

parents a47a5a75 546e3e33
......@@ -134,4 +134,6 @@ property set AADL_Project is
MBytesps => KBytesps * 1000,
GBytesps => MBytesps * 1000);
Data_Rate_Units: type units (bitsps, Bytesps => bitsps * 8, KBytesps => Bytesps * 1000, MBytesps => KBytesps * 1000, GBytesps => MBytesps * 1000);
end AADL_Project;
......@@ -17,6 +17,8 @@ property set Communication_Properties is
src: list of aadlinteger;
dst: list of aadlinteger;);
Data_Rate : aadlinteger units Data_Rate_Units applies to (feature);
Overflow_Handling_Protocol: enumeration (DropOldest, DropNewest, Error) => DropOldest
applies to (event port, event data port, subprogram access);
......@@ -55,7 +57,6 @@ property set Communication_Properties is
Output_Time: list of IO_Time_Spec => ([ Time => Completion; Offset => 0 ns .. 0 ns; ])
applies to (port);
Rate_Spec: type record (
Value_Range: range of aadlreal;
Rate_Unit: enumeration (PerSecond, PerDispatch);
......@@ -75,4 +76,4 @@ property set Communication_Properties is
Latency: Time_Range
applies to (flow, connection, bus, processor, device, port);
end Communication_Properties;
\ No newline at end of file
end Communication_Properties;
......@@ -172,7 +172,7 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
return No_Name;
end if;
if Fully_Qualified then
if Fully_Qualified and then AADL_Version = AADL_V2 then
Package_Name :=
Display_Name (Identifier (Namespace (Entity)));
......
communication_properties.aadl:20:28: (unique property type identifier) does not point to anything
Cannot analyze AADL specifications
package S
public
bus BusType_1
end BusType_1;
bus implementation BusType_1.impl
end BusType_1.impl;
processor PC
features
pp_1 : requires bus access BusType_1;
end PC;
processor implementation PC.impl
end PC.impl;
system S
features
bustype_1_1 : requires bus access BusType_1;
end S;
system implementation S.impl
subcomponents
pc_part : processor PC.impl;
connections
bustype_1_1_1_connection : bus access pc_part.pp_1 -> bustype_1_1;
end S.impl;
end S;
package Test
public
system t1
features
rba : requires bus access b1.i1;
end t1;
bus b1
end b1;
bus implementation b1.i1
end b1.i1;
system s
end s;
system implementation s.impl
subcomponents
part1 : system t1;
bus1 : bus b1;
connections
c1 : bus access part1.rba -> bus1;
end s.impl;
end Test;
......@@ -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 :3964 end to end flow spec
anonymous end to end flow :3996 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 :3964 end to end flow spec
anonymous end to end flow :3996 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 :3965 end to end flow spec
anonymous end to end flow :3997 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 :3965 end to end flow spec
anonymous end to end flow :3997 end to end flow spec
=> Result: 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