Commit 71e29209 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files
parents 89ae492c 1c195e70
......@@ -31,11 +31,10 @@ property set Deployment is
LEON3_XM3, -- RTEMS for XTRATUM/LEON3
LEON_GNAT, -- LEON2 board or qemu (GNATPRO/HI-E)
LINUX32, -- Linux 32 bits
LINUX32_DLL, -- Linux 32 bits/Dynamic Library
LINUX_DLL, -- Linux Dynamic Library
LINUX32_XENOMAI_NATIVE, -- Linux 32 bits with native Xenomai
LINUX32_XENOMAI_POSIX, -- Linux 32 bits with Xenomai and POSIX skin
LINUX64, -- Linux 64 bits
LINUX64_DLL, -- Linux 64 bits/Dynamic Library
ERC32_ORK, -- ERC32 board or tsim-erc32 (ORK)
X86_RTEMS_POSIX, -- x86 under RTEMS with POSIX layer
X86_LINUXTASTE, -- TASTE-specific linux distribution
......
......@@ -315,12 +315,11 @@ package body Ocarina.Backends.Properties is
Platform_Bench_Name : Name_Id;
Platform_Native_Compcert_Name : Name_Id;
Platform_LINUX32_Name : Name_Id;
Platform_LINUX32_DLL_Name : Name_Id;
Platform_Linux_DLL_Name : Name_Id;
Platform_Win32_Name : Name_Id;
Platform_LINUX32_Xenomai_Native_Name : Name_Id;
Platform_LINUX32_Xenomai_Posix_Name : Name_Id;
Platform_LINUX64_Name : Name_Id;
Platform_LINUX64_DLL_Name : Name_Id;
Platform_LEON_RTEMS_Name : Name_Id;
Platform_LEON_RTEMS_POSIX_Name : Name_Id;
Platform_X86_LINUXTASTE_Name : Name_Id;
......@@ -2457,8 +2456,8 @@ package body Ocarina.Backends.Properties is
return Platform_X86_LINUXTASTE;
elsif P_Name = Platform_LINUX32_Name then
return Platform_LINUX32;
elsif P_Name = Platform_LINUX32_DLL_Name then
return Platform_LINUX32_DLL;
elsif P_Name = Platform_LINUX_DLL_Name then
return Platform_LINUX_DLL;
elsif P_Name = Platform_Win32_Name then
return Platform_WIN32;
elsif P_Name = Platform_LINUX32_Xenomai_Native_Name then
......@@ -2467,8 +2466,6 @@ package body Ocarina.Backends.Properties is
return Platform_LINUX32_XENOMAI_POSIX;
elsif P_Name = Platform_LINUX64_Name then
return Platform_LINUX64;
elsif P_Name = Platform_LINUX64_DLL_Name then
return Platform_LINUX64_DLL;
elsif P_Name = Platform_LEON_GNAT_Name then
return Platform_LEON_GNAT;
elsif P_Name = Platform_LEON_ORK_Name then
......@@ -3035,14 +3032,13 @@ package body Ocarina.Backends.Properties is
Platform_Bench_Name := Get_String_Name ("bench");
Platform_Native_Compcert_Name := Get_String_Name ("native_compcert");
Platform_LINUX32_Name := Get_String_Name ("linux32");
Platform_LINUX32_DLL_Name := Get_String_Name ("linux32_dll");
Platform_LINUX_DLL_Name := Get_String_Name ("linux_dll");
Platform_Win32_Name := Get_String_Name ("win32");
Platform_LINUX32_Xenomai_Native_Name :=
Get_String_Name ("linux32_xenomai_native");
Platform_LINUX32_Xenomai_Posix_Name :=
Get_String_Name ("linux32_xenomai_posix");
Platform_LINUX64_Name := Get_String_Name ("linux64");
Platform_LINUX64_DLL_Name := Get_String_Name ("linux64_dll");
Platform_X86_LINUXTASTE_Name := Get_String_Name ("x86_linuxtaste");
Platform_LEON_RTEMS_Name := Get_String_Name ("leon_rtems");
Platform_LEON_RTEMS_POSIX_Name := Get_String_Name ("leon_rtems_posix");
......
......@@ -555,11 +555,10 @@ package Ocarina.Backends.Properties is
Platform_LEON_ORK,
Platform_WIN32,
Platform_LINUX32,
Platform_LINUX32_DLL,
Platform_LINUX_DLL,
Platform_LINUX32_XENOMAI_NATIVE,
Platform_LINUX32_XENOMAI_POSIX,
Platform_LINUX64,
Platform_LINUX64_DLL,
Platform_ERC32_ORK,
Platform_MARTE_OS,
Platform_VxWorks,
......
......@@ -216,11 +216,8 @@ package body Ocarina.Backends.PO_HI_C is
when Platform_LINUX32 =>
Write_Str ("linux32");
when Platform_LINUX64_DLL =>
Write_Str ("linux64_dll");
when Platform_LINUX32_DLL =>
Write_Str ("linux32_dll");
when Platform_LINUX_DLL =>
Write_Str ("linux_dll");
when Platform_WIN32 =>
Write_Str ("win32");
......
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 2015 ESA & ISAE. --
-- Copyright (C) 2015-2018 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -29,23 +29,10 @@
-- --
------------------------------------------------------------------------------
with Ocarina.Backends.Properties; use Ocarina.Backends.Properties;
package Ocarina.Backends.Vxworks653_Conf.Mapping is
function Map_Distributed_Application (E : Node_Id) return Node_Id;
function Map_HI_Node (E : Node_Id) return Node_Id;
function Map_HI_Unit (E : Node_Id) return Node_Id;
function Map_Data (E : Node_Id) return Node_Id;
function Map_Data_Access (E : Node_Id) return Node_Id;
function Map_Bus_Access (E : Node_Id) return Node_Id;
function Map_System (E : Node_Id) return Node_Id;
function Map_Process
(E : Node_Id;
Partition_Identifier : Unsigned_Long_Long) return Node_Id;
function Map_Data_Size (T : Size_Type) return Unsigned_Long_Long;
function Map_Virtual_Processor (E : Node_Id) return Node_Id;
function Map_Processor (E : Node_Id) return Node_Id;
function Map_Partition
(Process : Node_Id;
Runtime : Node_Id;
......@@ -57,25 +44,6 @@ package Ocarina.Backends.Vxworks653_Conf.Mapping is
Nb_Blackboards : Unsigned_Long_Long;
Blackboards_Size : Unsigned_Long_Long;
Buffers_Size : Unsigned_Long_Long) return Node_Id;
function Map_Bus (E : Node_Id) return Node_Id;
function Map_Port_Connection (E : Node_Id) return Node_Id;
function Map_Process_Memory (Process : Node_Id) return Node_Id;
procedure Map_Process_Scheduling
(Process : Node_Id;
Window_Number : in out Unsigned_Long_Long;
N : out Node_Id);
function Map_Connection
(Connection : Node_Id;
Channel_Identifier : Unsigned_Long_Long) return Node_Id;
function Map_Process_HM_Table (Process : Node_Id) return Node_Id;
function Map_Processor_HM_Table (Processor : Node_Id) return Node_Id;
function Map_Sampling_Port (Port : Node_Id) return Node_Id;
function Map_Queuing_Port (Port : Node_Id) return Node_Id;
function Map_Partition_Name
(Runtime : Node_Id;
......
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
......@@ -74,7 +74,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
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