Commit b3c69d74 authored by julien.delange's avatar julien.delange

* ocarina/src/backends/ocarina-backends-properties.adb

   ocarina/src/backends/ocarina-backends-properties.ads
   - Handle linux32 and linux64 platforms

 * ocarina/src/backends/ocarina-backends-po_hi_c.adb
   - Use the Linux32 and linux64 property values for
     generation of Makefiles

 * ocarina/resources/deployment.aadl
   - Add Linux32 and Linux64 values

 * ocarina/resources/AADLv2/components/processors/x86.aadl
   - Define processors for linux32 and linux64 targets.



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@1607 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 129432ae
......@@ -15,11 +15,26 @@ properties
Deployment::Execution_Platform => Native;
end x86.linux;
processor implementation x86.linux32
properties
Deployment::Execution_Platform => Linux32;
end x86.linux32;
processor implementation x86.linux64
properties
Deployment::Execution_Platform => Linux64;
end x86.linux64;
processor implementation x86.native
properties
Deployment::Execution_Platform => Native;
end x86.native;
processor implementation x86.native_compcert
properties
Deployment::Execution_Platform => Native_Compcert;
end x86.compcert;
processor implementation x86.rtems
properties
Deployment::Execution_Platform => X86_RTEMS;
......
......@@ -26,9 +26,12 @@ property set Deployment is
Allowed_Execution_Platform : type enumeration
(Native, -- Native platforms (GNU/Linux, Solaris, Windows...)
Native_Compcert, -- Native platforms using the Compcert compiler
LEON_RTEMS, -- LEON2 board or tsim-leon (RTEMS)
LEON_ORK, -- LEON2 board or tsim-leon (ORK)
LEON_GNAT, -- LEON2 board or qemu (GNATPRO/HI-E)
LINUX32, -- Linux 32 bits
LINUX64, -- Linux 64 bits
ERC32_ORK, -- ERC32 board or tsim-erc32 (ORK)
ARM_DSLINUX, -- Nintendo DS (tm) (DSLinux)
ARM_N770, -- Nokia N770 (tm)
......
......@@ -167,6 +167,12 @@ package body Ocarina.Backends.PO_HI_C is
when Platform_ARM_N770 =>
Write_Str ("arm.n770");
when Platform_LINUX64 =>
Write_Str ("linux64");
when Platform_LINUX32 =>
Write_Str ("linux32");
when others =>
Display_Error ("Unsupported platform " & Execution_Platform'Img,
Fatal => True);
......
......@@ -297,6 +297,8 @@ package body Ocarina.Backends.Properties is
Size_Tera_Byte_Name : Name_Id;
Platform_Native_Name : Name_Id;
Platform_LINUX32_Name : Name_Id;
Platform_LINUX64_Name : Name_Id;
Platform_LEON_RTEMS_Name : Name_Id;
Platform_X86_LINUXTASTE_Name : Name_Id;
Platform_X86_RTEMS_Name : Name_Id;
......@@ -2515,6 +2517,10 @@ package body Ocarina.Backends.Properties is
return Platform_LEON_RTEMS;
elsif P_Name = Platform_X86_LINUXTASTE_Name then
return Platform_X86_LINUXTASTE;
elsif P_Name = Platform_LINUX32_Name then
return Platform_LINUX32;
elsif P_Name = Platform_LINUX64_Name then
return Platform_LINUX64;
elsif P_Name = Platform_X86_RTEMS_Name then
return Platform_X86_RTEMS;
elsif P_Name = Platform_LEON_GNAT_Name then
......@@ -3037,6 +3043,8 @@ package body Ocarina.Backends.Properties is
Platform_Native_Name := Get_String_Name ("native");
Platform_X86_RTEMS_Name := Get_String_Name ("x86_rtems");
Platform_LINUX32_Name := Get_String_Name ("linux32");
Platform_LINUX64_Name := Get_String_Name ("linux64");
Platform_X86_LINUXTASTE_Name := Get_String_Name ("x86_linuxtaste");
Platform_LEON_RTEMS_Name := Get_String_Name ("leon_rtems");
Platform_LEON_GNAT_Name := Get_String_Name ("leon_gnat");
......
......@@ -562,6 +562,8 @@ package Ocarina.Backends.Properties is
Platform_X86_LINUXTASTE,
Platform_LEON_GNAT,
Platform_LEON_ORK,
Platform_LINUX32,
Platform_LINUX64,
Platform_ERC32_ORK,
Platform_ARM_DSLINUX,
Platform_ARM_N770,
......
Markdown is supported
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