From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id D66D73858C50 for ; Tue, 14 Nov 2023 17:58:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D66D73858C50 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D66D73858C50 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699984706; cv=pass; b=A9xqmcqmc9z5CuD1Qc0rxeBGi0+13I6wlREUpUtxIh1piYo2pyXjVd/timnipnPdOszWc5o799011kfsjCMNxA6SiCHRHwRZIiFnw8pliHStgo7P9skM9/VgwX6AVhTPIAcUDY9B8PZg/J1qMYy5sGQyWGpZ6XEuDL4wAUS+dyQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699984706; c=relaxed/simple; bh=2p9zHSPnnEyfVxPB7jIwqnIiaoAAngATKV4vlSDyaH4=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=pXDtQJv/ROrNPl8sqekWSFq03YgU4N+8AJWWx3DF44mwDl3BdzAsUSr5subPKHrnoV0SkfUxWHTAIuhs/EQzgg6wjsmsZVBViWlSHS1WJxMjZrfNAJMDGQ0wzbc6U6M1Q0wMWsQANC0K+uabd8KxUs0TuKD3B/VcfTyVpJQfI6E= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AEGhqPk004673 for ; Tue, 14 Nov 2023 17:58:24 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-2023-03-30; bh=fg6CvKlPMbdY3OC9ETt1aTHqoA8RU3mzUw2p+o/1pts=; b=ZVPpWpFBbjpz5C2r6eXYctagjDvQrJjn/CbAuRbkTjIgRjgJ4VtnMFgI2+IiBat/wkxO D+R3KIXODRcEAN23yBqgWCHaAhhXXQMm2x6njb/vUFJkChGO4CfGA+1dwlvaEEqjoWe5 HvDh3x0NOW7kgz2MzbkVTERpkqg54Z8r8k5q0BSfBVWt7QC/MxynkHyU/9bjmuMfupgQ z6EZGbXaQVyzmbj7YSYBcfD0hTi+zh1a10Y4luomC4BEwSIdGXKeC7Uo5uzbgY2N9wGn /KszqFW9iO9nEw4wyEiQLzY9JJbT6UYHzevWZ1hbLX2A9S5Zfh/0cFDBJzn9Ow/y805E aA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2qjp9vj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Nov 2023 17:58:24 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3AEHFdkd006837 for ; Tue, 14 Nov 2023 17:58:23 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxh1pkqw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Nov 2023 17:58:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MK85ZECbvFXaNProm0cgDakWiDxbDkzRSan8ToW40baIxA46OvdkkIQzH8hJ+XyiSe4MWZPtWYjBr6mXsrdE6W91BnFG0ai7qOlxiMLB29HkLFWXBIYUpC4JMnXJ6r/YG1tL2fwUvSWhV8PntN0RUR4E7Ow3zFdm9+UY4q1ugPQwY4EGSaIVQjUjtpQkfnA25zGKIMo6nqspO4oZ2xd/alZApKYmr0NslZ0sZTYFj+kdTaSafon2WWePVyV+YqanVG8/mw31J6KTMsZl2D244Kb59EsUgxVQMPKK3dNsa8qK4zTtuCzAMmB01eqDthe8HkgX0jGfKkt+unGUVKDmWQ== 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=fg6CvKlPMbdY3OC9ETt1aTHqoA8RU3mzUw2p+o/1pts=; b=dAbf+2bEFtB8UDGOBi/INtl6sIkP3ssHt2LwzbKPcsNava6ksTN5Zct6N0pn8jbX+rVAula5Re2ht9EcZF31OYvWGQlaga/7lJ18XErKblcKmkUWWEOYiRhE4aZDe0vgibkABPjuKjikYguDyd2Az9NQoyMx0a2DmCXNPKsh3fhy2XqNTse66OnPgeNsCmeeUZQxeXCFkMo/S2BCxMEs9j/7LeSefXLLxJVA6BuNQRleTLK/FUtKDqb8yrrVNH4Vo6528mBsL/ZRbwUO5NQ65cD0pGxSZsX9tLShxCE6i+9Kp0Gtc64ePBoRwgebSi+EnccnDSfrVfGKQy/W8Zhw6w== 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=fg6CvKlPMbdY3OC9ETt1aTHqoA8RU3mzUw2p+o/1pts=; b=tArXkmcING5dVfANWBZBEhbUkIWbbk4UV059xx8cT1Mf+2c3KRFBer0B5WxJP8u58iceEkoDY8WnV2Jr9k8Z+EUVptaaJaI7WxR89p6QzvSiraYy4zXXyhL4CQ5AlM3f+UgFw9zl8D/Y9U1NZ5JzJb2/LyzVqnrnhb9Gybw/ySo= Received: from MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) by SA1PR10MB7711.namprd10.prod.outlook.com (2603:10b6:806:3ac::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.28; Tue, 14 Nov 2023 17:58:21 +0000 Received: from MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::d8:db85:8025:ed64]) by MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::d8:db85:8025:ed64%7]) with mapi id 15.20.6977.029; Tue, 14 Nov 2023 17:58:21 +0000 From: David Faust To: binutils@sourceware.org Cc: jose.marchesi@oracle.com Subject: [PATCH 2/2] bpf: remove symbols created during failed parse Date: Tue, 14 Nov 2023 09:58:05 -0800 Message-ID: <20231114175805.7783-3-david.faust@oracle.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231114175805.7783-1-david.faust@oracle.com> References: <20231114175805.7783-1-david.faust@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: DM5PR07CA0058.namprd07.prod.outlook.com (2603:10b6:4:ad::23) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|SA1PR10MB7711:EE_ X-MS-Office365-Filtering-Correlation-Id: 1281013c-e145-4523-cd1f-08dbe53b4a13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2sQnkEe3WTRUEV7ps+itHNAhHw4fCKzFzjxPp4R4sLh6577UwCbUjlbbV/EowN1CG6Hbm8t6JkE5eUK2y6/BS11990ihjsBuSGNKXA+OeLk309ubmJ3bl6Uy8omWCsVuV5/BKCq+PwEOwsBQC+sRyGE1WpzllSeD5qFmJjKXz2rkMHQcIb630vvzIqRo10Gvqg4YW4LC4eaak0AktsXXSS/atR1ci3uamPG73kUegqO3+lO1rHY9UXcuh67v6WyD1F/3aUpS3mUo8pEGovi0vBZPznj0CjN56CfylQ95nc65pQFbD2L1eM7mFxTrAjNcwOYkMRNM2tyV1NGdXiDAN9QXeYcvbOnm0K45wT8XPJ05vwzDW0vdL2Znjjw0OWVgnfJQELJNjgddEJ+nZdHKXp5pSmvxFNGvXnZy6RaIoiwX60okax//6sPzg4aJp/yB9xniIa4G8Y5zN3mclCOxs/7C56I75xq63PRzfnKw6U6vp1KF3cyXLKwM4MPRwSxUg3boqMPJ6boCjfiaplD1wA3urjuWxe8Cd6RgNueCgcAbCrzLfQ30m6+SQ31Itz1O X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB3213.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(346002)(136003)(376002)(39860400002)(366004)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(26005)(1076003)(6666004)(6512007)(6506007)(478600001)(2616005)(38100700002)(36756003)(86362001)(5660300002)(41300700001)(4326008)(2906002)(6486002)(107886003)(66476007)(66556008)(66946007)(44832011)(316002)(8936002)(8676002)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7XSk1e8ftmURdQRDiFH52oGCtbYGXKq4iw0hZFky20ktYU0Fb321+WN272so?= =?us-ascii?Q?N47yn1Bj8yQPEFk9m9+biS8aWTMPT3Khk50IswirERTTRMLqEzTu63wKqrIw?= =?us-ascii?Q?bPv1joCEnxwrBPLqRzlhShF8GfdCE/Jn+JB5y5m1cCI+/2RkHUNZPr6UE4D/?= =?us-ascii?Q?F4Bn3HTUrxFGqwEa5h7D/F0RnPgPD/vnS+4+3x6oQKZQ6RbAUATTj1uDxJsr?= =?us-ascii?Q?tKAghaWV3+llthPSRi7m9AWm03aVNsIfnJJcn3q/is+eKbZX5jysVjBl/lHT?= =?us-ascii?Q?oaOGIFgzpmgqrODN3hpJOuKDlvQ+NCRiUlf901MkIl0hNZfaA1KA+j+66d+o?= =?us-ascii?Q?bsH8n/l60kHZ0K/AcaGi1+i6jRnVxhcQcmzQ1aH+Z/3k2uNRgu1uRhX/yZxa?= =?us-ascii?Q?MpZUZMmdPeQDNBoIK1c15LGcnfTYcbS2Q1gUM8kDLPTIv9gWPyws7nqUFdD7?= =?us-ascii?Q?vBJMyRkFFNoImF2N3PCzRSE9leFJM/xv3xkN4kLFXR7aHStlF+ubGGsQQ9ln?= =?us-ascii?Q?/aoncfEoks98h17cy9y2a+QGF6KtfhUYXdjfHfXYzdNvPH5/pzXfmOxGaTs1?= =?us-ascii?Q?jskEK+/2hGAydhmpZEGE8lDx/bCmzNUXkAeuu8NK4jIlUbITbezLzyar+Qx+?= =?us-ascii?Q?9mzPmkXoTpuS+CVq2yIPvJfganknYlMQoriW1PMqgiOAheG2FVRUCzpz6bZy?= =?us-ascii?Q?NY9fNbvg/7Ki/ScJLDZ7z7Z9g8lmsviStUDYw5wSUJmycotR6RqG9aeUdc3D?= =?us-ascii?Q?paUdLgHKTPilOnv40eCZbR4QM5C5Q9dPFszW8nDXf2npzWqQmg0Xm6519WxN?= =?us-ascii?Q?t3tE7YGaKmM3dAX2urDA4UNCI69yIZB3qYRvnkx618VfLmeYoJmCk0lpqDi5?= =?us-ascii?Q?obtHr5wIQg949F1VXzhW58cgJYjlUH6xoZXUW0hmzj/DGYQhZ6vCfRhg5BDx?= =?us-ascii?Q?xwbPzsrupfquzuaAhauHWm2/tZy+T7d/Ij25bPvXYVvJ/A4Gb256+ZGePCDW?= =?us-ascii?Q?iVU1tgQwAsWmZFRz+J1Y0wSPPnw9wZSj6VxktLH8kpPjCziNRt205u6HKMBz?= =?us-ascii?Q?nkqsikUhVi8lcQBXH8ulGspaypbzi1v6SNkCiRiAbX6YNlBhj1QW+KHheh09?= =?us-ascii?Q?T3Q/VFazEIxu3ApmVMA9OOs2SbbTE0LSKgTDqFr76Dqx2CJQFCKCn2/Ty94e?= =?us-ascii?Q?jfqBV59hJb40TfwKHDAWbge31V8R9HTwstQ+T3scO4PnzX8sL/Nl+AuYI1cY?= =?us-ascii?Q?obbBcLh1op8FEw75YU6u/w92fCmOiBCww9w0z3cW5PGbDpNbb2ZGuL9xPw1y?= =?us-ascii?Q?72H7IN/rKnIu8gGm9O8ORSJM+YhKkNzm6IBo2abZG4h344bTpC198PTXukct?= =?us-ascii?Q?5cF1GL4LKtlOU4GKsMA57l3xKz9mynNK0t9NwfZp+xQVz7Rt3Bz0PVQQ+GZU?= =?us-ascii?Q?XyIQfmLUOnmmXHWhAUtV2vqP1QlbPP14KnBE3gCVIZZ+Krrk0bCDFSoJut/T?= =?us-ascii?Q?pHoB1O2u3fiaR3xwb3wjduHVWtd2sDea0SJSXlPSflWZQc0Eva71xnlVCN0g?= =?us-ascii?Q?GfQJj5VtswXMAQC9ERrnvWgQuoem82ZVKMfiFLMWPzyNSUGmlIV+ro/kYBlA?= =?us-ascii?Q?BQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: KTBHwXfbESFrsNvv+szlrSfwMUplzBQFUSrA+XSTbVAvxQ5oIx0XpjlnqfiM5InYgy+NPSyPf2i9hn4ePQHWre3WaeU3eb/agZ3JAuC8f6PFpH7nnh1hUQVQXdM/9yrR8YOGig22iMDAEN9RCROw+vuv7JBe76iZezG+2NrQ4A4UW0D7P1uWJekRNn32JBwsnYhki3iwIxGQABiTaG3PXos6wGpKOPHe9go6+IN+UdjId0Hhol1Ef/AYN5PdLGerVgLTlAFdQrleMXmNBpsmU34kHsfjwvp9XO1UZ++uYxHx2qdUQiep6VsW+YiCgJSbZMt4JsXdgGHj1Icui8A84sCg2kN73p2xZg8onsEUwZ24nL+tGySjtrUqxGceIYXFH2k2npYmutZbQaGp4tSelPtFhsxLr/dUoeGGowUQsAGu6/FBEl7WtXb/7N4yiGm2nXeqr8nDHi84v2BdRLiSMRBMKqMWXEki19kSC43gzD/JP6CL1HTMNL2ySClZQFBBdiNawbhEs8mD7sJBMyDedPSAFitRb66OXtFczRoq62Pl0piDy0AIWtQ1BTpVnaOAE+tT8KQHQEu8c/n5T6s+857nVLDybHMf7+9P8b/T8hC8/cgsNbf/B1HQWSN7ssr8CU73b7X1MBk2Hem1K7h7lAH4zBtzss8Ca8I5NzMbUOhEujgEiBsgGySQwFDqsOgL8cvETIYkkC01l2xy07M9vQwl7iGdS3bDvg4NCsWDAtMKd+t+WbTiR7bR0oJXETttSiJa/bCENKHbFKoxtTWjLA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1281013c-e145-4523-cd1f-08dbe53b4a13 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 17:58:21.2961 (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: 3vZNy0xmdYOaj0ioQKS3m5QkmFLa0c8Ox9Z8QyWajnGCkP9HA3XEABbWPT+oaEGp9ulQdobywgykfAwmrZTifQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7711 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-14_18,2023-11-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311140136 X-Proofpoint-GUID: K7KZoo_tKNdgtb8WIg4sbzhBoFuClImk X-Proofpoint-ORIG-GUID: K7KZoo_tKNdgtb8WIg4sbzhBoFuClImk X-Spam-Status: No, score=-13.3 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_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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 List-Id: Parsing the BPF pseudo-c asm syntax requires attempting to parse an instruction using a template that may later be determined to not match. During this parsing, a call to expression () may end up creating one or more symbols. If the parsed instruction is later determined to not match the template, then any symbols created during this process should be discarded. If such unused symbols are not discarded, they impede the loading of the resulting BPF object by the Linux kernel. gas/ * config/tc-bpf.c (last_parsed_expr, old_symbol_lastP): New. (parse_expression): Track last_parsed_expr and old_symbol_lastP. (parse_error): Cleanup symbols created during a failed parse. * testsuite/gas/bpf/asm-extra-sym-1.d: New. * testsuite/gas/bpf/asm-extra-sym-1.s: New. * testsuite/gas/bpf/asm-extra-sym-2.d: New. * testsuite/gas/bpf/asm-extra-sym-2.s: New. * testsuite/gas/bpf/bpf.exp: Run new tests. --- gas/config/tc-bpf.c | 30 +++++++++++++++++++++++++ gas/testsuite/gas/bpf/asm-extra-sym-1.d | 7 ++++++ gas/testsuite/gas/bpf/asm-extra-sym-1.s | 1 + gas/testsuite/gas/bpf/asm-extra-sym-2.d | 7 ++++++ gas/testsuite/gas/bpf/asm-extra-sym-2.s | 8 +++++++ gas/testsuite/gas/bpf/bpf.exp | 4 ++++ 6 files changed, 57 insertions(+) create mode 100644 gas/testsuite/gas/bpf/asm-extra-sym-1.d create mode 100644 gas/testsuite/gas/bpf/asm-extra-sym-1.s create mode 100644 gas/testsuite/gas/bpf/asm-extra-sym-2.d create mode 100644 gas/testsuite/gas/bpf/asm-extra-sym-2.s diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c index fd4144a354b..d64576415e1 100644 --- a/gas/config/tc-bpf.c +++ b/gas/config/tc-bpf.c @@ -1223,6 +1223,8 @@ add_relaxed_insn (struct bpf_insn *insn, expressionS *exp) See md_operand below to see how exp_parse_failed is used. */ static int exp_parse_failed = 0; +static expressionS *last_parsed_expr = NULL; +static symbolS *old_symbol_lastP = NULL; static char * parse_expression (char *s, expressionS *exp) @@ -1232,10 +1234,13 @@ parse_expression (char *s, expressionS *exp) exp_parse_failed = 0; input_line_pointer = s; + old_symbol_lastP = symbol_lastP; expression (exp); s = input_line_pointer; input_line_pointer = saved_input_line_pointer; + last_parsed_expr = exp; + switch (exp->X_op == O_absent || exp_parse_failed) return NULL; @@ -1317,6 +1322,25 @@ parse_error (int length, const char *fmt, ...) va_end (args); partial_match_length = length; } + + /* Cleanup any symbols created during the failed parsing. */ + if (last_parsed_expr + && (last_parsed_expr->X_add_symbol || last_parsed_expr->X_op_symbol)) + { + /* NOTE: this logic exploits the implementation detail that a symbol + created by expression () during parsing is appended to the list + rather than potentially being inserted somewhere in the middle. */ + symbolS *sym = symbol_lastP; + while (sym != old_symbol_lastP) + { + /* Must have created at least one symbol. */ + symbol_remove (sym, &symbol_rootP, &symbol_lastP); + symbol_table_remove (sym); + sym = symbol_lastP; + } + + old_symbol_lastP = symbol_lastP; + } } /* Assemble a machine instruction in STR and emit the frags/bytes it @@ -1368,6 +1392,12 @@ md_assemble (char *str ATTRIBUTE_UNUSED) if (opcode->version > isa_spec) continue; + /* Track expression parsed while trying this opcode. If this turns + out to be the wrong opcode, we need to undo side effects of the + expression parsing, such as creating a new undefined symbol. + Set by parse_expression () and used by parse_error (). */ + last_parsed_expr = NULL; + memset (&insn, 0, sizeof (struct bpf_insn)); insn.size = 8; for (s = str, p = template; *p != '\0';) diff --git a/gas/testsuite/gas/bpf/asm-extra-sym-1.d b/gas/testsuite/gas/bpf/asm-extra-sym-1.d new file mode 100644 index 00000000000..56bdb7082f5 --- /dev/null +++ b/gas/testsuite/gas/bpf/asm-extra-sym-1.d @@ -0,0 +1,7 @@ +#as: -EL -mdialect=pseudoc +#nm: --numeric-sort +#source: asm-extra-sym-1.s +#name: BPF pseudoc no extra symbols 1 + +# Note: there should be no output from nm. +# Previously a bug created an UND '*' symbol. diff --git a/gas/testsuite/gas/bpf/asm-extra-sym-1.s b/gas/testsuite/gas/bpf/asm-extra-sym-1.s new file mode 100644 index 00000000000..2cfa605a259 --- /dev/null +++ b/gas/testsuite/gas/bpf/asm-extra-sym-1.s @@ -0,0 +1 @@ + r2 = *(u32*)(r1 + 8) diff --git a/gas/testsuite/gas/bpf/asm-extra-sym-2.d b/gas/testsuite/gas/bpf/asm-extra-sym-2.d new file mode 100644 index 00000000000..e17ae0f2422 --- /dev/null +++ b/gas/testsuite/gas/bpf/asm-extra-sym-2.d @@ -0,0 +1,7 @@ +#as: -EL -mdialect=pseudoc +#nm: --numeric-sort +#source: asm-extra-sym-2.s +#name: BPF pseudoc no extra symbols 2 + +[0-9a-f]+ t main +[0-9a-f]+ t foo diff --git a/gas/testsuite/gas/bpf/asm-extra-sym-2.s b/gas/testsuite/gas/bpf/asm-extra-sym-2.s new file mode 100644 index 00000000000..ccbf43065d9 --- /dev/null +++ b/gas/testsuite/gas/bpf/asm-extra-sym-2.s @@ -0,0 +1,8 @@ + + .text +main: + call foo + call foo +foo: + r1 = 1 + exit diff --git a/gas/testsuite/gas/bpf/bpf.exp b/gas/testsuite/gas/bpf/bpf.exp index 80f5a1dbc2d..680b8dbdb10 100644 --- a/gas/testsuite/gas/bpf/bpf.exp +++ b/gas/testsuite/gas/bpf/bpf.exp @@ -72,4 +72,8 @@ if {[istarget bpf*-*-*]} { run_dump_test disp16-overflow-relax run_dump_test disp32-overflow run_dump_test imm32-overflow + + # Test that parser does not create undefined symbols + run_dump_test asm-extra-sym-1 + run_dump_test asm-extra-sym-2 } -- 2.42.0