From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id ECA2B385781F for ; Fri, 6 Oct 2023 18:31:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ECA2B385781F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0DAA621884 for ; Fri, 6 Oct 2023 18:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1696617063; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6GsDfSO6PVBr9oDPqntTZ2QLpuztqfELgGZf2E9iZso=; b=AozRS9LDBLMIsSx4g6mwWb20F+qRP/tsjsc2XKYZC4PxTSz/1iwd4N0ZZCqZ4siDCb7SDu oByujRgAnfTJglvjOSpGqDyy82nRFaq2nOtgNyRMn3bIYddIHSOGa3tPt0nGFOSzWCzOSs MYmKfk284NEAufO9QRg9RYxFANgybEc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1696617063; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6GsDfSO6PVBr9oDPqntTZ2QLpuztqfELgGZf2E9iZso=; b=h6wY3oO0k3mgtpyD2Tp2A1YaHLRQfC5nghm98rwRKWc0C7spBEGq2tzAXyn+HDwZIfBKRR KVfKqZXt3pPpKLBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id EF55513586 for ; Fri, 6 Oct 2023 18:31:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uKpFOWZSIGVNUwAAMHmgww (envelope-from ) for ; Fri, 06 Oct 2023 18:31:02 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/2] [readelf] Handle .gdb_index section version 9 Date: Fri, 6 Oct 2023 20:31:04 +0200 Message-Id: <20231006183104.27689-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231006183104.27689-1-tdevries@suse.de> References: <20231006183104.27689-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Add the abilitity to print a v9 .gdb_index section. The v9 section contains an extra table, which is printed as follows: ... Shortcut table: Language of main: Fortran 95 Name of main: contains_keyword ... [ For the example, I used the exec of gdb test-case gdb.fortran/nested-funcs-2-exp when running the test-case with target board cc-with-gdb-index. ] Tested on x86_64-linux. --- binutils/dwarf.c | 176 ++++++++++++++++++++++++++++++----------------- 1 file changed, 113 insertions(+), 63 deletions(-) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 7a350cae50b..6adc37c9169 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -2342,6 +2342,72 @@ display_discr_list (unsigned long form, printf (")(unsigned)"); } +static void +display_lang (uint64_t uvalue) +{ + switch (uvalue) + { + /* Ordered by the numeric value of these constants. */ + case DW_LANG_C89: printf ("ANSI C"); break; + case DW_LANG_C: printf ("non-ANSI C"); break; + case DW_LANG_Ada83: printf ("Ada"); break; + case DW_LANG_C_plus_plus: printf ("C++"); break; + case DW_LANG_Cobol74: printf ("Cobol 74"); break; + case DW_LANG_Cobol85: printf ("Cobol 85"); break; + case DW_LANG_Fortran77: printf ("FORTRAN 77"); break; + case DW_LANG_Fortran90: printf ("Fortran 90"); break; + case DW_LANG_Pascal83: printf ("ANSI Pascal"); break; + case DW_LANG_Modula2: printf ("Modula 2"); break; + + /* DWARF 2.1 values. */ + case DW_LANG_Java: printf ("Java"); break; + case DW_LANG_C99: printf ("ANSI C99"); break; + case DW_LANG_Ada95: printf ("ADA 95"); break; + case DW_LANG_Fortran95: printf ("Fortran 95"); break; + + /* DWARF 3 values. */ + case DW_LANG_PLI: printf ("PLI"); break; + case DW_LANG_ObjC: printf ("Objective C"); break; + case DW_LANG_ObjC_plus_plus: printf ("Objective C++"); break; + case DW_LANG_UPC: printf ("Unified Parallel C"); break; + case DW_LANG_D: printf ("D"); break; + + /* DWARF 4 values. */ + case DW_LANG_Python: printf ("Python"); break; + + /* DWARF 5 values. */ + case DW_LANG_OpenCL: printf ("OpenCL"); break; + case DW_LANG_Go: printf ("Go"); break; + case DW_LANG_Modula3: printf ("Modula 3"); break; + case DW_LANG_Haskell: printf ("Haskell"); break; + case DW_LANG_C_plus_plus_03: printf ("C++03"); break; + case DW_LANG_C_plus_plus_11: printf ("C++11"); break; + case DW_LANG_OCaml: printf ("OCaml"); break; + case DW_LANG_Rust: printf ("Rust"); break; + case DW_LANG_C11: printf ("C11"); break; + case DW_LANG_Swift: printf ("Swift"); break; + case DW_LANG_Julia: printf ("Julia"); break; + case DW_LANG_Dylan: printf ("Dylan"); break; + case DW_LANG_C_plus_plus_14: printf ("C++14"); break; + case DW_LANG_Fortran03: printf ("Fortran 03"); break; + case DW_LANG_Fortran08: printf ("Fortran 08"); break; + case DW_LANG_RenderScript: printf ("RenderScript"); break; + + /* MIPS extension. */ + case DW_LANG_Mips_Assembler: printf ("MIPS assembler"); break; + + /* UPC extension. */ + case DW_LANG_Upc: printf ("Unified Parallel C"); break; + + default: + if (uvalue >= DW_LANG_lo_user && uvalue <= DW_LANG_hi_user) + printf (_("implementation defined: %#" PRIx64 ""), uvalue); + else + printf (_("unknown: %#" PRIx64 ""), uvalue); + break; + } +} + static unsigned char * read_and_display_attr_value (unsigned long attribute, unsigned long form, @@ -3110,61 +3176,9 @@ read_and_display_attr_value (unsigned long attribute, break; case DW_AT_language: - printf ("\t"); - switch (uvalue) - { - /* Ordered by the numeric value of these constants. */ - case DW_LANG_C89: printf ("(ANSI C)"); break; - case DW_LANG_C: printf ("(non-ANSI C)"); break; - case DW_LANG_Ada83: printf ("(Ada)"); break; - case DW_LANG_C_plus_plus: printf ("(C++)"); break; - case DW_LANG_Cobol74: printf ("(Cobol 74)"); break; - case DW_LANG_Cobol85: printf ("(Cobol 85)"); break; - case DW_LANG_Fortran77: printf ("(FORTRAN 77)"); break; - case DW_LANG_Fortran90: printf ("(Fortran 90)"); break; - case DW_LANG_Pascal83: printf ("(ANSI Pascal)"); break; - case DW_LANG_Modula2: printf ("(Modula 2)"); break; - /* DWARF 2.1 values. */ - case DW_LANG_Java: printf ("(Java)"); break; - case DW_LANG_C99: printf ("(ANSI C99)"); break; - case DW_LANG_Ada95: printf ("(ADA 95)"); break; - case DW_LANG_Fortran95: printf ("(Fortran 95)"); break; - /* DWARF 3 values. */ - case DW_LANG_PLI: printf ("(PLI)"); break; - case DW_LANG_ObjC: printf ("(Objective C)"); break; - case DW_LANG_ObjC_plus_plus: printf ("(Objective C++)"); break; - case DW_LANG_UPC: printf ("(Unified Parallel C)"); break; - case DW_LANG_D: printf ("(D)"); break; - /* DWARF 4 values. */ - case DW_LANG_Python: printf ("(Python)"); break; - /* DWARF 5 values. */ - case DW_LANG_OpenCL: printf ("(OpenCL)"); break; - case DW_LANG_Go: printf ("(Go)"); break; - case DW_LANG_Modula3: printf ("(Modula 3)"); break; - case DW_LANG_Haskell: printf ("(Haskell)"); break; - case DW_LANG_C_plus_plus_03: printf ("(C++03)"); break; - case DW_LANG_C_plus_plus_11: printf ("(C++11)"); break; - case DW_LANG_OCaml: printf ("(OCaml)"); break; - case DW_LANG_Rust: printf ("(Rust)"); break; - case DW_LANG_C11: printf ("(C11)"); break; - case DW_LANG_Swift: printf ("(Swift)"); break; - case DW_LANG_Julia: printf ("(Julia)"); break; - case DW_LANG_Dylan: printf ("(Dylan)"); break; - case DW_LANG_C_plus_plus_14: printf ("(C++14)"); break; - case DW_LANG_Fortran03: printf ("(Fortran 03)"); break; - case DW_LANG_Fortran08: printf ("(Fortran 08)"); break; - case DW_LANG_RenderScript: printf ("(RenderScript)"); break; - /* MIPS extension. */ - case DW_LANG_Mips_Assembler: printf ("(MIPS assembler)"); break; - /* UPC extension. */ - case DW_LANG_Upc: printf ("(Unified Parallel C)"); break; - default: - if (uvalue >= DW_LANG_lo_user && uvalue <= DW_LANG_hi_user) - printf (_("(implementation defined: %#" PRIx64 ")"), uvalue); - else - printf (_("(unknown: %#" PRIx64 ")"), uvalue); - break; - } + printf ("\t("); + display_lang (uvalue); + printf (")"); break; case DW_AT_encoding: @@ -10738,29 +10752,31 @@ display_gdb_index (struct dwarf_section *section, unsigned char *start = section->start; uint32_t version; uint32_t cu_list_offset, tu_list_offset; - uint32_t address_table_offset, symbol_table_offset, constant_pool_offset; + uint32_t address_table_offset, symbol_table_offset, constant_pool_offset, + shortcut_table_offset; unsigned int cu_list_elements, tu_list_elements; unsigned int address_table_elements, symbol_table_slots; unsigned char *cu_list, *tu_list; - unsigned char *address_table, *symbol_table, *constant_pool; + unsigned char *address_table, *symbol_table, *shortcut_table, *constant_pool; unsigned int i; /* The documentation for the format of this file is in gdb/dwarf2read.c. */ introduce (section, false); - if (section->size < 6 * sizeof (uint32_t)) + version = section->size < 4 ? 0 : byte_get_little_endian (start, 4); + size_t header_size = (version < 9 ? 6 : 7) * sizeof (uint32_t); + if (section->size < header_size) { warn (_("Truncated header in the %s section.\n"), section->name); return 0; } - version = byte_get_little_endian (start, 4); printf (_("Version %lu\n"), (unsigned long) version); /* Prior versions are obsolete, and future versions may not be backwards compatible. */ - if (version < 3 || version > 8) + if (version < 3 || version > 9) { warn (_("Unsupported version %lu.\n"), (unsigned long) version); return 0; @@ -10782,17 +10798,23 @@ display_gdb_index (struct dwarf_section *section, tu_list_offset = byte_get_little_endian (start + 8, 4); address_table_offset = byte_get_little_endian (start + 12, 4); symbol_table_offset = byte_get_little_endian (start + 16, 4); - constant_pool_offset = byte_get_little_endian (start + 20, 4); + shortcut_table_offset = byte_get_little_endian (start + 20, 4); + if (version < 9) + constant_pool_offset = shortcut_table_offset; + else + constant_pool_offset = byte_get_little_endian (start + 24, 4); if (cu_list_offset > section->size || tu_list_offset > section->size || address_table_offset > section->size || symbol_table_offset > section->size + || shortcut_table_offset > section->size || constant_pool_offset > section->size || tu_list_offset < cu_list_offset || address_table_offset < tu_list_offset || symbol_table_offset < address_table_offset - || constant_pool_offset < symbol_table_offset) + || shortcut_table_offset < symbol_table_offset + || constant_pool_offset < shortcut_table_offset) { warn (_("Corrupt header in the %s section.\n"), section->name); return 0; @@ -10801,12 +10823,13 @@ display_gdb_index (struct dwarf_section *section, cu_list_elements = (tu_list_offset - cu_list_offset) / 16; tu_list_elements = (address_table_offset - tu_list_offset) / 24; address_table_elements = (symbol_table_offset - address_table_offset) / 20; - symbol_table_slots = (constant_pool_offset - symbol_table_offset) / 8; + symbol_table_slots = (shortcut_table_offset - symbol_table_offset) / 8; cu_list = start + cu_list_offset; tu_list = start + tu_list_offset; address_table = start + address_table_offset; symbol_table = start + symbol_table_offset; + shortcut_table = start + shortcut_table_offset; constant_pool = start + constant_pool_offset; printf (_("\nCU table:\n")); @@ -10918,6 +10941,33 @@ display_gdb_index (struct dwarf_section *section, } } + if (version > 9) + { + printf (_("\nShortcut table:\n")); + + if (shortcut_table_offset + 8 > constant_pool_offset) + { + warn (_("Corrupt shortcut table in the %s section.\n"), section->name); + return 0; + } + + uint32_t lang = byte_get_little_endian (shortcut_table, 4); + printf (_("Language of main: ")); + display_lang (lang); + printf ("\n"); + + uint32_t name_offset = byte_get_little_endian (shortcut_table + 4, 4); + printf (_("Name of main: ")); + if (name_offset >= section->size - constant_pool_offset) + { + printf (_("\n"), name_offset); + warn (_("Corrupt name offset of 0x%x found for name of main\n"), + name_offset); + } + else + printf ("%s\n", constant_pool + name_offset); + } + return 1; } -- 2.35.3