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

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

   ocarina/src/backends/ocarina-backends-xtratum_conf-partition_table.adb
   ocarina/src/backends/ocarina-backends-xtratum_conf-hardware_description.adb
   - Adapt xml configuration metrics to be compliant
     with xtratum build system



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@2363 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent b05dbc7d
......@@ -1184,6 +1184,7 @@ package body Ocarina.Backends.Build_Utils is
Fd : File_Descriptor;
S : Node_Id;
The_System : Node_Id;
PID : Unsigned_Long_Long := 0;
begin
-- The following part is very specific to PolyORB-HI-C and especially
......@@ -1289,6 +1290,34 @@ package body Ocarina.Backends.Build_Utils is
Write_Eol;
Write_Eol;
Write_Str ("GENERATED_PACK_ARGS=");
-- Generate the makefiles of all process subcomponents
if not AAU.Is_Empty (Subcomponents (The_System)) then
S := First_Node (Subcomponents (The_System));
while Present (S) loop
if AAU.Is_Process (Corresponding_Instance (S)) then
Write_Str ("-p ");
Write_Str (Unsigned_Long_Long'Image (PID));
Write_Str (":");
Write_Name
(Normalize_Name (Display_Name (Identifier (S))));
Write_Str ("/");
Write_Name
(Normalize_Name (Display_Name (Identifier (S))));
Write_Str (".xef");
Write_Space;
PID := PID + 1;
end if;
S := Next_Node (S);
end loop;
end if;
Write_Eol;
Write_Eol;
Write_Str ("include $(RUNTIME_PATH)/make/Makefile.leon3-xtratum");
Write_Eol;
......
......@@ -442,6 +442,17 @@ package body Ocarina.Backends.Xtratum_Conf.Hardware_Description is
-- Add the start attribute of the region node.
Base_Address_Value := Get_Integer_Property (E, "base_address");
Byte_Count_Value := Get_Integer_Property (E, "byte_count");
if Base_Address_Value = 0 or else Byte_Count_Value = 0 then
Display_Located_Error
(Loc (E),
"Memory does not specify the byte_count " &
"or base_address properties",
Fatal => False);
return;
end if;
Set_Str_To_Name_Buffer ("start");
P := Make_Defining_Identifier (Name_Find);
Set_Str_To_Name_Buffer ("0x");
......@@ -454,7 +465,6 @@ package body Ocarina.Backends.Xtratum_Conf.Hardware_Description is
(Make_Assignement (P, Q), XTN.Items (Memory_Node));
-- Add the size attribute of the region node.
Byte_Count_Value := Get_Integer_Property (E, "byte_count");
Set_Str_To_Name_Buffer ("size");
P := Make_Defining_Identifier (Name_Find);
Set_Str_To_Name_Buffer
......
......@@ -239,9 +239,10 @@ package body Ocarina.Backends.Xtratum_Conf.Partition_Table is
Set_Str_To_Name_Buffer ("size");
P := Make_Defining_Identifier (Name_Find);
Byte_Count_Value := Byte_Count_Value / 1024;
Set_Str_To_Name_Buffer
(Unsigned_Long_Long'Image (Byte_Count_Value));
Add_Str_To_Name_Buffer ("B");
Add_Str_To_Name_Buffer ("KB");
Q := Make_Defining_Identifier (Remove_Char (Name_Find, ' '));
Append_Node_To_List
......
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