From patchwork Mon Jun 3 09:42:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Faulls X-Patchwork-Id: 91391 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 79857396DC18 for ; Mon, 3 Jun 2024 09:43:12 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx08-00376f01.pphosted.com (mx08-00376f01.pphosted.com [91.207.212.86]) by sourceware.org (Postfix) with ESMTPS id 0566C3858C53 for ; Mon, 3 Jun 2024 09:42:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0566C3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=imgtec.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=imgtec.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0566C3858C53 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=91.207.212.86 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1717407764; cv=pass; b=t/4+t4Xyw+im93tKKZwJDFJFK94JcCngNO4LIj1rnQ+3UjiBsSUrD+dltntKiTKPeQQAAEvtWf4poJlZ13p+xTMqaBdnUBQuJYuyphHm2O4pULrvezXSozTGv6rJSKAeI945sk21l+BFc673q4WnfXS7LTXPtzJ3swQkSFR5qms= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1717407764; c=relaxed/simple; bh=dq91iPqBMu89P4qG5Ncm12t9y64CGRyLxdTAt98GgS0=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=iPgfSTwfMCDFJHw1QNtEmKp0zaTFt5Wih/LYWzbM37TQ9T7RKIsl0Mrh3Uy98giFrHBAZpGISkf9DnVWLWOTSwD1iNmumKWb90cK8G7XTnU1D6YDzp9b/Zcawi+6eGosV3iT19ieSvQ0p7q6RqBjjSn9qvRQ51UqJrMgI6842NM= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0168888.ppops.net [127.0.0.1]) by mx08-00376f01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4535WU7S026871; Mon, 3 Jun 2024 10:42:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=imgtec.com; h=cc :content-type:date:from:message-id:mime-version:subject:to; s= dk201812; bh=n+TxvMBPK7w0N0MHW+eIoprYzseelUs2N2eSHPG1Su4=; b=tsO ER/+BggfFD4rFohJmKscvD9iCndRWUmevmG0SXHa8bJkwZIvNT0jfFUafmi46QU7 RKhrqFaDjHAXbDdqp376grKTQFkLWElNV97suzt5SgT014pWW5x00MAfa42TnaQ1 9YnRtUlGRvYvbGKXUq2TtgITrTrq92Mv6laRvRo8IB8F1P2Li67CMMAFu8aXCk55 ZLN73Y3Djei4BmWWRTeFdrD8f52VOwiY3r3KfhFriFOsv3P58qgPYUnhjsjE5mxR op3lYH3hwzfNXocjWBrP+JUm9k4Q0dpWGh3Kpl3GBMypuYUTL9xhvmwdSY/t9CNt IjwHQEdCt7oPRjOjtSg== Received: from hhmail05.hh.imgtec.org ([217.156.249.195]) by mx08-00376f01.pphosted.com (PPS) with ESMTPS id 3yfswn2k2u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 03 Jun 2024 10:42:38 +0100 (BST) Received: from HHMAIL04.hh.imgtec.org (10.100.10.119) by HHMAIL05.hh.imgtec.org (10.100.10.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.37; Mon, 3 Jun 2024 10:42:37 +0100 Received: from GBR01-LO4-obe.outbound.protection.outlook.com (104.47.85.105) by email.imgtec.com (10.100.10.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.37 via Frontend Transport; Mon, 3 Jun 2024 10:42:37 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y7tXRlMhJIi2BkrC0iRTlPC3R/97Ggi6V4zbazwniLpC/vrtTZl8LWI2ARUhaHPtJ707MRX/zrPfhiDHBhR7sWcbUTg5uFnBaYqEPGTIGoxU0YTzqgu+4p0kehUvuBhUqsGQF7Ogout1pztyhtwT8svj9spAxRaOibck7fS9IbBe3prU5H23Jssayo8mBx7bSlQ30p+wBq3L7zyG7UrPsOP2BsjoYzEOgXUy0fJljPng6lWMYEtcwAL3/nPo6qqKyNXvqYHglwnXvIlmpu3pVKDy5l45cuF/cYPBuFYDVadxKygpXnEydGDUy2wQcKbd0qIeg3QQeZjTTRgApGKoeQ== 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=n+TxvMBPK7w0N0MHW+eIoprYzseelUs2N2eSHPG1Su4=; b=BiCnNcrdNX7pjuppmuuACAWLnm8Xj6pYNM6a8vtA1tjvChMIlWvnfEzfN5AjcX45A/D1g3I3KbUE+cNIMOJHckKFlYfinvKtIMa6GyEwlxVURML49g+RCjJqoFgHdbYMJoFDqnB6fOF9RzDt6C6h1GUD6hlRsACoQge+82GkamLYon4+nDMBIO4lnScog0MXPYBRnpakVfx1mMBipDEusTJ4wSFupkaXfXHpQUXYA4kj/U5jhtZmokl4HnxwFCENCZq0oJ1SA2DlEvMH/zYbFt3VjJga82leyYeImLieL3Pb6+hNuNOWMsHFDs5DNKHoP93+d/+wc9KBSVd3F5SkoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=imgtec.com; dmarc=pass action=none header.from=imgtec.com; dkim=pass header.d=imgtec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=IMGTecCRM.onmicrosoft.com; s=selector2-IMGTecCRM-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n+TxvMBPK7w0N0MHW+eIoprYzseelUs2N2eSHPG1Su4=; b=Jv26OgiCSp9srAxGAaKSzuUlS6+xrcawfU+02cNvr7qa7shH6wVQzZlgAxhgiAL7iUYMq+hh6CfbB4EMSFk7vsZcupjFQGjUSE5BeoK/JRfl7wyljV2wL0/At38NwKPwjUQNeA6U4QMmZ+EwtIe5BXLbiQTbI6ZZVIoaNGvfkss= Received: from LO4P265MB5914.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:29f::11) by LO2P265MB2942.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.27; Mon, 3 Jun 2024 09:42:36 +0000 Received: from LO4P265MB5914.GBRP265.PROD.OUTLOOK.COM ([fe80::1fc4:b848:96cc:7073]) by LO4P265MB5914.GBRP265.PROD.OUTLOOK.COM ([fe80::1fc4:b848:96cc:7073%6]) with mapi id 15.20.7633.021; Mon, 3 Jun 2024 09:42:36 +0000 From: Joseph Faulls To: "binutils@sourceware.org" CC: "palmer@rivosinc.com" , "nelson@rivosinc.com" , "patrick@rivosinc.com" Subject: [PATCH] RISC-V: Do not go beyond a label when disassembling data Thread-Topic: [PATCH] RISC-V: Do not go beyond a label when disassembling data Thread-Index: AQHatZnU6xO4YaAQg0OPjTZVMAspMA== Date: Mon, 3 Jun 2024 09:42:36 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: LO4P265MB5914:EE_|LO2P265MB2942:EE_ x-ms-office365-filtering-correlation-id: 0fecbfed-b4ef-4803-92c8-08dc83b1801a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|366007|376005|1800799015|38070700009; x-microsoft-antispam-message-info: =?iso-8859-1?q?lId9gEM57U6FQGsD7SyVO+Ph7X?= =?iso-8859-1?q?qJ3sO+KCyNl/A8zx0ku/4CZQHWM/Jma3Oc3a5RiRiUpBmBhbFcdPWPrxFw8j?= =?iso-8859-1?q?t2cyqhwBVPjH5b0QTw6HQTICXUE9JMXHNn/SviZVd5lEZpuoBi9e74YmSHEB?= =?iso-8859-1?q?NWNmrZZTbHoN1WJYl/0rphWE95DdWMpxmo2LkjmP4HSTyM0RwuAozAPlC8/K?= =?iso-8859-1?q?BHz8dsRsd0t0dcELKjyQYTkeIz4XyophxWmnhqf8tpbNG77eQWRiHrLzIpWO?= =?iso-8859-1?q?6AyQqU2Y98It6YIMnLqEZyjHKQJZeTzfCO9D8PMOSBHS0GHorhw0VOos6wpy?= =?iso-8859-1?q?nlFaipT0YicJO2CgTS/AcR+rLZ61YczK6/wFd72nQ0gC3KIQ8xFxvc3WfLO/?= =?iso-8859-1?q?0otbBRXBHrcLjX/hIFXfLPSjYUrNWeLE2g19l/2fVzeOqYWv3nMiuEJzdIrQ?= =?iso-8859-1?q?j9wL0T0jiEydnXDPh8UoyWCzF8h56xLYulVQi1eAOHMthmhNisjrIMzNjOxu?= =?iso-8859-1?q?kUoPc0Y+NdlQruNKaBrmjuiyKrsUb5HyjtQbhDPd96FwonXRGWx0u6eBeS2c?= =?iso-8859-1?q?Lsi+piRnqS/ZPTEG4RmmzevBYw2Oxq4EJa6uSjf2wqKzKbOeglllBmkS8LXO?= =?iso-8859-1?q?Q0psbz6OWTR/112NF6clv2TYxpJa3Yzai7MWCYpZgrweyy3K2tgHR58wr0wv?= =?iso-8859-1?q?J3gd/YXSt38mUvNtsPenA9TSQ4YLe/D+ozh04by0hrrs6OD3JEy37TgLacz4?= =?iso-8859-1?q?yJacNttgYcWZF1jLNazf3gHgOLuhHe9ap8umSsBkTXqwjWa2BOkIqzKm7cx1?= =?iso-8859-1?q?clSwQynMfstmiAIZlkwkME3T0B26ETno/9J2MJkIiDJOhwtghdxgAIYfqMJp?= =?iso-8859-1?q?yCcc8kYM96c0OjJNf87K4jRysz26h8mX8CGxdT3RCD32jDh4QfWa9tUDraB9?= =?iso-8859-1?q?r0x19IQ3M/Tr5G32P7FjIj3SBppmnWWAtvp7AKf1++VyMlZqVyN1zCjBADJD?= =?iso-8859-1?q?B90BuONHPjQnJZ3Drhh7mGjfEwia6kdSugw759K1/Vf4CvEWcm5J2RdeGarh?= =?iso-8859-1?q?rc+aFMzbGLTQ8nzMAG3PosMitqXy6177FE8GxMltFAmACsZkaDx8wzsHZhfh?= =?iso-8859-1?q?JaeYjArN/iemMn5C1IerE9lqN7oPAcvSZ3L+mbglXJo2fTiHlKz6d9r4/kso?= =?iso-8859-1?q?XeuBctvoCeJfVWkP6uvzwo6DujuejWUiNAh0lVD+7623vZMNkPuH2f6IkXez?= =?iso-8859-1?q?k4G4goORYn886lLKbfqhkuPADcUfrhMeCArFXivODL2lgGaHXTr0cplOrLHg?= =?iso-8859-1?q?lH9GseJDGGnJxxc+NDJGeNXa1ELodjZReIRBKmLJlKYPYvfiOdw/RUkdqfWh?= =?iso-8859-1?q?UHm/0eZJiT7jYvTWuhZg=3D=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:LO4P265MB5914.GBRP265.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(366007)(376005)(1800799015)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?z3QgDuWobV6f1GLJxir7RWF?= =?iso-8859-1?q?yN/CkXRwKwXUZGqY2AtRdh5xeSxGFbGHIcab7WIzD3TnyciJC/6hCW5iEASs?= =?iso-8859-1?q?d0psCttOc8Yjy55TUOVnWk7AelQCGHZvVUW5xzmK4eBEDbKb4EGmgrGq3VHA?= =?iso-8859-1?q?vFdHgwpv796tzlYcikpK+I4yKvPqIrBlvYh/psM0G/qqJHSOj0FkPX3Iyhum?= =?iso-8859-1?q?zlaCBqxConMmAZ3ZkqM5Krfw+Q9VYVKAMluzVcLGh+d1XC4TDrFh6FTD5zp6?= =?iso-8859-1?q?5BSELfoTc2IudbWiQHBUTyQfEw21755x9/AFg02300+T6p2oqVdtNmT1zjtd?= =?iso-8859-1?q?CTCVU4Q/KiWKP9YZAXZtp1OvUzHxUtnbLti0AnfJ5aUqoi8bp7RMSctql5sL?= =?iso-8859-1?q?NC0kmeP3MwckHDQ2kADy+69DZtRioGOxBdd6q3iFjetAgtZ5vaXFlrMay13Q?= =?iso-8859-1?q?FiAZFSEf3kkE7BXXwvF4HGh8lS1QiGvCC7drVHJEdLqAEAa5rNqIqYxq7rwx?= =?iso-8859-1?q?wHneIDbODtfEakKPWy/Xd4CCySq+WoabEbsJ8nHS88lZx/k2fsRJKD5aBUG+?= =?iso-8859-1?q?zahclig2vIZuZJ+QT7S2+hcA1cYUqgUvuIRw1WKVRZkZQqV8ttkS3VrydnB6?= =?iso-8859-1?q?drwEiyCfUmzR8t0hrJCJLaKSDHogXsUU29F0ZiUd3wYmiFPywyttZifXGy77?= =?iso-8859-1?q?VVFG4qE4idYCJnkdM/waZ1q+Ehgbi1NSZRdnIZLCgQhPqla/dqkHxt4GwRWi?= =?iso-8859-1?q?I0UH3oQ1z/Dvekd+IWMjgFvyDZD4Goo/YfgLsV4avb5S67ZTiJNgZkuppHwG?= =?iso-8859-1?q?qmw3jepfNQc9DA9rHslqJicrdOaCtR637NgdWVKbs9R7dIlMvZeTzhtjfqyF?= =?iso-8859-1?q?pvuuNcl/kcL8PZWccPbn9dJpfvXBHTF/nvJHLm5cn6tQUIs7Y9xnbSdt5mxI?= =?iso-8859-1?q?+xD6RrjalqhhtNmy4o+XPdn+ULryaIX39glblkjKjgX8RHZQHfpGvKmaJNCD?= =?iso-8859-1?q?wAYBRfyhclGiGe/D069WbwtN4SU62OShLvGg7DdiR8mTdL32CHgIoiHmInLJ?= =?iso-8859-1?q?5hPlkNZkWYeqeVZThMfkM459XZzaFNUnEXDZmKpxag8ZLoN7tguhAxDgqI9x?= =?iso-8859-1?q?E2Lsk47w0zTIvueGh6YF4xCcBojMk7uLVaIeTaMD+c2wuwGbM9pUOrKz+KdK?= =?iso-8859-1?q?ChNXAE2UJw08HK/jLDuc5FqUZ3w7FJU6G0itdYnGG7lkPEqFmeGmhOqHxfG1?= =?iso-8859-1?q?E0DfYB/BItdhsvaZ+9nOrjLKhs8vIXJuvb3l+nZJKNBQmDDmQaJedbQP9hpP?= =?iso-8859-1?q?bkamwKOqwVq3HnrqSZcNcyM1IPplmBfCWAG+G8pbWUqYuRnidGT9kiT/X3i2?= =?iso-8859-1?q?Yt0GI3fsua3EJqbVeeVyssUjg8+VH1criZRtSh2vV8Ql+3WTQ4LsVYK/hqPW?= =?iso-8859-1?q?rMUQMJRx7+G2vgOGUY9dSq9PMp6X2cmYi5+R4C9ODhMCzj4cKKnO3hOA6KB4?= =?iso-8859-1?q?ZNnVelpwsZ1rpmGv2+cINqCkD906LS5v5H5Gay3ald6TxZOyB7PSocKkVGh1?= =?iso-8859-1?q?lk7WNpWXnl7NnrKsDjXgJpW8Qqxw/zdHraEAx8i80xgHph/l+F42gG0cKVJ5?= =?iso-8859-1?q?9M/bIYecHwffy9mxv?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: LO4P265MB5914.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 0fecbfed-b4ef-4803-92c8-08dc83b1801a X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jun 2024 09:42:36.1197 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0d5fd8bb-e8c2-4e0a-8dd5-2c264f7140fe X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: TmZ7Y3fvmW71P6nncGX2VaEuNm1OUi16ep94vOxAsi0WP0staBzymb5FT2UqNBYkRW4NnIV087M/lTnEhmWrEOKXaLCXO8VyXY9fsbp1lVU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO2P265MB2942 X-OriginatorOrg: imgtec.com X-EXCLAIMER-MD-CONFIG: 15a78312-3e47-46eb-9010-2e54d84a9631 X-Proofpoint-GUID: mOefx_ZnxglAphBuLue8VX1kyWjll-Ap X-Proofpoint-ORIG-GUID: mOefx_ZnxglAphBuLue8VX1kyWjll-Ap X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org Calculating data length to disassemble defaults to 4, but stop_vma is set to the next symbol so that the disassembler will not read beyond it. This causes an "Address out of bounds" error if the next symbol is less than 4 bytes away from the data to be disassembled. opcodes/ChangeLog: * riscv-dis.c (riscv_data_length): Do not go beyond stop_vma. gas/ChangeLog: * testsuite/gas/riscv/mapping-dis.d: Updated and added new testcase. * testsuite/gas/riscv/mapping-symbols.d: Likewise. * testsuite/gas/riscv/mapping.s: Added new testcase. --- gas/testsuite/gas/riscv/mapping-dis.d | 9 +++++++++ gas/testsuite/gas/riscv/mapping-symbols.d | 4 ++++ gas/testsuite/gas/riscv/mapping.s | 6 ++++++ opcodes/riscv-dis.c | 4 +++- 4 files changed, 22 insertions(+), 1 deletion(-) -- 2.34.1 diff --git a/gas/testsuite/gas/riscv/mapping-dis.d b/gas/testsuite/gas/riscv/mapping-dis.d index b1a26fbd151..5c908d52ec6 100644 --- a/gas/testsuite/gas/riscv/mapping-dis.d +++ b/gas/testsuite/gas/riscv/mapping-dis.d @@ -26,6 +26,15 @@ Disassembly of section .text.data: [ ]+[0-9a-f]+:[ ]+4509[ ]+li[ ]+a0,2 [ ]+[0-9a-f]+:[ ]+05000302[ ]+.word[ ]+0x05000302 +Disassembly of section .text.data.label: + +0+000 : +[ ]+[0-9a-f]+:[ ]+4505[ ]+li[ ]+a0,1 +[ ]+[0-9a-f]+:[ ]+0003[ ]+.short[ ]+0x0003 + +0+004