Commit 78bbc4a4 authored by yoogx's avatar yoogx

* Update reference output

parent 9c3eb6a6
AADL_VERSION=-aadlv2 data_model.aadl base_types.aadl
\ No newline at end of file
AADL_VERSION=-aadlv2 -y
\ No newline at end of file
......@@ -6,169 +6,6 @@
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
Code_Set : aadlinteger
applies to (data);
Data_Digits : aadlinteger
applies to (data);
Data_Scale : aadlinteger
applies to (data);
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
Measurement_Unit : aadlstring
applies to (data, port, parameter);
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
Real_Range : range of aadlreal
applies to (data, port, parameter);
Representation : list of aadlstring
applies to (data);
end Data_Model;
package Base_Types
public
with data_model;
data Boolean
properties
Data_Model::Data_Representation => Boolean;
end Boolean;
data Integer
properties
Data_Model::Data_Representation => Integer;
end Integer;
data Integer_8 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 1 Bytes;
end Integer_8;
data Integer_16 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 2 Bytes;
end Integer_16;
data Integer_32 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 4 Bytes;
end Integer_32;
data Integer_64 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 8 Bytes;
end Integer_64;
data Unsigned_8 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 1 Bytes;
end Unsigned_8;
data Unsigned_16 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 2 Bytes;
end Unsigned_16;
data Unsigned_32 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 4 Bytes;
end Unsigned_32;
data Unsigned_64 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 8 Bytes;
end Unsigned_64;
data Natural extends Integer
properties
Data_Model::Integer_Range => 0 .. Max_Target_Integer;
end Natural;
data Float
properties
Data_Model::Data_Representation => Float;
end Float;
data Float_32 extends Float
properties
Data_Model::IEEE754_Precision => Simple;
Source_Data_Size => 4 Bytes;
end Float_32;
data Float_64 extends Float
properties
Data_Model::IEEE754_Precision => Double;
Source_Data_Size => 8 Bytes;
end Float_64;
data Character
properties
Data_Model::Data_Representation => Character;
end Character;
data String
properties
Data_Model::Data_Representation => String;
end String;
end Base_Types;
package Test
public
data number
......
......@@ -6,56 +6,34 @@
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
Code_Set : aadlinteger
applies to (data);
Data_Digits : aadlinteger
applies to (data);
Data_Scale : aadlinteger
applies to (data);
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
package Test
public
with Base_types;
Measurement_Unit : aadlstring
applies to (data, port, parameter);
thread speed
features
tick : in event port
{Dequeue_Protocol => AllItems;};
sp : out data port Base_types::integer;
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
properties
Dispatch_Protocol => periodic;
Period => 1000 Ms;
Real_Range : range of aadlreal
applies to (data, port, parameter);
end speed;
Representation : list of aadlstring
applies to (data);
thread implementation speed.i
annex behavior_specification {**
states
s0 : initial complete state;
transitions
s0 -[]-> s0 {
sp := tick'count
};
**};
end speed.i;
end Data_Model;
end Test;
package Base_Types
public
......@@ -169,32 +147,54 @@ public
end Base_Types;
package Test
public
with Base_types;
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
thread speed
features
tick : in event port
{Dequeue_Protocol => AllItems;};
sp : out data port Base_types::integer;
Code_Set : aadlinteger
applies to (data);
properties
Dispatch_Protocol => periodic;
Period => 1000 Ms;
Data_Digits : aadlinteger
applies to (data);
end speed;
Data_Scale : aadlinteger
applies to (data);
thread implementation speed.i
annex behavior_specification {**
states
s0 : initial complete state;
transitions
s0 -[]-> s0 {
sp := tick'count
};
**};
end speed.i;
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
end Test;
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
Measurement_Unit : aadlstring
applies to (data, port, parameter);
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
Real_Range : range of aadlreal
applies to (data, port, parameter);
Representation : list of aadlstring
applies to (data);
end Data_Model;
......@@ -6,56 +6,90 @@
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
Code_Set : aadlinteger
applies to (data);
Data_Digits : aadlinteger
applies to (data);
Data_Scale : aadlinteger
applies to (data);
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
package Test
public
with Base_types, Data_Model;
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
thread sender
features
d : out event data port Base_Types::Integer;
a : in event data port Base_Types::Integer;
Initial_Value : list of aadlstring
applies to (data, port, parameter);
properties
Dispatch_Protocol => Timed;
Period => 10 Ms;
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
end sender;
Measurement_Unit : aadlstring
applies to (data, port, parameter);
thread implementation sender.v1
subcomponents
v : data Base_Types::Integer;
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
v := 1;
d!(v)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
v := 0;
d!(v)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v1;
Real_Range : range of aadlreal
applies to (data, port, parameter);
thread implementation sender.v2
annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v2;
Representation : list of aadlstring
applies to (data);
thread implementation sender.v3
annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a(1)]-> sf;
st -[on dispatch a(others)]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a(0)]-> st;
sf -[on dispatch a(others)]-> sf;
**};
end sender.v3;
end Data_Model;
end Test;
package Base_Types
public
......@@ -169,88 +203,54 @@ public
end Base_Types;
package Test
public
with Base_types, Data_Model;
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
thread sender
features
d : out event data port Base_Types::Integer;
a : in event data port Base_Types::Integer;
Code_Set : aadlinteger
applies to (data);
properties
Dispatch_Protocol => Timed;
Period => 10 Ms;
Data_Digits : aadlinteger
applies to (data);
end sender;
Data_Scale : aadlinteger
applies to (data);
thread implementation sender.v1
subcomponents
v : data Base_Types::Integer;
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
v := 1;
d!(v)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
v := 0;
d!(v)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v1;
Dimension : list of aadlinteger
applies to (data);
thread implementation sender.v2
annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v2;
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
thread implementation sender.v3
annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a(1)]-> sf;
st -[on dispatch a(others)]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a(0)]-> st;
sf -[on dispatch a(others)]-> sf;
**};
end sender.v3;
Enumerators : list of aadlstring
applies to (data);
end Test;
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
Measurement_Unit : aadlstring
applies to (data, port, parameter);
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
Real_Range : range of aadlreal
applies to (data, port, parameter);
Representation : list of aadlstring
applies to (data);
end Data_Model;
......@@ -6,56 +6,37 @@
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
Code_Set : aadlinteger
applies to (data);
Data_Digits : aadlinteger
applies to (data);
Data_Scale : aadlinteger
applies to (data);
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
Measurement_Unit : aadlstring
applies to (data, port, parameter);
package Test
public
with Base_Types;
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
subprogram addition
features
x : in parameter Base_types::integer;
y : in parameter Base_types::integer;
r : out parameter Base_types::integer;
ovf : out parameter Base_types::boolean;
Real_Range : range of aadlreal
applies to (data, port, parameter);
end addition;
Representation : list of aadlstring
applies to (data);
subprogram implementation addition.default
annex behavior_specification {**
states
s0 : initial state;
s1 : final state;
transitions
regular : s0 -[]-> s1 {
r := x + y;
ovf := false
};
overflow : s0 -[]-> s1 {
r := 0;
ovf := true
};
**};
end addition.default;
end Data_Model;
end Test;
package Base_Types
public
......@@ -169,35 +150,54 @@ public
end Base_Types;
package Test
public
with Base_Types;
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
subprogram addition
features
x : in parameter Base_types::integer;
y : in parameter Base_types::integer;
r : out parameter Base_types::integer;
ovf : out parameter Base_types::boolean;
Code_Set : aadlinteger
applies to (data);
end addition;
Data_Digits : aadlinteger
applies to (data);
subprogram implementation addition.default
annex behavior_specification {**
states
s0 : initial state;