...
 
Commits (5)
......@@ -44,7 +44,7 @@ end Stream_Element_Buffer;
DATA T_UInt32
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/assert/tool-inst/share/taste-types/taste-types.asn");
Source_Text => ("~/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => ASN1;
......@@ -83,7 +83,7 @@ END T_UInt32_Buffer.impl;
DATA T_UInt8
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/assert/tool-inst/share/taste-types/taste-types.asn");
Source_Text => ("~/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => ASN1;
......@@ -122,7 +122,7 @@ END T_UInt8_Buffer.impl;
DATA T_Boolean
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/assert/tool-inst/share/taste-types/taste-types.asn");
Source_Text => ("~/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => ASN1;
......@@ -161,7 +161,7 @@ END T_Boolean_Buffer.impl;
DATA T_SEQUENCE
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/assert/tool-src/testSuites/Regression_AADLv2/Demo_ContextParams/Inputs/DataView.asn");
Source_Text => ("DataView.asn");
TASTE::Ada_Package_Name => "DataView";
Deployment::ASN1_Module_Name => "DataView";
Source_Language => ASN1;
......@@ -200,7 +200,7 @@ END T_SEQUENCE_Buffer.impl;
DATA T_Int8
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/assert/tool-inst/share/taste-types/taste-types.asn");
Source_Text => ("~/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => ASN1;
......@@ -239,7 +239,7 @@ END T_Int8_Buffer.impl;
DATA T_Int32
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/assert/tool-inst/share/taste-types/taste-types.asn");
Source_Text => ("~/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => ASN1;
......@@ -278,7 +278,7 @@ END T_Int32_Buffer.impl;
DATA T_INTEGER
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/assert/tool-src/testSuites/Regression_AADLv2/Demo_ContextParams/Inputs/DataView.asn");
Source_Text => ("DataView.asn");
TASTE::Ada_Package_Name => "DataView";
Deployment::ASN1_Module_Name => "DataView";
Source_Language => ASN1;
......
......@@ -41,12 +41,12 @@ SUBCOMPONENTS
Taste::coordinates => "1078 892 2282 1498";
Deployment::Port_Number => 0;
};
x86_linux32 : PROCESSOR ocarina_processors_x86::x86.native {
x86_native : PROCESSOR ocarina_processors_x86::x86.native {
Taste::coordinates => "927 719 2433 1584";
};
PROPERTIES
Taste::APLC_Binding => (reference (x86_partition)) APPLIES TO IV_Function1;
Actual_Processor_Binding => (reference (x86_linux32)) APPLIES TO x86_partition;
Actual_Processor_Binding => (reference (x86_native)) APPLIES TO x86_partition;
END Node1.others;
SYSTEM deploymentview
......@@ -67,3 +67,4 @@ PROPERTIES
Taste::HWLibraries => ("~/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV;
-- copied aadl libraries
......@@ -45,10 +45,10 @@ END Function1;
SYSTEM IMPLEMENTATION Function1.others
SUBCOMPONENTS
flagsToCompileWith : DATA DataView::TASTE_Directive {
Taste::FS_Default_Value => "compiler-option:""-I ~/tool-src/testSuites/Demo_ExternalLib/contrib/headers/""";
Taste::FS_Default_Value => "compiler-option:""-I $PRJ_FOLDER/contrib/headers/""";
};
flagsToLinkWith : DATA DataView::TASTE_Directive {
Taste::FS_Default_Value => "linker-option:""-L ~/tool-src/testSuites/Demo_ExternalLib/contrib/lib/ -lsomelib""";
Taste::FS_Default_Value => "linker-option:""-L $PRJ_FOLDER/contrib/lib/ -lsomelib""";
};
PI1_impl : SUBPROGRAM interfaceview::FV::Function1::PI_PI1.others {
Compute_Execution_Time => 0 ms .. 0 ms;
......
......@@ -14,6 +14,7 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created file.
# clean first to make sure it is build on the host platform
make -C contrib/ || exit 1
if [ -z "$DEPLOYMENTVIEW" ]
......@@ -46,6 +47,15 @@ then
else
OUTPUTDIR=binary
fi
# This is the env var used to specify the link folder base
# inside InterfaceView.aadl:
#
# Taste::FS_Default_Value => "linker-option:""-L $PRJ_FOLDER/contrib/lib/ -lsomelib""";
#
export PRJ_FOLDER=$(pwd)
assert-builder-ocarina.py \
--fast \
--debug \
......
#!/bin/bash
taste-update-data-view || exit 1
taste-update-data-view dataview.asn || exit 1
cd skels
rm -f pinger.zip
......
#!/bin/bash
taste-update-data-view || exit 1
taste-update-data-view TPOS_Dataview.asn || exit 0
rm -f a.zip
zip a a/*
......
......@@ -14,7 +14,7 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created "build-script.new.sh" file.
taste-update-data-view || exit 1
taste-update-data-view TPOS_Dataview.asn || exit 1
rm -f mysyncfunction.zip
zip mysyncfunction mysyncfunction/*
......
--------------------------------------------------------
--! File generated by asn2aadl v1.2055: DO NOT EDIT !
--------------------------------------------------------
package DataView
public
with Data_Model;
with Taste;
with Base_Types;
-- No more private heap required (we use the space certified compiler)
-- Memory_Required: 0
data Stream_Element_Buffer
-- Root type for buffer elements
properties
Data_Model::Data_Representation => Character;
end Stream_Element_Buffer;
DATA T_POS
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("dataview.asn");
TASTE::EncodingDefinitionFile => classifier(DataView::ACN_dataview);
TASTE::Ada_Package_Name => "MY_MODULE";
Source_Language => ASN1;
-- Size of a buffer to cover all forms of message representation:
-- Real message size is 16; suggested aligned message buffer is...
Source_Data_Size => 16 Bytes;
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-POS";
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aCHOICE;
END T_POS;
DATA T_POS_Buffer_Max
END T_POS_Buffer_Max;
DATA IMPLEMENTATION T_POS_Buffer_Max.impl
-- Buffer to hold a marshalled data of type T_POS
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Dimension => (16); -- Size of the buffer
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END T_POS_Buffer_Max.impl;
DATA T_POS_Buffer
END T_POS_Buffer;
DATA IMPLEMENTATION T_POS_Buffer.impl
-- Buffer to hold a marshalled data of type T_POS
SUBCOMPONENTS
Buffer : data T_POS_Buffer_Max.impl;
Length : data Base_Types::Unsigned_16;
PROPERTIES
Data_Model::Data_Representation => Struct;
END T_POS_Buffer.impl;
DATA ACN_dataview
PROPERTIES
Source_Text => ("dataview.acn");
Source_Language => ACN;
END ACN_dataview;
end DataView;
/*
Automatically generated ACN grammar
Date was: 12/10/2010
Time was: 15:48:48
*/
MY-MODULE DEFINITIONS ::= BEGIN
T-POS[] {
first-choice [size 4, encoding pos-int] ,
second-choice [] {
intVal [size 5, encoding twos-complement] ,
boolVal [true-value '1'B]
}
}
END
MY-MODULE DEFINITIONS AUTOMATIC TAGS ::= BEGIN
T-POS ::= CHOICE {
first-choice INTEGER (0..10),
second-choice SEQUENCE {
intVal INTEGER (-10..10),
boolVal BOOLEAN
}
}
END
PACKAGE exportedComponent::IV
PUBLIC
WITH DataView;
WITH exportedComponent::FV;
WITH Taste;
---------------------------------------------------
-- TASTE Function: exportedComponent::IV::B
---------------------------------------------------
SYSTEM B
FEATURES
Hello_obj107 : PROVIDES SUBPROGRAM ACCESS exportedComponent::FV::Hello_obj107.others
{ Taste::Coordinates => "1719 413";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::Importance => MEDIUM ;};
PROPERTIES
Source_Language => C;
Source_Text => ("b.zip");
Taste::Instance_Name => "Function1";
END B;
SYSTEM IMPLEMENTATION B.others
SUBCOMPONENTS
Hello_obj107_impl : SUBPROGRAM exportedComponent::FV::Hello_obj107.others
{ Compute_Execution_Time => 0ms..0ms ;};
CONNECTIONS
SUBPROGRAM ACCESS Hello_obj107_impl -> Hello_obj107;
END B.others;
PROPERTIES
Taste::Export_Date => "Fri Dec 10 16:15:16 EST 2010";
Taste::dataView => ("DataView");
Taste::dataViewPath => ("dataview.aadl");
END exportedComponent::IV;
PACKAGE exportedComponent::FV
PUBLIC
WITH DataView;
WITH TASTE;
SUBPROGRAM Hello_obj107
FEATURES
in_param : IN PARAMETER DataView::T_POS
{ Taste::encoding => ACN; };
PROPERTIES
Taste::Associated_Queue_Size => 1;
END Hello_obj107;
SUBPROGRAM IMPLEMENTATION Hello_obj107.others
END Hello_obj107.others;
END exportedComponent::FV;
Repository of shared components used to test the import/export mechanism of the TASTE-IV tool