From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id A1CE93857418; Tue, 21 Sep 2021 15:27:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1CE93857418 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-3747] [Ada] Minor tweaks to System.Dwarf_Line X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: dbea36c6bde7bd32ad645b0d472c5674e2db744d X-Git-Newrev: 13b594411d2a339e91345c0c5672d49a287dd035 Message-Id: <20210921152730.A1CE93857418@sourceware.org> Date: Tue, 21 Sep 2021 15:27:30 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2021 15:27:30 -0000 https://gcc.gnu.org/g:13b594411d2a339e91345c0c5672d49a287dd035 commit r12-3747-g13b594411d2a339e91345c0c5672d49a287dd035 Author: Eric Botcazou Date: Thu Jul 8 09:54:14 2021 +0200 [Ada] Minor tweaks to System.Dwarf_Line gcc/ada/ * libgnat/s-dwalin.adb (Parse_Header): Tweak comments. (Read_Entry_Format_Array): Tweak exception message. (Symbolic_Address.Set_Result): Likewise. Diff: --- gcc/ada/libgnat/s-dwalin.adb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/ada/libgnat/s-dwalin.adb b/gcc/ada/libgnat/s-dwalin.adb index 4bcd741c92c..e02b0fdeb2c 100644 --- a/gcc/ada/libgnat/s-dwalin.adb +++ b/gcc/ada/libgnat/s-dwalin.adb @@ -584,10 +584,10 @@ package body System.Dwarf_Lines is Standard_Opcode_Lengths (J) := Read (C.Lines); end loop; - -- The directories table follows. Up to DWARF 4, this is a list of null + -- The Directories table follows. Up to DWARF 4, this is a list of null -- terminated strings terminated by a null byte. In DWARF 5, this is a - -- sequence of Directories_Count entries encoded as described by the - -- Directory_Entry_Format field. We store its offset for later decoding. + -- sequence of Directories_Count entries which are encoded as described + -- by the Directory_Entry_Format field. We store its offset for later. if Header.Version <= 4 then Tell (C.Lines, Header.Directories); @@ -619,12 +619,12 @@ package body System.Dwarf_Lines is end loop; end if; - -- The file_names table is next. Up to DWARF 4, this is a list of record + -- The File_Names table is next. Up to DWARF 4, this is a list of record -- containing a null terminated string for the file name, an unsigned -- LEB128 directory index in the Directories table, an unsigned LEB128 -- modification time, and an unsigned LEB128 for the file length; the -- table is terminated by a null byte. In DWARF 5, this is a sequence - -- of File_Names_Count entries encoded as described by the + -- of File_Names_Count entries which are encoded as described by the -- File_Name_Entry_Format field. We store its offset for later decoding. if Header.Version <= 4 then @@ -1045,7 +1045,7 @@ package body System.Dwarf_Lines is case C_Type is when DW_LNCT_path .. DW_LNCT_MD5 => if N not in A'Range then - raise Dwarf_Error with "DWARF duplicate content type"; + raise Dwarf_Error with "duplicate DWARF content type"; end if; A (N) := (C_Type, Form); @@ -1698,7 +1698,8 @@ package body System.Dwarf_Lines is Dir_Idx := Read_LEB128 (C.Lines); when others => - raise Dwarf_Error with "invalid DWARF"; + raise Dwarf_Error with + "invalid DWARF form for DW_LNCT_directory_index"; end case; else