Commit a4485ef6 by Robert Dewar Committed by Arnaud Charlet

g-trasym-vms-ia64.adb, [...]: Minor reformatting.

2010-10-18  Robert Dewar  <dewar@adacore.com>

	* g-trasym-vms-ia64.adb, prj-nmsc.adb, prj.ads: Minor reformatting.

From-SVN: r165611
parent 8ddf04c2
2010-10-18 Robert Dewar <dewar@adacore.com>
* g-trasym-vms-ia64.adb, prj-nmsc.adb, prj.ads: Minor reformatting.
2010-10-14 Eric Botcazou <ebotcazou@adacore.com> 2010-10-14 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Type>: Set * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Type>: Set
......
...@@ -64,7 +64,8 @@ package body GNAT.Traceback.Symbolic is ...@@ -64,7 +64,8 @@ package body GNAT.Traceback.Symbolic is
subtype Cond_Value_Type is Unsigned_Longword; subtype Cond_Value_Type is Unsigned_Longword;
-- TBK_API_PARAM as defined in TBKDEF. -- TBK_API_PARAM as defined in TBKDEF
type Tbk_Api_Param is record type Tbk_Api_Param is record
Length : Unsigned_Word; Length : Unsigned_Word;
T_Type : Unsigned_Byte; T_Type : Unsigned_Byte;
...@@ -92,13 +93,14 @@ package body GNAT.Traceback.Symbolic is ...@@ -92,13 +93,14 @@ package body GNAT.Traceback.Symbolic is
pragma Convention (C, Tbk_Api_Param); pragma Convention (C, Tbk_Api_Param);
K_Version : constant Unsigned_Byte := 1; K_Version : constant Unsigned_Byte := 1;
-- Current API version. -- Current API version
K_Length : constant Unsigned_Word := 152;
-- Length of the parameter. K_Length : constant Unsigned_Word := 152;
-- Length of the parameter
pragma Compile_Time_Error (Tbk_Api_Param'Size = K_Length * 8, pragma Compile_Time_Error (Tbk_Api_Param'Size = K_Length * 8,
"Bad length for tbk_api_param"); "Bad length for tbk_api_param");
-- Sanity check. -- Sanity check
function Symbolize (Param : Address) return Cond_Value_Type; function Symbolize (Param : Address) return Cond_Value_Type;
pragma Import (C, Symbolize, "TBK$I64_SYMBOLIZE"); pragma Import (C, Symbolize, "TBK$I64_SYMBOLIZE");
...@@ -246,28 +248,31 @@ package body GNAT.Traceback.Symbolic is ...@@ -246,28 +248,31 @@ package body GNAT.Traceback.Symbolic is
Faulting_Fp => 0, Faulting_Fp => 0,
Filename_Desc => Null_Address, Filename_Desc => Null_Address,
Library_Module_Desc => Null_Address, Library_Module_Desc => Null_Address,
Record_Number => Record_Number'Address, Record_Number => Record_Number'Address,
Image_Desc => Image_Dsc'Address, Image_Desc => Image_Dsc'Address,
Module_Desc => Module_Dsc'Address, Module_Desc => Module_Dsc'Address,
Routine_Desc => Routine_Dsc'Address, Routine_Desc => Routine_Dsc'Address,
Listing_Lineno => Line_Number'Address, Listing_Lineno => Line_Number'Address,
Rel_Pc => Null_Address, Rel_Pc => Null_Address,
Image_Base_Addr => Null_Address, Image_Base_Addr => Null_Address,
Module_Base_Addr => Null_Address, Module_Base_Addr => Null_Address,
Malloc_Rtn => Null_Address, Malloc_Rtn => Null_Address,
Free_Rtn => Null_Address, Free_Rtn => Null_Address,
Symbolize_Flags => Null_Address, Symbolize_Flags => Null_Address,
Reserved0 => (0, 0), Reserved0 => (0, 0),
Reserved1 => (0, 0), Reserved1 => (0, 0),
Reserved2 => (0, 0)); Reserved2 => (0, 0));
Status := Symbolize (Param'Address); Status := Symbolize (Param'Address);
-- Check for success (marked by bit 0)
if (Status rem 2) = 1 then if (Status rem 2) = 1 then
-- Success -- Success
if Line_Number = 0 then if Line_Number = 0 then
-- As GCC doesn't emit source file correlation, use record -- As GCC doesn't emit source file correlation, use record
-- number of line number is not set -- number of line number is not set
...@@ -280,11 +285,12 @@ package body GNAT.Traceback.Symbolic is ...@@ -280,11 +285,12 @@ package body GNAT.Traceback.Symbolic is
Pos : Integer; Pos : Integer;
Routine_Name_D : constant String := Routine_Name_D : constant String :=
Decode_Ada_Name (Routine_Name.Buf Decode_Ada_Name
(1 .. Natural (Routine_Name.Curlen))); (Routine_Name.Buf
(1 .. Natural (Routine_Name.Curlen)));
Lineno : constant String := Lineno : constant String :=
Unsigned_Longword'Image (Line_Number); Unsigned_Longword'Image (Line_Number);
begin begin
Res (First .. Last) := (others => ' '); Res (First .. Last) := (others => ' ');
...@@ -300,8 +306,8 @@ package body GNAT.Traceback.Symbolic is ...@@ -300,8 +306,8 @@ package body GNAT.Traceback.Symbolic is
First + 30 + Routine_Name_D'Length - 1) := First + 30 + Routine_Name_D'Length - 1) :=
Routine_Name_D; Routine_Name_D;
-- If routine name doesn't fit 20 characters, output -- If routine name doesn't fit 20 characters, output the line
-- the line number on next line at 50th position -- number on next line at 50th position.
if Routine_Name_D'Length > 20 then if Routine_Name_D'Length > 20 then
Pos := First + 30 + Routine_Name_D'Length; Pos := First + 30 + Routine_Name_D'Length;
...@@ -318,6 +324,9 @@ package body GNAT.Traceback.Symbolic is ...@@ -318,6 +324,9 @@ package body GNAT.Traceback.Symbolic is
Res (Last) := ASCII.LF; Res (Last) := ASCII.LF;
Len := Last; Len := Last;
end; end;
-- Even status values
else else
Res (Len + 1 .. Len + 6) := "ERROR" & ASCII.LF; Res (Len + 1 .. Len + 6) := "ERROR" & ASCII.LF;
Len := Len + 6; Len := Len + 6;
......
...@@ -3038,10 +3038,11 @@ package body Prj.Nmsc is ...@@ -3038,10 +3038,11 @@ package body Prj.Nmsc is
In_Tree => Data.Tree); In_Tree => Data.Tree);
end case; end case;
Exception_List := Value_Of Exception_List :=
(Index => Lang, Value_Of
In_Array => Exceptions, (Index => Lang,
In_Tree => Data.Tree); In_Array => Exceptions,
In_Tree => Data.Tree);
if Exception_List /= Nil_Variable_Value then if Exception_List /= Nil_Variable_Value then
Element_Id := Exception_List.Values; Element_Id := Exception_List.Values;
...@@ -3049,11 +3050,11 @@ package body Prj.Nmsc is ...@@ -3049,11 +3050,11 @@ package body Prj.Nmsc is
Element := Data.Tree.String_Elements.Table (Element_Id); Element := Data.Tree.String_Elements.Table (Element_Id);
File_Name := Canonical_Case_File_Name (Element.Value); File_Name := Canonical_Case_File_Name (Element.Value);
Source := Source_Files_Htable.Get Source :=
(Data.Tree.Source_Files_HT, File_Name); Source_Files_Htable.Get
(Data.Tree.Source_Files_HT, File_Name);
while Source /= No_Source while Source /= No_Source
and then Source.Project /= Project and then Source.Project /= Project
loop loop
Source := Source.Next_With_File_Name; Source := Source.Next_With_File_Name;
end loop; end loop;
......
...@@ -771,7 +771,7 @@ package Prj is ...@@ -771,7 +771,7 @@ package Prj is
Next_In_Lang : Source_Id := No_Source; Next_In_Lang : Source_Id := No_Source;
-- Link to another source of the same language in the same project -- Link to another source of the same language in the same project
Next_With_File_Name : Source_Id := No_Source; Next_With_File_Name : Source_Id := No_Source;
-- Link to another source with the same base file name -- Link to another source with the same base file name
end record; end record;
...@@ -1373,7 +1373,7 @@ package Prj is ...@@ -1373,7 +1373,7 @@ package Prj is
Packages : Package_Table.Instance; Packages : Package_Table.Instance;
Projects : Project_List; Projects : Project_List;
Replaced_Sources : Replaced_Source_HTable.Instance; Replaced_Sources : Replaced_Source_HTable.Instance;
-- The list of sources that have been replaced by sources with -- The list of sources that have been replaced by sources with
-- different file names. -- different file names.
...@@ -1383,7 +1383,7 @@ package Prj is ...@@ -1383,7 +1383,7 @@ package Prj is
Units_HT : Units_Htable.Instance; Units_HT : Units_Htable.Instance;
-- Unit name to Unit_Index (and from there to Source_Id) -- Unit name to Unit_Index (and from there to Source_Id)
Source_Files_HT : Source_Files_Htable.Instance; Source_Files_HT : Source_Files_Htable.Instance;
-- Base source file names to Source_Id list. -- Base source file names to Source_Id list.
Source_Paths_HT : Source_Paths_Htable.Instance; Source_Paths_HT : Source_Paths_Htable.Instance;
...@@ -1432,13 +1432,17 @@ package Prj is ...@@ -1432,13 +1432,17 @@ package Prj is
Imported_First : Boolean := False); Imported_First : Boolean := False);
-- Call Action for each project imported directly or indirectly by project -- Call Action for each project imported directly or indirectly by project
-- By, as well as extended projects. -- By, as well as extended projects.
--
-- The order of processing depends on Imported_First: -- The order of processing depends on Imported_First:
-- If False, Action is called according to the order of importation: if A --
-- imports B, directly or indirectly, Action will be called for A before -- If False, Action is called according to the order of importation: if A
-- it is called for B. If two projects import each other directly or -- imports B, directly or indirectly, Action will be called for A before
-- indirectly (using at least one "limited with"), it is not specified -- it is called for B. If two projects import each other directly or
-- for which of these two projects Action will be called first. -- indirectly (using at least one "limited with"), it is not specified
-- The order is reversed if Imported_First is True. -- for which of these two projects Action will be called first.
--
-- The order is reversed if Imported_First is True
--
-- With_State may be used by Action to choose a behavior or to report some -- With_State may be used by Action to choose a behavior or to report some
-- global result. -- global result.
......
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