From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 4D8DC3858D1E for ; Sat, 15 Oct 2022 03:59:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4D8DC3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29F3P2bh026717 for ; Sat, 15 Oct 2022 03:59:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=Pyvc9TidgqMgjxE3vSkgygcHIDzMJSq0GdyRAe6DlCA=; b=Jd9aIsYpy5aXXKPCKN/bPIDkf63+J5BWgpwhpj0ri5KvnXLYMeZLqOa1sz4ApcBjfHB5 LrYX2NgSYSNUZFRTKyxYNNeVTTyUbKDq4ZlJWjUa4oKzdo4FwPOZCsHmh5XcGUG6xntr FO0y/QCQy44FGvVG69d6TEoGEqRxYFtZJK+9toNW3UX38PORiJ70w5JT1imjOgQGan0z EcUXWMNFpu3Jtfb2vQDI6lQTOhZuEv8/hwHAItIvy1czRPigwFVuGRwNeJD8AlCWqg/y LGL9PzxwU3dVV6F76I6dshI3JYVQyNeI8CZVK8izfU9cNks8STa5FjPwYfn8or5fCfyD Cg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3k7mtd00v6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 15 Oct 2022 03:59:27 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29F3DImF028583 for ; Sat, 15 Oct 2022 03:56:09 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2049.outbound.protection.outlook.com [104.47.66.49]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3k7ka21h5h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 15 Oct 2022 03:56:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gr2HFct9WPycyIsSoZZ/uRDde8jrsIcFUbRPV4YhWGow65E2kI9EQsPK1m3RRJcedpxHUuAkj6keMjo9uySNAY7y8CGM+9NB2TJoGdqpOjXia9qcte4DBCyrT4T8WPBn6VdSFrm2lLXH6z2FJ1rnXLVoUGIvSFO2GNdEkNkhTHgXbPbyDDNnddB6iCkQ+p7Cl1za9gXGpsdBxzulMogW6XRu6sKreGOVk8o0+O+MfQNwH8uIn3EKEXwESKkR1wisgMb5vBcp7mDHzPCVq07znbvXJAu/ELQZBMmUfB/HeR+yBEYWZBcgJqy7yoyetj/iEGJDcDyJwfEWFhx0cWLEsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Pyvc9TidgqMgjxE3vSkgygcHIDzMJSq0GdyRAe6DlCA=; b=Dg1aXMsq1nnOBiy15bQPFVm7y0Hx127GrSa68/YxNhO/a6/SDwLs9feePjdnL9CVWx1uFs2mgC4ijX6ztyc7VFy+RU+Sesp+qARGy4kvFu1neh/xWl0ZGvymrnKLb9P5XTrwwFgiwBjMB3RyE9Hdu2imoaVIvn2ut+kuO8CkrJx+f+asUzm0ve24bKvIRRRFenR8lZOoYcgvp91ruwzOoHisXUQzThcLxdM1ZTcnKKMDjjSIxOhxGyEgFajL4P0dn3ixREOCfyN/6UbeiwEAst8C8sVIB69ijYZXOKpLghC8WNMq57ZP6fBtQ0Vzen/HyElMxRo1Ca2rE/G426/7fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Pyvc9TidgqMgjxE3vSkgygcHIDzMJSq0GdyRAe6DlCA=; b=zMxAzOWMnUex/JdbEkvFevvX23ginEGV2f0AUKYW2ylTaXgdASh3FNVbv59VG6rkpB/nXucsxWI9oyM2fEKU+19PLnsW5ZHneZGZv4/LWN/nSwVM85RYfHxDkcY+gBb93uvCoM5j7CpAe7C2U2h4/fevJwkA8BbLWhkNFbqiWaY= Received: from MWHPR10MB1407.namprd10.prod.outlook.com (2603:10b6:300:23::20) by DS7PR10MB5101.namprd10.prod.outlook.com (2603:10b6:5:3b0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Sat, 15 Oct 2022 03:56:07 +0000 Received: from MWHPR10MB1407.namprd10.prod.outlook.com ([fe80::d05e:773d:2a05:eaed]) by MWHPR10MB1407.namprd10.prod.outlook.com ([fe80::d05e:773d:2a05:eaed%2]) with mapi id 15.20.5723.029; Sat, 15 Oct 2022 03:56:06 +0000 From: "Guillermo E. Martinez" To: gcc-patches@gcc.gnu.org Cc: indu.bhagat@oracle.com, david.faust@oracle.com, "Guillermo E. Martinez" Subject: [PATCH v3] btf: Add support to BTF_KIND_ENUM64 type Date: Fri, 14 Oct 2022 22:55:48 -0500 Message-Id: <20221015035548.274704-1-guillermo.e.martinez@oracle.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220928211501.2647123-1-guillermo.e.martinez@oracle.com> References: <20220928211501.2647123-1-guillermo.e.martinez@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SN7PR04CA0236.namprd04.prod.outlook.com (2603:10b6:806:127::31) To MWHPR10MB1407.namprd10.prod.outlook.com (2603:10b6:300:23::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR10MB1407:EE_|DS7PR10MB5101:EE_ X-MS-Office365-Filtering-Correlation-Id: 63ed0a86-a948-48d3-2f32-08daae612ff7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iTW0ktlEBczvq/lzCp4tqvLDXEHKbkU/ygt95DcuzNubfzGUUvUJsVlGl7Iw1tfI3peolKxwYaoSAD/IkD4kpSfkOJPEY0V6zKMbA9XbF8X3LMMDhbxcFWp2vaVNwvusy4BMmUABumz1D9DS3mfLI+5SSToVb3q4YRcE3MQCf14OzmjBC6Nu/AxyWCN6YrLlD8XUk2TOaQhnGDFjXaheBJqFasHbepBOuF+XlafHLvpsdlvgqcl8hhlEjsyvEnWAoIaY+FKCYg4rNFjaJb6iDPIZ5uQEvRSL963IUXbec+bmJOB8/8nt89YMQmiJAE2RoI2Pl7V2p8/KUchBRhl7veNmLabaELIU1X2Hta7Zqa3k/+p9qUfWffKWlY2VZOqQeVNI+pJUXjJ42/RYbAmkhNN1DoL1rjBakCuElbA+zAoGOTXOCGvX7Dh4vqDNUZV9N97JUqBwandDark31f//mei3NrVQNOVH5SrT+LIjDQeyAyjlxgxM6Dh2Lr2aV3i+5SsPZas0Gx/GBne7LcLIEbgXV4V5m5+xOCxV2QGfnUrB4rJFguB3S/OlezkE2nQui1A6g2J+Zd7f7vyQ+nqJS897RKCMFQhw6tyjQIgs1KIsVR/ncGGoMBnri3Z0wLbDKsFL4H4OlFptjXNv9UvKjKvWxrG0Q8AKBtwUwqkrWt5AfCN5B5k8jBwE0pUU5fA3MyZ9yPaVXyOSonbA8t0FZuJJzoGSG63oUtH41kmqVk9fpsXUsvnSheRVMLG4B/fAcY/26BMJXtaqKdS2iAVXRQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR10MB1407.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(136003)(346002)(396003)(376002)(451199015)(66899015)(2616005)(186003)(1076003)(316002)(6506007)(6512007)(41300700001)(6916009)(36756003)(6666004)(107886003)(38100700002)(103116003)(2906002)(66476007)(5660300002)(8936002)(83380400001)(66946007)(4326008)(66556008)(86362001)(8676002)(84970400001)(6486002)(478600001)(30864003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QDPifpwIfYFX62oGfMbo5rORp8ICfBVc97k5mDqAnR81Ws9FroONu/LaGzcg?= =?us-ascii?Q?BIkAAWRLLQhuZsrAXUi3RlVz3ZgTM4i1OSayzOOHZeJzjrJ9ROBLLge6zdbE?= =?us-ascii?Q?MlyBvyxW5VLPxBjbFDXV9FPc1WgUko3v7QaoxrrJmDanarpiGm1YhzvEG2we?= =?us-ascii?Q?/WEMKeFw7Bw2BWKP/b1CgwEUMWy/olW/pew1d9CrFJYDaQ3OQysO5eDFvXgG?= =?us-ascii?Q?Msm1mwP3SoZSwnMQnDTo9jmiFzWy/XjW4Y/mJNY5Igp3SylgxcjVaryyuOwp?= =?us-ascii?Q?Ia9HkMgS00uDCFWWW3vE/cRhsIscTZmSlHJVYSqGiCFSqENuf5mQy0a8YSSh?= =?us-ascii?Q?xcbYSq69Fz56GKORHOAtLj5RwLnqkEyTnXsm119AR/6W4H7Up/HucxkWjfS3?= =?us-ascii?Q?Wfh38KCh7oIIAFgnH2YNozPRl/2QyH3c0hW6VIJjUmVUZd4jmlqvM4jP4DYc?= =?us-ascii?Q?9UW+e5A8LIRYW9XW8KHTqpSylleizjR4CfRV8ykE2vT7I6SJ2971QF/8Qog5?= =?us-ascii?Q?pGu+jIoz4sWBO1vYaLAW9afV+9hHFTNgnWA6OzB2G5XrZazNMAQvVefe5Pl1?= =?us-ascii?Q?GnB5p++4xwvDCTUxKJyE7gm/DIA+xO2nppCdBGDGe5a6S01W2We2C8mVir5x?= =?us-ascii?Q?EhPC8Xqs5pwTVjShp3QIlJ7CLZAvphaedM2V9h5nEkAIKc1mEFWAWOJIPtWM?= =?us-ascii?Q?THghZCQIBUXwjWiffAY83oEmzO2hf/8mP1QUuhV8TFNaMuqk9EdoAn4KwnP1?= =?us-ascii?Q?ItUVsHFx6bp3BPvEcB4AU54Q3895L+2sCq/7JlLFbJCa1HpAWSKDV6A8Sf+m?= =?us-ascii?Q?G65zCm7Nw1D8jeEYnhHuMHGOCP5O/vc+I+hZBCrseT5I4p8XBdkS2fXIcF7X?= =?us-ascii?Q?WPIm0VEuF326p7uiJPp4spqtvNa9ZjS36Wo2vVY4z29Dbxc/k282lyPoTKBz?= =?us-ascii?Q?MwMjO8YPtrqJQ4BRf5I5bogoaXOc9dTWwytKJBVo9XDuFv0a19Qfmc2W+06Z?= =?us-ascii?Q?skiGS0A8Pds6Cy+yZliybVdEc/VRjFWOezxlH8MH4xR/8JGKPStPVUALhvEi?= =?us-ascii?Q?A5fi+16vECY3CS3fhe2v0eS9Fv2XwgOU8Er/JQdprGmElGAWvShsFGutT6wI?= =?us-ascii?Q?0ac9YcSy2LX3auatgYXZDVOu78E5CF4TRKA3C23cWyYHbAOn6hA6U5JOmWUP?= =?us-ascii?Q?vn87CETdoaVbHO24vQh8gDHldQm2wzA0JifiY3nMlrlp8v+/xzdfGtzPdyJM?= =?us-ascii?Q?gUD0VKyVFtwjh6bPuwQtiEFCtgt12kfddppgK0+LuQ0JP2oI0wtvq81tZ985?= =?us-ascii?Q?ImcEb0gX8K8qNAGUwAXeDyTOfNrPgkYf0EUa/Bxr26E4rJuB3LWEpz9KdSz0?= =?us-ascii?Q?HTT1S/qP6/S5NJsQj+DqHeljr7AGpMa7lIPg6A9HliDokoAkN/xv/R6m37NJ?= =?us-ascii?Q?WXC0za0fuAK4Zc+Cq+R7aaKvpAwv/X7OqsMeyBgiPoRCyfkdkHn3nlAkKO60?= =?us-ascii?Q?RaU9FI1rhNJi//2R8qMtnbEQ4aP7KyN4R4VeOn+t6lZWtVKdOB7UDTAVMPv6?= =?us-ascii?Q?uxJ44j6HHnO9sZStwdAflqLz90/kcPS7NGCzIEa2d+piOSIpQ1pmr2GeLUlI?= =?us-ascii?Q?/la2BldZCHJxsCFcU1VuqojryoIH0F596gGjXLrs19zrddK8eat8CYkybbTy?= =?us-ascii?Q?sqhWQxj8jHi2NGtuCUwZ5e7Oy5U=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63ed0a86-a948-48d3-2f32-08daae612ff7 X-MS-Exchange-CrossTenant-AuthSource: MWHPR10MB1407.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2022 03:56:06.8479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tZZr5/DDGGInmdpcS84juyI5lij638udcEaZaBMNvTtsyMh3ZCEqRfz31zVigWSOuexge0jXkSrtSZtKuyYqc7PlfZyhMqcrR6LIuB83ywU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5101 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-15_01,2022-10-14_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210150021 X-Proofpoint-GUID: AMYAs9B_wpcz7ZP88Qm_sajNNMzwFhZM X-Proofpoint-ORIG-GUID: AMYAs9B_wpcz7ZP88Qm_sajNNMzwFhZM 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_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: Hello, The following is patch v3 to update BTF/CTF backend supporting BTF_KIND_ENUM64 type. Changes from v2: + Add a new `dtd_enum_unsigned' field in `ctf_dtdef' to indicate signedness of the enum type. + Fix endianness for representing BTF enum 64-bits enumerators. + Add {little,big}-endian testcases. Comments will be welcomed and appreciated!, Kind regards, guillermo -- BTF supports 64-bits enumerators with following encoding: struct btf_type: name_off: 0 or offset to a valid C identifier info.kind_flag: 0 for unsigned, 1 for signed info.kind: BTF_KIND_ENUM64 info.vlen: number of enum values size: 1/2/4/8 The btf_type is followed by info.vlen number of: struct btf_enum64 { uint32_t name_off; /* Offset in string section of enumerator name. */ uint32_t val_lo32; /* lower 32-bit value for a 64-bit value Enumerator */ uint32_t val_hi32; /* high 32-bit value for a 64-bit value Enumerator */ }; So, a new btf_enum64 structure was added to represent BTF_KIND_ENUM64 and a new field dtd_enum_unsigned in ctf_dtdef structure to distinguish when CTF enum is a signed or unsigned type, later that information is used to encode the BTF enum type. gcc/ChangeLog: * btfout.cc (btf_calc_num_vbytes): Compute enumeration size depending of enumerator type btf_enum{,64}. (btf_asm_type): Update btf_kflag according to enumeration type sign using dtd_enum_unsigned field for both: BTF_KIND_ENUM{,64}. (btf_asm_enum_const): New argument to represent the size of the BTF enum type, writing the enumerator constant value for 32 bits, if it's 64 bits then explicitly writes lower 32-bits value and higher 32-bits value. (output_asm_btf_enum_list): Add enumeration size argument. * ctfc.cc (ctf_add_enum): New argument to represent CTF enum basic information. (ctf_add_generic): Use of ei_{name. size, unsigned} to build the dtd structure containing enumeration information. (ctf_add_enumerator): Update comment mention support for BTF enumeration in 64-bits. * ctfc.h (ctf_dmdef): Update dmd_value to HOST_WIDE_INT to allow use 32/64 bits enumerators. (ctf_enum_binfo): New type to represent CTF basic enum type information. (ctf_dtdef): New field to describe enum signedness. * dwarf2ctf.cc (gen_ctf_enumeration_type): Use of ctf_enum_binfo type to pass information to ctf_add_enum to build the enum type. include/ * btf.h (btf_enum64): Add new definition and new symbolic constant to BTF_KIND_ENUM64 and BTF_KF_ENUM_{UN,}SIGNED. gcc/testsuite/ChangeLog: * gcc.dg/debug/btf/btf-enum-1.c: Update testcase, with correct info.kflags encoding. * gcc.dg/debug/btf/btf-enum64-be-1.c: New testcase. * gcc.dg/debug/btf/btf-enum64-le-1.c: New testcase. --- gcc/btfout.cc | 30 ++++++++++--- gcc/ctfc.cc | 22 +++++----- gcc/ctfc.h | 15 +++++-- gcc/dwarf2ctf.cc | 8 +++- gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c | 2 +- .../gcc.dg/debug/btf/btf-enum64-be-1.c | 44 +++++++++++++++++++ .../gcc.dg/debug/btf/btf-enum64-le-1.c | 44 +++++++++++++++++++ include/btf.h | 19 ++++++-- 8 files changed, 160 insertions(+), 24 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/debug/btf/btf-enum64-be-1.c create mode 100644 gcc/testsuite/gcc.dg/debug/btf/btf-enum64-le-1.c diff --git a/gcc/btfout.cc b/gcc/btfout.cc index 997a33fa089..aef9fd70a28 100644 --- a/gcc/btfout.cc +++ b/gcc/btfout.cc @@ -223,7 +223,9 @@ btf_calc_num_vbytes (ctf_dtdef_ref dtd) break; case BTF_KIND_ENUM: - vlen_bytes += vlen * sizeof (struct btf_enum); + vlen_bytes += (dtd->dtd_data.ctti_size == 0x8) + ? vlen * sizeof (struct btf_enum64) + : vlen * sizeof (struct btf_enum); break; case BTF_KIND_FUNC_PROTO: @@ -622,6 +624,15 @@ btf_asm_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd) btf_size_type = 0; } + if (btf_kind == BTF_KIND_ENUM) + { + btf_kflag = dtd->dtd_enum_unsigned + ? BTF_KF_ENUM_UNSIGNED + : BTF_KF_ENUM_SIGNED; + if (dtd->dtd_data.ctti_size == 0x8) + btf_kind = BTF_KIND_ENUM64; + } + dw2_asm_output_data (4, dtd->dtd_data.ctti_name, "btt_name"); dw2_asm_output_data (4, BTF_TYPE_INFO (btf_kind, btf_kflag, btf_vlen), "btt_info: kind=%u, kflag=%u, vlen=%u", @@ -634,6 +645,7 @@ btf_asm_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd) case BTF_KIND_UNION: case BTF_KIND_ENUM: case BTF_KIND_DATASEC: + case BTF_KIND_ENUM64: dw2_asm_output_data (4, dtd->dtd_data.ctti_size, "btt_size: %uB", dtd->dtd_data.ctti_size); return; @@ -707,13 +719,19 @@ btf_asm_sou_member (ctf_container_ref ctfc, ctf_dmdef_t * dmd) } } -/* Asm'out an enum constant following a BTF_KIND_ENUM. */ +/* Asm'out an enum constant following a BTF_KIND_ENUM{,64}. */ static void -btf_asm_enum_const (ctf_dmdef_t * dmd) +btf_asm_enum_const (unsigned int size, ctf_dmdef_t * dmd) { dw2_asm_output_data (4, dmd->dmd_name_offset, "bte_name"); - dw2_asm_output_data (4, dmd->dmd_value, "bte_value"); + if (size == 4) + dw2_asm_output_data (size, dmd->dmd_value, "bte_value"); + else + { + dw2_asm_output_data (4, dmd->dmd_value & 0xffffffff, "bte_value_lo32"); + dw2_asm_output_data (4, (dmd->dmd_value >> 32) & 0xffffffff, "bte_value_hi32"); + } } /* Asm'out a function parameter description following a BTF_KIND_FUNC_PROTO. */ @@ -871,7 +889,7 @@ output_asm_btf_sou_fields (ctf_container_ref ctfc, ctf_dtdef_ref dtd) btf_asm_sou_member (ctfc, dmd); } -/* Output all enumerator constants following a BTF_KIND_ENUM. */ +/* Output all enumerator constants following a BTF_KIND_ENUM{,64}. */ static void output_asm_btf_enum_list (ctf_container_ref ARG_UNUSED (ctfc), @@ -881,7 +899,7 @@ output_asm_btf_enum_list (ctf_container_ref ARG_UNUSED (ctfc), for (dmd = dtd->dtd_u.dtu_members; dmd != NULL; dmd = (ctf_dmdef_t *) ctf_dmd_list_next (dmd)) - btf_asm_enum_const (dmd); + btf_asm_enum_const (dtd->dtd_data.ctti_size, dmd); } /* Output all function arguments following a BTF_KIND_FUNC_PROTO. */ diff --git a/gcc/ctfc.cc b/gcc/ctfc.cc index 9773358a475..80322eea91a 100644 --- a/gcc/ctfc.cc +++ b/gcc/ctfc.cc @@ -576,8 +576,8 @@ ctf_add_array (ctf_container_ref ctfc, uint32_t flag, const ctf_arinfo_t * arp, } ctf_id_t -ctf_add_enum (ctf_container_ref ctfc, uint32_t flag, const char * name, - HOST_WIDE_INT size, dw_die_ref die) +ctf_add_enum (ctf_container_ref ctfc, uint32_t flag, + const ctf_enum_binfo_t *ei, dw_die_ref die) { ctf_dtdef_ref dtd; ctf_id_t type; @@ -595,16 +595,16 @@ ctf_add_enum (ctf_container_ref ctfc, uint32_t flag, const char * name, = CTF_TYPE_INFO (CTF_K_FORWARD, CTF_ADD_NONROOT, 0); } - type = ctf_add_generic (ctfc, flag, name, &dtd, die); + type = ctf_add_generic (ctfc, flag, ei->ei_name, &dtd, die); dtd->dtd_data.ctti_info = CTF_TYPE_INFO (CTF_K_ENUM, flag, 0); /* Size in bytes should always fit, of course. TBD WARN - warn instead? */ - gcc_assert (size <= CTF_MAX_SIZE); - - dtd->dtd_data.ctti_size = size; + gcc_assert (ei->ei_size <= CTF_MAX_SIZE); + dtd->dtd_data.ctti_size = ei->ei_size; + dtd->dtd_enum_unsigned = ei->ei_unsigned; ctfc->ctfc_num_stypes++; return type; @@ -630,10 +630,12 @@ ctf_add_enumerator (ctf_container_ref ctfc, ctf_id_t enid, const char * name, gcc_assert (kind == CTF_K_ENUM && vlen < CTF_MAX_VLEN); - /* Enum value is of type HOST_WIDE_INT in the compiler, dmd_value is int32_t - on the other hand. Check bounds and skip adding this enum value if out of - bounds. */ - if ((value > INT_MAX) || (value < INT_MIN)) + /* Enum value is of type HOST_WIDE_INT in the compiler, CTF enumerators + values in ctf_enum_t is limited to int32_t, BTF supports signed and + unsigned enumerators values of 32 and 64 bits, for both debug formats + we use ctf_dmdef_t.dmd_value entry of HOST_WIDE_INT type. So check + CTF bounds and skip adding this enum value if out of bounds. */ + if (!btf_debuginfo_p() && ((value > INT_MAX) || (value < INT_MIN))) { /* FIXME - Note this TBD_CTF_REPRESENTATION_LIMIT. */ return (1); diff --git a/gcc/ctfc.h b/gcc/ctfc.h index bcf3a43ae1b..d3f50454385 100644 --- a/gcc/ctfc.h +++ b/gcc/ctfc.h @@ -125,6 +125,14 @@ typedef struct GTY (()) ctf_itype #define CTF_FUNC_VARARG 0x1 +/* Basic enum information to build ctf_dmdef_t type. */ +typedef struct ctf_enum_binfo +{ + const char * ei_name; + unsigned int ei_size; /* Size in bytes. */ + bool ei_unsigned; +} ctf_enum_binfo_t; + /* Struct/union/enum member definition for CTF generation. */ typedef struct GTY ((chain_next ("%h.dmd_next"))) ctf_dmdef @@ -133,7 +141,7 @@ typedef struct GTY ((chain_next ("%h.dmd_next"))) ctf_dmdef ctf_id_t dmd_type; /* Type of this member (for sou). */ uint32_t dmd_name_offset; /* Offset of the name in str table. */ uint64_t dmd_offset; /* Offset of this member in bits (for sou). */ - int dmd_value; /* Value of this member (for enum). */ + HOST_WIDE_INT dmd_value; /* Value of this member (for enum). */ struct ctf_dmdef * dmd_next; /* A list node. */ } ctf_dmdef_t; @@ -162,6 +170,7 @@ struct GTY ((for_user)) ctf_dtdef bool from_global_func; /* Whether this type was added from a global function. */ uint32_t linkage; /* Used in function types. 0=local, 1=global. */ + bool dtd_enum_unsigned; /* Enum signedness. */ union GTY ((desc ("ctf_dtu_d_union_selector (&%1)"))) { /* struct, union, or enum. */ @@ -405,8 +414,8 @@ extern const char * ctf_add_string (ctf_container_ref, const char *, extern ctf_id_t ctf_add_reftype (ctf_container_ref, uint32_t, ctf_id_t, uint32_t, dw_die_ref); -extern ctf_id_t ctf_add_enum (ctf_container_ref, uint32_t, const char *, - HOST_WIDE_INT, dw_die_ref); +extern ctf_id_t ctf_add_enum (ctf_container_ref, uint32_t, + const ctf_enum_binfo_t *, dw_die_ref); extern ctf_id_t ctf_add_slice (ctf_container_ref, uint32_t, ctf_id_t, uint32_t, uint32_t, dw_die_ref); extern ctf_id_t ctf_add_float (ctf_container_ref, uint32_t, const char *, diff --git a/gcc/dwarf2ctf.cc b/gcc/dwarf2ctf.cc index 397100004c2..56dfcadd3fb 100644 --- a/gcc/dwarf2ctf.cc +++ b/gcc/dwarf2ctf.cc @@ -736,6 +736,7 @@ gen_ctf_enumeration_type (ctf_container_ref ctfc, dw_die_ref enumeration) { const char *enum_name = get_AT_string (enumeration, DW_AT_name); unsigned int bit_size = ctf_die_bitsize (enumeration); + unsigned int signedness = get_AT_unsigned (enumeration, DW_AT_encoding); int declaration_p = get_AT_flag (enumeration, DW_AT_declaration); ctf_id_t enumeration_type_id; @@ -757,9 +758,14 @@ gen_ctf_enumeration_type (ctf_container_ref ctfc, dw_die_ref enumeration) bit_size = ctf_die_bitsize (type); } + ctf_enum_binfo_t ei; + ei.ei_name = enum_name; + ei.ei_size = bit_size / 8; + ei.ei_unsigned = (signedness == DW_ATE_unsigned); + /* Generate a CTF type for the enumeration. */ enumeration_type_id = ctf_add_enum (ctfc, CTF_ADD_ROOT, - enum_name, bit_size / 8, enumeration); + &ei, enumeration); /* Process the enumerators. */ { diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c index 728493b0804..7e940529f1b 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum-1.c @@ -4,7 +4,7 @@ /* { dg-options "-O0 -gbtf -dA" } */ /* { dg-final { scan-assembler-times "\[\t \]0x6000004\[\t \]+\[^\n\]*btt_info" 1 } } */ -/* { dg-final { scan-assembler-times "\[\t \]0x6000003\[\t \]+\[^\n\]*btt_info" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x86000003\[\t \]+\[^\n\]*btt_info" 1 } } */ /* { dg-final { scan-assembler-times "ascii \"QAD.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ /* { dg-final { scan-assembler-times "ascii \"QED.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ /* { dg-final { scan-assembler-times "ascii \"QOD.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-be-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-be-1.c new file mode 100644 index 00000000000..40d44556e16 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-be-1.c @@ -0,0 +1,44 @@ +/* Test BTF generation for 64 bits enums. */ + +/* { dg-do compile } */ +/* { dg-options "-O0 -gbtf -dA -mbig-endian" } */ + +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum1,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum2,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum3,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x13000003\[\t \]+\[^\n\]*btt_info" 2 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x93000003\[\t \]+\[^\n\]*btt_info" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0xffffffaa\[\t \]+\[^\n\]*bte_value_lo32" 2 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0xff\[\t \]+\[^\n\]*bte_value_hi32" 3 } } */ +/* { dg-final { scan-assembler-times "ascii \"B1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"B2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"B3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"C1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"C2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"C3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"D1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"D2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"D3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "bte_value_lo32" 9 } } */ +/* { dg-final { scan-assembler-times "bte_value_hi32" 9 } } */ + +enum default_enum +{ + B1 = 0xffffffffaa, + B2 = 0xbbbbbbbb, + B3 = 0xaabbccdd, +} myenum1 = B1; + +enum explicit_unsigned +{ + C1 = 0xffffffffbbUL, + C2 = 0xbbbbbbbb, + C3 = 0xaabbccdd, +} myenum2 = C1; + +enum signed64 +{ + D1 = 0xffffffffaa, + D2 = 0xbbbbbbbb, + D3 = -0x1, +} myenum3 = D1; diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-le-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-le-1.c new file mode 100644 index 00000000000..873a50ea174 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-le-1.c @@ -0,0 +1,44 @@ +/* Test BTF generation for 64 bits enums. */ + +/* { dg-do compile } */ +/* { dg-options "-O0 -gbtf -dA -mlittle-endian" } */ + +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum1,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum2,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum3,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x13000003\[\t \]+\[^\n\]*btt_info" 2 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x93000003\[\t \]+\[^\n\]*btt_info" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0xffffffaa\[\t \]+\[^\n\]*bte_value_lo32" 2 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0xff\[\t \]+\[^\n\]*bte_value_hi32" 3 } } */ +/* { dg-final { scan-assembler-times "ascii \"B1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"B2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"B3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"C1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"C2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"C3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"D1.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"D2.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"D3.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ +/* { dg-final { scan-assembler-times "bte_value_lo32" 9 } } */ +/* { dg-final { scan-assembler-times "bte_value_hi32" 9 } } */ + +enum default_enum +{ + B1 = 0xffffffffaa, + B2 = 0xbbbbbbbb, + B3 = 0xaabbccdd, +} myenum1 = B1; + +enum explicit_unsigned +{ + C1 = 0xffffffffbbUL, + C2 = 0xbbbbbbbb, + C3 = 0xaabbccdd, +} myenum2 = C1; + +enum signed64 +{ + D1 = 0xffffffffaa, + D2 = 0xbbbbbbbb, + D3 = -0x1, +} myenum3 = D1; diff --git a/include/btf.h b/include/btf.h index 78b551ced23..eba67f9d599 100644 --- a/include/btf.h +++ b/include/btf.h @@ -109,7 +109,8 @@ struct btf_type #define BTF_KIND_VAR 14 /* Variable. */ #define BTF_KIND_DATASEC 15 /* Section such as .bss or .data. */ #define BTF_KIND_FLOAT 16 /* Floating point. */ -#define BTF_KIND_MAX BTF_KIND_FLOAT +#define BTF_KIND_ENUM64 19 /* Enumeration up to 64 bits. */ +#define BTF_KIND_MAX BTF_KIND_ENUM64 #define NR_BTF_KINDS (BTF_KIND_MAX + 1) /* For some BTF_KINDs, struct btf_type is immediately followed by @@ -130,14 +131,17 @@ struct btf_type #define BTF_INT_BOOL (1 << 2) /* BTF_KIND_ENUM is followed by VLEN struct btf_enum entries, - which describe the enumerators. Note that BTF currently only - supports signed 32-bit enumerator values. */ + which describe the enumerators. */ struct btf_enum { uint32_t name_off; /* Offset in string section of enumerator name. */ int32_t val; /* Enumerator value. */ }; +/* BTF_KF_ENUM_ holds the flags for kflags in BTF_KIND_ENUM{,64}. */ +#define BTF_KF_ENUM_UNSIGNED (0) +#define BTF_KF_ENUM_SIGNED (1 << 0) + /* BTF_KIND_ARRAY is followed by a single struct btf_array. */ struct btf_array { @@ -190,6 +194,15 @@ struct btf_var_secinfo uint32_t size; /* Size (in bytes) of variable. */ }; +/* BTF_KIND_ENUM64 is followed by VLEN struct btf_enum64 entries, + which describe the 64 bits enumerators. */ +struct btf_enum64 +{ + uint32_t name_off; /* Offset in string section of enumerator name. */ + uint32_t val_lo32; /* lower 32-bit value for a 64-bit value Enumerator */ + uint32_t val_hi32; /* high 32-bit value for a 64-bit value Enumerator */ +}; + #ifdef __cplusplus } #endif -- 2.35.1