Commit 9ea55cbe authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Cleanup templates for Makefiles

parent 862e8a6d
...@@ -80,6 +80,12 @@ This template is evaluated only once. The output is saved to the Makefile within ...@@ -80,6 +80,12 @@ This template is evaluated only once. The output is saved to the Makefile within
|- |-
|Glue |Glue
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|-
|CPU_Platform
|DOCUMENTATION MISSING
|-
|Is_FPGA
|DOCUMENTATION MISSING
|} |}
=== templates/skeletons/context-parameters.tmplt === === templates/skeletons/context-parameters.tmplt ===
This template is evaluated for every function which has context parameters. The output is saved to the file Context-<function name>.asn This template is evaluated for every function which has context parameters. The output is saved to the file Context-<function name>.asn
...@@ -1462,6 +1468,15 @@ This file is evaluated for every node. The result of this file is saved to the f ...@@ -1462,6 +1468,15 @@ This file is evaluated for every node. The result of this file is saved to the f
|- |-
|Glue |Glue
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|-
|Block_Instance_Of
|DOCUMENTATION MISSING
|-
|Block_Languages
|DOCUMENTATION MISSING
|-
|Block_Names
|DOCUMENTATION MISSING
|} |}
=== templates/concurrency_view/sub/system.tmplt === === templates/concurrency_view/sub/system.tmplt ===
This file is evaluated for every node. The result of this file is save to the file with name returned by This file is evaluated for every node. The result of this file is save to the file with name returned by
......
...@@ -151,3 +151,5 @@ to the file with name returned by filesys.tmplt. ...@@ -151,3 +151,5 @@ to the file with name returned by filesys.tmplt.
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Block_Languages | DOCUMENTATION MISSING | | Block_Languages | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Node_Platform | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+
...@@ -1492,7 +1492,10 @@ filesys.tmplt. ...@@ -1492,7 +1492,10 @@ filesys.tmplt.
|Vector Tag of node names |Vector Tag of node names
|- |-
|Node_CPU |Node_CPU
| -> Corresponding CPU name (eg x86_linux) | &#8627; Corresponding CPU name (e.g. x86_linux)
|-
|Node_Platform
| &#8627; Corresponding platform (e.g. PLATFORM_AIR)
|- |-
|Node_CPU_Classifier |Node_CPU_Classifier
| &#8627; Corresponding CPU Classifier (ocarina...::x86_linux) | &#8627; Corresponding CPU Classifier (ocarina...::x86_linux)
...@@ -1663,4 +1666,4 @@ filesys.tmplt. ...@@ -1663,4 +1666,4 @@ filesys.tmplt.
|- |-
|Block_Languages |Block_Languages
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|} |}
\ No newline at end of file
...@@ -661,6 +661,7 @@ package body TASTE.Concurrency_View is ...@@ -661,6 +661,7 @@ package body TASTE.Concurrency_View is
Set_Sys : Translate_Set; Set_Sys : Translate_Set;
Node_Names, -- List of nodes Node_Names, -- List of nodes
Node_CPU, -- Corresponding CPU name Node_CPU, -- Corresponding CPU name
Node_Platform, -- Corresponding CPU Platform
Node_CPU_Cls, -- Corresponding CPU classifier Node_CPU_Cls, -- Corresponding CPU classifier
Node_Major_Frame, -- Corresponding time frame (TSP) Node_Major_Frame, -- Corresponding time frame (TSP)
Node_Has_Memory : Vector_Tag; -- Corresponding memory flag (TSP) Node_Has_Memory : Vector_Tag; -- Corresponding memory flag (TSP)
...@@ -786,6 +787,8 @@ package body TASTE.Concurrency_View is ...@@ -786,6 +787,8 @@ package body TASTE.Concurrency_View is
Node_Names := Node_Names & Node_Name; Node_Names := Node_Names & Node_Name;
Node_CPU := Node_CPU Node_CPU := Node_CPU
& CV.Nodes (Node_Name).Deployment_Node.CPU_Name; & CV.Nodes (Node_Name).Deployment_Node.CPU_Name;
Node_Platform := Node_Platform
& CV.Nodes (Node_Name).Deployment_Node.CPU_Platform'Img;
Node_CPU_Cls := Node_CPU_Cls Node_CPU_Cls := Node_CPU_Cls
& CV.Nodes (Node_Name).Deployment_Node.CPU_Classifier; & CV.Nodes (Node_Name).Deployment_Node.CPU_Classifier;
Node_Has_Memory := Node_Has_Memory Node_Has_Memory := Node_Has_Memory
...@@ -886,6 +889,7 @@ package body TASTE.Concurrency_View is ...@@ -886,6 +889,7 @@ package body TASTE.Concurrency_View is
& Assoc ("Nodes", Nodes) & Assoc ("Nodes", Nodes)
& Assoc ("Node_Names", Node_Names) & Assoc ("Node_Names", Node_Names)
& Assoc ("Node_CPU", Node_CPU) & Assoc ("Node_CPU", Node_CPU)
& Assoc ("Node_Platform", Node_Platform)
& Assoc ("Node_CPU_Classifier", Node_CPU_Cls) & Assoc ("Node_CPU_Classifier", Node_CPU_Cls)
& Assoc ("Node_Major_Frame", Node_Major_Frame) & Assoc ("Node_Major_Frame", Node_Major_Frame)
& Assoc ("Node_Has_Memory", Node_Has_Memory) & Assoc ("Node_Has_Memory", Node_Has_Memory)
......
...@@ -6,13 +6,33 @@ ...@@ -6,13 +6,33 @@
# Build of node @_Node_Name_@ for @_CPU_Platform_@ # Build of node @_Node_Name_@ for @_CPU_Platform_@
# (rule generated by templates/concurrency_view/aadl_4_makefile/node.tmplt) # (rule generated by templates/concurrency_view/aadl_4_makefile/node.tmplt)
@@IF@@ @_CPU_Platform_@ = PLATFORM_LEON_RTEMS_POSIX @@IF@@ @_CPU_Platform_@ = PLATFORM_LEON_RTEMS_POSIX
@@INLINE@@ @@INLINE@@
@_LOWER:Node_Name_@_@_CPU_Name_@: @_LOWER:Node_Name_@_@_CPU_Name_@:
@@TABLE@@ @@TABLE@@
@_Partition_Names_@_rtems_ada @_Partition_Names_@_rtems_ada
@@END_TABLE@@ @@END_TABLE@@
DriversConfig/drivers_config.h DriversConfig/drivers_config.h
@@END_INLINE@@ @@END_INLINE@@
@@ELSIF@@ @_CPU_Platform_@ = PLATFORM_AIR
@@INLINE@@
@_LOWER:Node_Name_@_@_CPU_Name_@:
@@TABLE@@
@_LOWER:Partition_Names_@_rtems_ada
@@END_TABLE@@
@@END_INLINE@@
# generate the xml file for AIR and call AIR's configure script
ocarina -aadlv2 -v -disable-annexes=emv2 -g air_configuration \
-r deploymentview.final system.aadl deployment.aadl \
Cheddar_Properties.aadl arinc653.aadl data_model.aadl \
TASTE_IV_Properties.aadl TASTE_DV_Properties.aadl \
taste_properties.aadl base_types.aadl \
../dataview/dataview_aadlv2.aadl ../../InterfaceView.aadl ../../DeploymentView.aadl \
../../../common/ocarina_components.aadl && \
cd deploymentview_final && rm -f Makefile && (configure --keep-files-silent)
@echo "XML generated, AIR configuration done, building..."
$(MAKE) -j -C @_Node_Name_@ -f Makefile.@_Node_Name_@
@echo Putting partitions alltogether
$(MAKE) -j -f Makefile.air && mkdir -p ../binaries && cp deploymentview_final/executable/* ../binaries
@@ELSE@@ @@ELSE@@
@_LOWER:Node_Name_@_@_CPU_Name_@: @_LOWER:REPLACE_ALL(,/):Partition_Names_@ DriversConfig/drivers_config.h @_LOWER:Node_Name_@_@_CPU_Name_@: @_LOWER:REPLACE_ALL(,/):Partition_Names_@ DriversConfig/drivers_config.h
@@END_IF@@ @@END_IF@@
...@@ -24,22 +44,4 @@ ...@@ -24,22 +44,4 @@
$(MAKE) -j -C @_Node_Name_@ -f Makefile.@_Node_Name_@ simulate $(MAKE) -j -C @_Node_Name_@ -f Makefile.@_Node_Name_@ simulate
@@END_IF@@ @@END_IF@@
# Force build of node @_Node_Name_@ for RTEMS
# (rule generated by templates/concurrency_view/aadl_4_makefile/node.tmplt)
@@INLINE@@
@_LOWER:Node_Name_@_rtems_ada:
@@TABLE@@
@_LOWER:Partition_Names_@_rtems_ada
@@END_TABLE@@
@@END_INLINE@@
# Force build of node @_Node_Name_@ for AIR
# (rule generated by templates/concurrency_view/aadl_4_makefile/node.tmplt)
@@INLINE@@
@_LOWER:Node_Name_@_air:
@@TABLE@@
@_LOWER:Partition_Names_@_rtems_ada
@@END_TABLE@@
@@END_INLINE@@
@_Partitions_@ @_Partitions_@
...@@ -18,38 +18,6 @@ simu: ...@@ -18,38 +18,6 @@ simu:
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
@@INLINE()( )()@@
rtems_ada:
@@TABLE@@
@_LOWER:Node_Names_@_rtems_ada
@@END_TABLE@@
@@END_INLINE@@
@@TABLE@@
$(MAKE) -j -C @_Node_Names_@ -f Makefile.@_Node_Names_@ debug_rtems_leon3_with_ada
@@END_TABLE@@
@@INLINE()( )()@@
air:
@@TABLE@@
@_LOWER:Node_Names_@_air
@@END_TABLE@@
@@END_INLINE@@
@@TABLE@@
# generate the xml file for AIR and call AIR's configure script
ocarina -aadlv2 -v -disable-annexes=emv2 -g air_configuration \
-r deploymentview.final system.aadl deployment.aadl \
Cheddar_Properties.aadl arinc653.aadl data_model.aadl \
TASTE_IV_Properties.aadl TASTE_DV_Properties.aadl \
taste_properties.aadl base_types.aadl \
../dataview/dataview_aadlv2.aadl ../../InterfaceView.aadl ../../DeploymentView.aadl \
../../../common/ocarina_components.aadl && \
cd deploymentview_final && rm -f Makefile && (configure --keep-files-silent)
@echo "XML generated, AIR configuration done, building..."
$(MAKE) -j -C @_Node_Names_@ -f Makefile.@_Node_Names_@ air
@echo Putting partitions alltogether
$(MAKE) -j -f Makefile.air && mkdir -p ../binaries && cp deploymentview_final/executable/* ../binaries
@@END_TABLE@@
@@-- If there are busses, there are drivers, and therefore asn1 configurations @@-- If there are busses, there are drivers, and therefore asn1 configurations
@@IF@@ @_Bus_Names'Length_@ > 0 @@IF@@ @_Bus_Names'Length_@ > 0
DriversConfig/drivers_config.h: drivers_config.asn DriversConfig/drivers_config.h: drivers_config.asn
......
...@@ -83,14 +83,6 @@ ${DATAVIEW_PATH}/built: dataview ...@@ -83,14 +83,6 @@ ${DATAVIEW_PATH}/built: dataview
build-default: aadl2glueC build/system_config.h ${DATAVIEW_PATH}/built build/deploymentview_final/Makefile build-default: aadl2glueC build/system_config.h ${DATAVIEW_PATH}/built build/deploymentview_final/Makefile
$(MAKE) -j -C build -f Makefile.taste $(MAKE) -j -C build -f Makefile.taste
# Force build with RTEMS/Leon, even if deployment view does not specify it
build-rtems-ada: aadl2glueC build/system_config.h ${DATAVIEW_PATH}/built build/deploymentview_final/Makefile
$(MAKE) -j -C build -f Makefile.taste rtems_ada
# Force build with AIR (TSP), even if deployment view does not specify it
air: aadl2glueC build/system_config.h ${DATAVIEW_PATH}/built build/deploymentview_final/Makefile
$(MAKE) -j -C build -f Makefile.taste air
# Rule to invoke Ocarina (generation of POHI middleware code) # Rule to invoke Ocarina (generation of POHI middleware code)
build/deploymentview_final/Makefile: build/main.aadl ${DATAVIEW_AADLV2} ../ConcurrencyView_Properties.aadl build/deploymentview_final/Makefile: build/main.aadl ${DATAVIEW_AADLV2} ../ConcurrencyView_Properties.aadl
cd build ; ocarina -x main.aadl cd build ; ocarina -x main.aadl
......
...@@ -67,6 +67,8 @@ T-UInt8 ::= INTEGER (0 .. 255) ...@@ -67,6 +67,8 @@ T-UInt8 ::= INTEGER (0 .. 255)
T-Boolean ::= BOOLEAN T-Boolean ::= BOOLEAN
T-Null-Record ::= SEQUENCE {}
END END
...@@ -67,6 +67,8 @@ T-UInt8 ::= INTEGER (0 .. 255) ...@@ -67,6 +67,8 @@ T-UInt8 ::= INTEGER (0 .. 255)
T-Boolean ::= BOOLEAN T-Boolean ::= BOOLEAN
T-Null-Record ::= SEQUENCE {}
END END
Supports Markdown
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