From patchwork Sat Jul 20 19:31:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Harmstone X-Patchwork-Id: 1962816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=harmstone.com header.i=@harmstone.com header.a=rsa-sha256 header.s=mail header.b=Il7FoJLl; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WRGrW2v5zz20FS for ; Sun, 21 Jul 2024 05:31:51 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F34E3860C3D for ; Sat, 20 Jul 2024 19:31:49 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail.burntcomma.com (mail2.burntcomma.com [217.169.27.34]) by sourceware.org (Postfix) with ESMTPS id 852BA3858D20 for ; Sat, 20 Jul 2024 19:31:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 852BA3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=harmstone.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=harmstone.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 852BA3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=217.169.27.34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721503892; cv=none; b=POORrFWF28KbyR17VO2NASL0x6h4avO1QbwZtycdGoQlyPWJPBWqGq/gGfkzSKo6S350rKu0wyjm3rB3evyUf6y18ZPYVUePa4rsdd0kgn1cAOCGf5r31VH0QCoQCQ7z2j+seqxYyyFohW9cgZIOThmpgAhWtsDUMT5lXPmmv1k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721503892; c=relaxed/simple; bh=/Q15k2sno/VSzz7rluQSNAeKc6l8cmwnIdI0NbxuK3c=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:Mime-Version; b=SWYHVe2Q0XKE0y1lh5vf2hS6bV5UmkMToHXVZyaWOwdVq6hEsYv9pGdVL2I2a/1tmbbH2+JDuRNehedkRpjU3Iw6bmjOjeEOnrRVXbrJrnnVZK6oC4e6ncrkwKgqxksbqWQtRNAEg3Rnk3AUZHgF55zKsVRu3f5gkQRzOHUJpBo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (beren.burntcomma.com [IPv6:2a02:8012:8cf0:0:b62e:99ff:fee9:ad9f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by mail.burntcomma.com (Postfix) with ESMTPSA id D7CF03F0E793; Sat, 20 Jul 2024 20:31:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=harmstone.com; s=mail; t=1721503887; bh=8X19vxSxlE2iBL+2LcCB5pPoiS3FcGhSsZWHwsYYOIw=; h=From:To:Cc:Subject:Date; b=Il7FoJLl6icMUq+M0/ic+S/c+6ht5VO0a4lCaQCtJ1kRQKMO5c1IG/ruWFATah8Tv b4w71cwTExoOV0xde8S6wTrrHYRwSww10Lh322Vwvr0iunzg5kJIMnEOcLy/bwmqj6 XJbRy80/QBiImFWRjAnFJpAFL0PZfaRSLEY8yrJU= From: Mark Harmstone To: gcc-patches@gcc.gnu.org Cc: Mark Harmstone Subject: [PATCH 1/2] Output CodeView type information for references Date: Sat, 20 Jul 2024 20:31:19 +0100 Message-ID: <20240720193120.19722-1-mark@harmstone.com> Mime-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Translates DW_TAG_reference_type DIEs into LF_POINTER types. gcc/ * dwarf2codeview.cc (get_type_num_reference_type): New function. (get_type_num_array_type): Add DW_TAG_reference_type to switch. (get_type_num): Handle DW_TAG_reference_type DIEs. * dwarf2codeview.h (CV_PTR_MODE_LVREF): Define. --- gcc/dwarf2codeview.cc | 44 +++++++++++++++++++++++++++++++++++++++++++ gcc/dwarf2codeview.h | 1 + 2 files changed, 45 insertions(+) diff --git a/gcc/dwarf2codeview.cc b/gcc/dwarf2codeview.cc index c174f320480..23175204acd 100644 --- a/gcc/dwarf2codeview.cc +++ b/gcc/dwarf2codeview.cc @@ -2293,6 +2293,45 @@ get_type_num_pointer_type (dw_die_ref type, bool in_struct) return ct->num; } +/* Process a DW_TAG_reference_type DIE, add a new LF_POINTER type, and return + its number. */ + +static uint32_t +get_type_num_reference_type (dw_die_ref type, bool in_struct) +{ + uint32_t base_type_num, byte_size; + dw_die_ref base_type; + codeview_custom_type *ct; + + byte_size = get_AT_unsigned (type, DW_AT_byte_size); + if (byte_size != 4 && byte_size != 8) + return 0; + + base_type = get_AT_ref (type, DW_AT_type); + + base_type_num = get_type_num (base_type, in_struct, false); + if (base_type_num == 0) + return 0; + + ct = (codeview_custom_type *) xmalloc (sizeof (codeview_custom_type)); + + ct->next = NULL; + ct->kind = LF_POINTER; + ct->lf_pointer.base_type = base_type_num; + ct->lf_pointer.attributes = CV_PTR_MODE_LVREF; + + if (byte_size == 4) + ct->lf_pointer.attributes |= CV_PTR_NEAR32; + else + ct->lf_pointer.attributes |= CV_PTR_64; + + ct->lf_pointer.attributes |= byte_size << 13; + + add_custom_type (ct); + + return ct->num; +} + /* Process a DW_TAG_const_type DIE, adding an LF_MODIFIER type and returning its number. */ @@ -3024,6 +3063,7 @@ get_type_num_array_type (dw_die_ref type, bool in_struct) case DW_TAG_class_type: case DW_TAG_union_type: case DW_TAG_pointer_type: + case DW_TAG_reference_type: size = get_AT_unsigned (t, DW_AT_byte_size); break; @@ -3151,6 +3191,10 @@ get_type_num (dw_die_ref type, bool in_struct, bool no_fwd_ref) num = get_type_num_pointer_type (type, in_struct); break; + case DW_TAG_reference_type: + num = get_type_num_reference_type (type, in_struct); + break; + case DW_TAG_const_type: num = get_type_num_const_type (type, in_struct); break; diff --git a/gcc/dwarf2codeview.h b/gcc/dwarf2codeview.h index 8fd3632e524..7d4e3ab1db4 100644 --- a/gcc/dwarf2codeview.h +++ b/gcc/dwarf2codeview.h @@ -55,6 +55,7 @@ along with GCC; see the file COPYING3. If not see /* LF_POINTER attributes. */ #define CV_PTR_NEAR32 0x0a #define CV_PTR_64 0x0c +#define CV_PTR_MODE_LVREF 0x20 /* LF_MODIFIER values. */ #define MOD_const 0x1 From patchwork Sat Jul 20 19:31:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Harmstone X-Patchwork-Id: 1962815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=harmstone.com header.i=@harmstone.com header.a=rsa-sha256 header.s=mail header.b=ifTF5kev; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WRGrT4Pl8z1ySl for ; Sun, 21 Jul 2024 05:31:51 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F8D03860C3F for ; Sat, 20 Jul 2024 19:31:49 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail.burntcomma.com (mail.burntcomma.com [IPv6:2a02:8012:8cf0:250::6d61:696c]) by sourceware.org (Postfix) with ESMTPS id EB85B3858C41 for ; Sat, 20 Jul 2024 19:31:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EB85B3858C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=harmstone.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=harmstone.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EB85B3858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a02:8012:8cf0:250::6d61:696c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721503892; cv=none; b=kBXN2mOo7CBtFUne+04VKuOoC5aMyQYeJd1hAYHUZWIM8I+1FNwHZaA3WPH5j4PFYFo8K851ZqEfhKyoagnS/eJBW+tWZ3NsbCMcGBKF5NGW/K6jztL1dKPvxPnykmam1dXKm7xFZoaKV0BivPaMIzVwEbuxcFV4kTejKjEawLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721503892; c=relaxed/simple; bh=sa3h9kx4/KhS33Yg9wp1rU4Q3lve/5ilMF/+P5GsNcE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:Mime-Version; b=MUvm8TqoMIVPqL83kp6DSRPeBA/J7vlmbC0Y/lr8cvqgEgk2peIdNs3Ia5MK4HGOVTN6RI7o6t+ff0khoXMBqS8MgQuYRZdpEbms44qwBIE4JvnS+GFs8KiXzVWhyQ2vU8NWK3jxWW+xvp4IYI2byzws1dbCDVnlqJ9uBh3OsL8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (beren.burntcomma.com [IPv6:2a02:8012:8cf0:0:b62e:99ff:fee9:ad9f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by mail.burntcomma.com (Postfix) with ESMTPSA id 8578C3F0E796; Sat, 20 Jul 2024 20:31:29 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=harmstone.com; s=mail; t=1721503889; bh=M4xJJFtJjzA9LbPGaRADL+ke6nlYCUKUBdB5Dgc+hY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ifTF5kevBl1geGvOcHDHwoD5s7CJAODuFO1ygnZrVtS5aEDi7x1J0ajuat7f8Ocv6 PfUBqyTZ6avwn+x9s+w2sxnMGHbgOtR6YMps+BlG/beuONFc6KZCouUBpVKy6M/laA quKsf8RDm557aAcfDg64rgqROeLdKFAy4GiIPSA4= From: Mark Harmstone To: gcc-patches@gcc.gnu.org Cc: Mark Harmstone Subject: [PATCH 2/2] Output CodeView type information for rvalue references Date: Sat, 20 Jul 2024 20:31:20 +0100 Message-ID: <20240720193120.19722-2-mark@harmstone.com> In-Reply-To: <20240720193120.19722-1-mark@harmstone.com> References: <20240720193120.19722-1-mark@harmstone.com> Mime-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Translates DW_TAG_rvalue_reference_type DIEs into LF_POINTER types. gcc/ * dwarf2codeview.cc (get_type_num_reference_type): Handle rvalue refs. (get_type_num_array_type): Add DW_TAG_rvalue_reference_type to switch. (get_type_num): Handle DW_TAG_rvalue_reference_type DIEs. * dwarf2codeview.h (CV_PTR_MODE_RVREF): Define. --- gcc/dwarf2codeview.cc | 15 ++++++++++----- gcc/dwarf2codeview.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/dwarf2codeview.cc b/gcc/dwarf2codeview.cc index 23175204acd..9f446cb9cbb 100644 --- a/gcc/dwarf2codeview.cc +++ b/gcc/dwarf2codeview.cc @@ -2293,11 +2293,11 @@ get_type_num_pointer_type (dw_die_ref type, bool in_struct) return ct->num; } -/* Process a DW_TAG_reference_type DIE, add a new LF_POINTER type, and return - its number. */ +/* Process a DW_TAG_reference_type or DW_TAG_rvalue_reference_type DIE, add a + new LF_POINTER type, and return its number. */ static uint32_t -get_type_num_reference_type (dw_die_ref type, bool in_struct) +get_type_num_reference_type (dw_die_ref type, bool in_struct, bool rvref) { uint32_t base_type_num, byte_size; dw_die_ref base_type; @@ -2318,7 +2318,7 @@ get_type_num_reference_type (dw_die_ref type, bool in_struct) ct->next = NULL; ct->kind = LF_POINTER; ct->lf_pointer.base_type = base_type_num; - ct->lf_pointer.attributes = CV_PTR_MODE_LVREF; + ct->lf_pointer.attributes = rvref? CV_PTR_MODE_RVREF : CV_PTR_MODE_LVREF; if (byte_size == 4) ct->lf_pointer.attributes |= CV_PTR_NEAR32; @@ -3064,6 +3064,7 @@ get_type_num_array_type (dw_die_ref type, bool in_struct) case DW_TAG_union_type: case DW_TAG_pointer_type: case DW_TAG_reference_type: + case DW_TAG_rvalue_reference_type: size = get_AT_unsigned (t, DW_AT_byte_size); break; @@ -3192,7 +3193,11 @@ get_type_num (dw_die_ref type, bool in_struct, bool no_fwd_ref) break; case DW_TAG_reference_type: - num = get_type_num_reference_type (type, in_struct); + num = get_type_num_reference_type (type, in_struct, false); + break; + + case DW_TAG_rvalue_reference_type: + num = get_type_num_reference_type (type, in_struct, true); break; case DW_TAG_const_type: diff --git a/gcc/dwarf2codeview.h b/gcc/dwarf2codeview.h index 7d4e3ab1db4..8ede1b29529 100644 --- a/gcc/dwarf2codeview.h +++ b/gcc/dwarf2codeview.h @@ -56,6 +56,7 @@ along with GCC; see the file COPYING3. If not see #define CV_PTR_NEAR32 0x0a #define CV_PTR_64 0x0c #define CV_PTR_MODE_LVREF 0x20 +#define CV_PTR_MODE_RVREF 0x80 /* LF_MODIFIER values. */ #define MOD_const 0x1