From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 216A03858C39 for ; Thu, 1 Dec 2022 09:44:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 216A03858C39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x42a.google.com with SMTP id x17so1760557wrn.6 for ; Thu, 01 Dec 2022 01:44:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Hj7QalOEPmuXCbRwMaLjlejfiIFh6MpnWU0rDGmiZG8=; b=WuKIPg1tmKUK+MWSKsaMKn8zfLM8IAhat6OFl5R0XA3tD2ncVbmGC+veADEtqn33tK IsKVUDL32aVOJZVD2ka1gAFxsk/gs0oa08z0Nao34+Cba7+P5mLXRVjrLDs2Cos0oG3/ lBFrEjgAbzOKyjvNMx8GdJWmRXmaAvyC1jfjd+qeQT6lVaoYGzbOjBABfOgFEb/Rfzko v5x7OdyVB+qi5DEWinIMkW7hIoHooK7ma6r2nXdL8B91fNBtEAyQVP/+4sFeX5N+Fefn RnsBnnX217qO1sfLlH3X3Shh7NmYE+dIkDKE+gUVII/KzdZQREy2Cg3r2mnQGGWPtUsd TMEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hj7QalOEPmuXCbRwMaLjlejfiIFh6MpnWU0rDGmiZG8=; b=X/ZygQPNw84LY4LJh883JjmqDHzE9qR/lX70IV62ZPWxwCORr6vNsMjrVA6Hz1TTUO tWYv9YLhkgiIHur3qMNeXbdRcGP22b3qWVSkMOCfYng+EeCZe3bK0QVIlCVHB8gbl+b2 mvU6Hq5z/epH5fQXcPdFlRUgPC1hUuqbuItdIgdoB8XX2LbU87wiKm7G6JghzRUz0U81 PbuAKDuUcjMxKREyvmMPxY8pc3v2VgQcpm9LHknBpgKTMNGxGZ/vzCrXjW0sbLwD0Xrh I/e3c2zB0ygokwUjbCdmBgjZUhtd7MRKQk1YvC+1g92LLsZhpQHvT/U99W+0YZWqaiyV GP6A== X-Gm-Message-State: ANoB5plvW59i3M4KqzBUt7DPsgLV4+ojCjDN6C9IOs3uOY7wAZV3m/gr GcTZBrxGJX41tlbyUqE9VZw93OESP3n08A== X-Google-Smtp-Source: AA0mqf5fKhaUvX5AoheE7JM58hZRjZWof6nHtl4n8GQDseC8GZDSDq7rMM6v/0sI0wg3/+fgR16wqA== X-Received: by 2002:a5d:6089:0:b0:241:e85c:f769 with SMTP id w9-20020a5d6089000000b00241e85cf769mr25935162wrt.69.1669887853351; Thu, 01 Dec 2022 01:44:13 -0800 (PST) Received: from chigot-Dell.home ([2a01:cb15:8123:8100:54fd:3b08:9ea7:4623]) by smtp.gmail.com with ESMTPSA id z12-20020a5d44cc000000b002362f6fcaf5sm3888328wrr.48.2022.12.01.01.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 01:44:12 -0800 (PST) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: binutils@sourceware.org Cc: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH] binutils: improve holes detection in .debug_loclists. Date: Thu, 1 Dec 2022 10:44:09 +0100 Message-Id: <20221201094409.1982624-1-chigot@adacore.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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: The previous warnings about holes in .debug_loclists sections don't take into account the headers of each CU and could include the locviews if they precede the loclist. The following warning can be triggered between two CU. ... ... 0000001d 0000002a v000000000000000 v000000000000000 location view pair 0000002c v000000000000000 v000000000000000 location view pair readelf: Warning: There is a hole [0x1e - 0x2e] in .debug_loclists section. 0000002e v000000000000000 v000000000000000 views at 0000002a for: ... But [0x1e - 0x2a] corresponds to the CU header and [0x2a - 0x2e] are the locviews. Thus there is no hole here. binutils/ChangeLog: * dwarf.c (display_debug_loc): Adjust holes detections for headers and locviews. --- binutils/dwarf.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 404a0bdbac6..ffe3c10ff75 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -7158,7 +7158,7 @@ display_debug_loc (struct dwarf_section *section, void *file) const char *suffix = strrchr (section->name, '.'); bool is_dwo = false; int is_loclists = strstr (section->name, "debug_loclists") != NULL; - uint64_t expected_start = 0; + uint64_t header_size = 0; if (suffix && strcmp (suffix, ".dwo") == 0) is_dwo = true; @@ -7209,7 +7209,7 @@ display_debug_loc (struct dwarf_section *section, void *file) if (offset_entry_count != 0) return display_offset_entry_loclists (section); - expected_start = hdrptr - section_begin; + header_size = hdrptr - section_begin; } if (load_debug_info (file) == 0) @@ -7265,12 +7265,12 @@ display_debug_loc (struct dwarf_section *section, void *file) error (_("No location lists in .debug_info section!\n")); if (debug_information [first].num_loc_offsets > 0 - && debug_information [first].loc_offsets [0] != expected_start - && debug_information [first].loc_views [0] != expected_start) + && debug_information [first].loc_offsets [0] != header_size + && debug_information [first].loc_views [0] != header_size) warn (_("Location lists in %s section start at %#" PRIx64 " rather than %#" PRIx64 "\n"), section->name, debug_information [first].loc_offsets [0], - expected_start); + header_size); if (!locs_sorted) array = (unsigned int *) xcmalloc (num_loc_list, sizeof (unsigned int)); @@ -7282,10 +7282,9 @@ display_debug_loc (struct dwarf_section *section, void *file) printf (_(" Offset Begin End Expression\n")); - seen_first_offset = 0; for (i = first; i < num_debug_info_entries; i++) { - uint64_t offset, voffset; + uint64_t offset = 0, voffset = 0; uint64_t base_address; unsigned int k; int has_frame_base; @@ -7300,6 +7299,24 @@ display_debug_loc (struct dwarf_section *section, void *file) sizeof (*array), loc_offsets_compar); } + /* .debug_loclists has a per-unit header. + Update start if we are detecting it. */ + if (debug_information [i].dwarf_version == 5) + { + j = locs_sorted ? 0 : array [0]; + + if (debug_information [i].num_loc_offsets) + offset = debug_information [i].loc_offsets [j]; + + if (debug_information [i].num_loc_views) + voffset = debug_information [i].loc_views [j]; + + /* Assume that the size of the header is constant across CUs. */ + if (((start - section_begin) + header_size == offset) + || ((start -section_begin) + header_size == voffset)) + start += header_size; + } + int adjacent_view_loclists = 1; for (k = 0; k < debug_information [i].num_loc_offsets; k++) { @@ -7330,19 +7347,21 @@ display_debug_loc (struct dwarf_section *section, void *file) start = vstart; } - if (!seen_first_offset || !adjacent_view_loclists) - seen_first_offset = 1; - else + if (start < next) { - if (start < next) + if (vnext && vnext < next) warn (_("There is a hole [%#tx - %#" PRIx64 "]" " in %s section.\n"), - start - section_begin, offset, section->name); - else if (start > next) - warn (_("There is an overlap [%#tx - %#" PRIx64 "]" + start - section_begin, voffset, section->name); + else + warn (_("There is a hole [%#tx - %#" PRIx64 "]" " in %s section.\n"), start - section_begin, offset, section->name); } + else if (start > next) + warn (_("There is an overlap [%#tx - %#" PRIx64 "]" + " in %s section.\n"), + start - section_begin, offset, section->name); start = next; vstart = vnext; -- 2.25.1