* Add new properties: GNAT_Runtime target and Ada_Runtime target,

	 to configure GNAT Runtimes

	For ticket #93

resources/AADLv2/components/processors/arm.aadl

@@ -8,6 +8,19 @@ with Cheddar_Properties;
 processor arm
 end arm;
 
+processor cortex_m extends arm
+properties
+   Deployment::Execution_Platform => GNAT_Runtime;
+end cortex_m;
+
+processor implementation cortex_m.i
+properties
+   Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
+   Priority_Range => 0 .. 255;
+   Cheddar_Properties::Scheduler_Quantum => 0 Ms;
+   Cheddar_Properties::Preemptive_Scheduler => true;
+end cortex_m.i;
+
 processor nds extends arm
 end nds;
 

resources/deployment.aadl

@@ -22,6 +22,7 @@ property set Deployment is
    (Native,                   -- Native platforms (GNU/Linux, Solaris, Windows...)
     Native_Compcert,          -- Native platforms using the Compcert compiler
     bench,                    -- Benchmark platform (native with instrumentation).
+    GNAT_Runtime,             -- Use a GNAT Runtime, e.g. from the Ada_Drivers_Library
     LEON_RTEMS,               -- LEON2 board or tsim-leon (RTEMS)
     LEON_RTEMS_POSIX,         -- LEON2 board or tsim-leon (RTEMS)
     LEON3_SCOC3,              -- LEON3 with RTEMS for SCOC3
@@ -52,6 +53,8 @@ property set Deployment is
     applies to (all);
   --  Execution platform of a processor
 
+  Ada_Runtime : aadlstring applies to (processor);
+
   Supported_Execution_Platform : list of Deployment::Allowed_Execution_Platform
     applies to (device);
   --  List execution platforms supported by a particular driver

tests/real-annexes-parsing/test_real_parse_01.aadl.out

@@ -78,11 +78,14 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
 
+  Ada_Runtime : aadlstring
+    applies to (processor);
+
   Supported_Execution_Platform : list of Deployment::Allowed_Execution_Platform
     applies to (device);
 
@@ -400,8 +403,8 @@ virtual processor)
 end POK;
 
 package Base_Types
-public
-  with data_model;
+
+public  with data_model;
 
   data Boolean
   properties
@@ -958,8 +961,8 @@ subprogram)
 end Replication_Properties;
 
 package RMAAadl
-public
-  with Deployment;
+
+public  with Deployment;
 
   subprogram Hello_Spg_1
   properties

tests/real-annexes-parsing/test_real_parse_02.aadl.out

@@ -78,11 +78,14 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
 
+  Ada_Runtime : aadlstring
+    applies to (processor);
+
   Supported_Execution_Platform : list of Deployment::Allowed_Execution_Platform
     applies to (device);
 
@@ -400,8 +403,8 @@ virtual processor)
 end POK;
 
 package Base_Types
-public
-  with data_model;
+
+public  with data_model;
 
   data Boolean
   properties
@@ -958,8 +961,8 @@ subprogram)
 end Replication_Properties;
 
 package RMAAadl
-public
-  with Deployment;
+
+public  with Deployment;
 
   subprogram Hello_Spg_1
   properties

tests/real-annexes-parsing/test_real_parse_03.aadl.out

@@ -78,11 +78,14 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
 
+  Ada_Runtime : aadlstring
+    applies to (processor);
+
   Supported_Execution_Platform : list of Deployment::Allowed_Execution_Platform
     applies to (device);
 
@@ -400,8 +403,8 @@ virtual processor)
 end POK;
 
 package Base_Types
-public
-  with data_model;
+
+public  with data_model;
 
   data Boolean
   properties
@@ -958,8 +961,8 @@ subprogram)
 end Replication_Properties;
 
 package RMAAadl
-public
-  with Deployment;
+
+public  with Deployment;
 
   subprogram Hello_Spg_1
   properties

tests/real-annexes-parsing/test_real_parse_04.aadl.out

@@ -78,11 +78,14 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
 
+  Ada_Runtime : aadlstring
+    applies to (processor);
+
   Supported_Execution_Platform : list of Deployment::Allowed_Execution_Platform
     applies to (device);
 
@@ -400,8 +403,8 @@ virtual processor)
 end POK;
 
 package Base_Types
-public
-  with data_model;
+
+public  with data_model;
 
   data Boolean
   properties
@@ -958,8 +961,8 @@ subprogram)
 end Replication_Properties;
 
 package RMAAadl
-public
-  with Deployment;
+
+public  with Deployment;
 
   subprogram Hello_Spg_1
   properties

tests/real-annexes-parsing/test_real_parse_05.aadl.out

@@ -78,11 +78,14 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
 
+  Ada_Runtime : aadlstring
+    applies to (processor);
+
   Supported_Execution_Platform : list of Deployment::Allowed_Execution_Platform
     applies to (device);
 
@@ -400,8 +403,8 @@ virtual processor)
 end POK;
 
 package Base_Types
-public
-  with data_model;
+
+public  with data_model;
 
   data Boolean
   properties
@@ -958,8 +961,8 @@ subprogram)
 end Replication_Properties;
 
 package RMAAadl
-public
-  with Deployment;
+
+public  with Deployment;
 
   subprogram Hello_Spg_1
   properties

tests/test042/test.aadl.out

@@ -74,11 +74,14 @@ property set Deployment is
   Protocol : Deployment::Protocol_Type
     applies to (system);
 
-  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
+  Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_ORK, LEON_GNAT, LINUX32, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, ARM_DSLINUX, ARM_N770, GUMSTIX_RTEMS, NDS_RTEMS, X86_RTEMS, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS);
 
   Execution_Platform : Deployment::Allowed_Execution_Platform
     applies to ( all);
 
+  Ada_Runtime : aadlstring
+    applies to (processor);
+
   Supported_Execution_Platform : list of Deployment::Allowed_Execution_Platform
     applies to (device);
 
@@ -396,8 +399,8 @@ virtual processor)
 end POK;
 
 package Base_Types
-public
-  with data_model;
+
+public  with data_model;
 
   data Boolean
   properties
@@ -954,8 +957,8 @@ subprogram)
 end Replication_Properties;
 
 package PartitionedSystemExample
-public
-  with ARINC653;
+
+public  with ARINC653;
 
   data integer
   end integer;