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 90B063858D20 for ; Mon, 29 Jan 2024 18:28:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90B063858D20 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 90B063858D20 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1706552919; cv=pass; b=kdBAYYzVbX9fJPkVm+TOQ4LM2yJSVDopQIc8L7XMk/yWiY7ttgjpAPcL2sbxLnqOQPEm5FQkMVpvUIUPLEwGF5qWZCtPFnF7FAq/cVjk/7cJHAZg70Zu+HMU+Fh0pCCmZpnqTwSCfdv9L/SDbkvv1VJrYNfkoIK2KKekx9yDB4k= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1706552919; c=relaxed/simple; bh=RViRDFvjavNasD/3DDPIxOSzzM4fw6jeuZh8KacYLRs=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-Id: MIME-Version; b=qB48fwutUdvJ0xjMYJTR0RxbrjHFp0KTCdN4C795y41PhgcQEe/WLef4vID10KiixgCxZf3u7UD4kJuVXb8q1cNWSTgCrFfM5BPNsbu08cgJ3xCg0T5Rgqut9p7l4ZzSOByKDD8iHTYFDbT9fT5b2SSYur1wI6Ofj7R068Orr4M= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40TGnjsn026080 for ; Mon, 29 Jan 2024 18:28:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=Gw7nsO1XdjQoRc3XCB96jb/gBIdIEwiMUfLFIaDQqqI=; b=koWJYq5D+Sbyy/5hptmuRCTyQIZSQ9svRZu39U+JFhp7sD1ZtcN8+Mb2i44KaIXsbnYM QqWqvShwT6C/TEHOZ2H37J0E0hgLTLBf7JyE0Z1kXk41ztcBuV+6EtwBs9jczCnoIfHk NGyDO73WFOO6RDBFXrRLX5A+jLhhuVGgqyIncwM5Lc/HmMNUT/x9GvfjiTTRoiavdoxk Vl4W8GFhY/Vorh2Fu9lAyUiQJ0/VpYYBU4B52z6GfkM1mnhcGMnzr//8F6rYK8YVe88J eAHXPRZF4Jzgd+35WCFfBFa7y5Glc28VAJ9oTReJ/+yuE8PmmedrzSdZHcGhycKqiFz/ Dw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vvre2cqjh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 29 Jan 2024 18:28:35 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40THOl60040113 for ; Mon, 29 Jan 2024 18:28:34 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3vvr9650jd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 29 Jan 2024 18:28:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ML2i+OiVZGCJCG7aXs74CbZT//42YDhnswv9eYISUqUSd8y+33cmbuGC/asEONUq1tGgoEfjtnm+S3w5tZ6Y9fVkB0TF7TNLpfE9GVdYFxfEEpohuy10wH1j4AuQJYt5T/ztQT/iZXGyak7j44Kzmmoq3iamCUaildTRyHfxvphatTx/EIvghc3bCIEGOfyscCS5U5wZKpW7Hmnmwt7LHj2Rio7rcbOSvQKA8d1jusUX144Qi0Thtm9Cw7o0slH18MnXyyet9UH+MEUkJzEr+SOgYi6BwxNQWM/jsetJv7V2JRtUkfqRR8MX7iGAqXIhTMPfp/ecNe5e4tZ+UTnY1Q== 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=Gw7nsO1XdjQoRc3XCB96jb/gBIdIEwiMUfLFIaDQqqI=; b=gjaVK1YPvBcEGdaYrNhaIyB3LkpKpR7gvRiaTo74HQqmZs3sQHvNl5c8Rov99Z5YoHG4oVfUmF/ZrG6Vnd0STdFdYve0XeO9uPUF73JFemkA2uLumEwCFag3aNRcrpox/V7Dz5SpTMUfjk1wS6a7ZcwhCT3XnIndwWN/LhdPrSZi+KtkgFY7qkWL5KYD+Y8VKqGffhpAfUGaonLZRMql/xNxIY2PLB5VBaHuSuR/oTM6b1sWQxHcPFp3kTAOMIiZfuXpoR2rSGKGTNxv+Q0ut8y1th0GRbhNqTe9g+MHEECAplQPebODLtBImSCDLRoj0ohxhVy03OHjtf4RTk27mw== 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=Gw7nsO1XdjQoRc3XCB96jb/gBIdIEwiMUfLFIaDQqqI=; b=T+tQo20ZuWAdXpzPSRD2NffSt0IqjH4O26zzNfIFsfUkK6jKdvVrzdH6B3EB48rjzg8tknPQAY/W7wLVFGsuCoTkA2Dhh10IaiKRqVsVFoNmksEttn9wyzwifDFcOy0dNqNXKLA46ehDtO1aUH/OZ8mQ7DrmnkmZXykv7LIn8HU= Received: from DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) by SA1PR10MB6640.namprd10.prod.outlook.com (2603:10b6:806:2b6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Mon, 29 Jan 2024 18:28:07 +0000 Received: from DM6PR10MB3113.namprd10.prod.outlook.com ([fe80::cafd:c8d6:e2c3:3a1]) by DM6PR10MB3113.namprd10.prod.outlook.com ([fe80::cafd:c8d6:e2c3:3a1%4]) with mapi id 15.20.7228.029; Mon, 29 Jan 2024 18:28:06 +0000 From: "Jose E. Marchesi" To: binutils@sourceware.org Subject: [PATCH] bpf: there is no ldinddw nor ldabsdw instructions Date: Mon, 29 Jan 2024 19:28:03 +0100 Message-Id: <20240129182803.4867-1-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P265CA0154.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2c7::11) To DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB3113:EE_|SA1PR10MB6640:EE_ X-MS-Office365-Filtering-Correlation-Id: 5397893e-fda4-411f-c695-08dc20f809bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xjzor4u0D88JBg9qrTh3lBh0A6iAanBjBLWNWbJGOmCWkxAnQTIZbJsOG3I9F1PLnjM/THG3w03/NqfzI7q2LsBvb+qB2Two36XTECnCgphA1D6w2lhKPnWXeFUcRFOufUyAdJd/bt/hF750kyRO8J05LM3O0Xpe7ZJtqKMl81U0eqh4HQPlbQdAl+MBfIghrf5aVy7/PxckuTIwTeFaVKzF2OtaTRrCpQzo2hqLuNcSsR8zkZETkFvbRr7e4AFvSWwkX+PUyMQMwpTQg4CqYl+sBYxl8ARZ1iQr585e5LVr0yMRL+nrUE6l24zwsB+E150J9G9UMfBdSbBREY4fIHnJILKINeaqAx6IjH5HozVmje4MyXJPOtb7dDjfQcp2Rt2zVcPAYY2tWFgwCxykUbxCbFA9D0Y0DC8x3iXeNuzx9mkoOuI1sX8bb82+Qjp0gKvSayx2RhgS79NP7Smk2dkJ9ff7owuKoXD8t29JMPs+NYXJvjBbAuiKOiOikbNsLj23EojrueaDBDnXiT3ZPqgQJctAC2ZC1hjZP6dbtHM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB3113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(136003)(376002)(346002)(366004)(39860400002)(230922051799003)(64100799003)(1800799012)(451199024)(186009)(83380400001)(86362001)(36756003)(38100700002)(1076003)(26005)(2616005)(6512007)(66556008)(6666004)(6506007)(2906002)(6916009)(6486002)(30864003)(966005)(8676002)(478600001)(316002)(66946007)(41300700001)(66476007)(8936002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?a2g3xg2mPRAlQQo6qDTXmnEbDC3ufHIZrqasWoJlLnX29XkK43enxBe9IDww?= =?us-ascii?Q?x2XXVLSnQ+j22mgYL2UE42BuixVGoLM8h4vT2Hl0D0E4UBXCxpStiZlfrtdV?= =?us-ascii?Q?d2kes/Sersd5nd2esvoW+JT9fcN+jI+mr7a8LM1Ih088cPfPS3CBWpsjdnJC?= =?us-ascii?Q?F3f5ZpT3rPwTVonqHUSwgWkGNok4/3IIWHlVBgwB3sDWEtFO3GojineMB4qK?= =?us-ascii?Q?NlKkIwNrd4/OTaR1C/LT1JbmWXIemClGieemupY1BQ74fq0wrOwmuGcsILtR?= =?us-ascii?Q?KCMwRsQYu0+dF2Jksgq9QIB0+U5Co6OrPlTDRMzZ8NJj9THjK55pwD2GgkwE?= =?us-ascii?Q?GWz+n+eMJur6d3WFltwzgvBCzM9Gb9EmyzNXT/xhuWTLFiFW7pgqTyEReoSK?= =?us-ascii?Q?3YIX0ke0gE9OGM7VNtn45PzXavf2ROHbE77UoEnFYTxOc5mRZ5cZgB+6Yo3w?= =?us-ascii?Q?vmF2pwWlbdniQCfYpV5es8xRO59NS7jlkw1YOuJn/LnF8tA99VywxtKY4iaX?= =?us-ascii?Q?Kzh5fxDONWyMqURwseSSvLa6qGWX/EAEO4HCCj54/oeR4UYM6n41Y9xog2zc?= =?us-ascii?Q?WoG4Ar62Ov/AwNivwn1Yw6sHj8k35RVbGaYVM/0+d3Y60PJtac7pUW0GYiD4?= =?us-ascii?Q?JSAWjjCKjQIDgHG4Vkfot8aQZJb+QXVuQse3RW+PDXpYOaFQhPup3IaV2d1U?= =?us-ascii?Q?uvQHA6xHRQ3s+/12SdRZ2DfkckAaXSLQJmfqz7j0+aQknA83+Qn//7TX/ipO?= =?us-ascii?Q?TjmwuIpYbO1c+xy1bCAByzbgz5asl1elo4EIKEj9UDFZt1UOD2oUeMF0ewgg?= =?us-ascii?Q?Ts3l5Qwk+gz/eaQFW5JuY7ZejFMhJ+P2a06/K2cqvTPtFF940+8lgXUna66d?= =?us-ascii?Q?yogxCQ3nzgk8a7yhLj3xTEYf4TTke9GAVuIfqK6Df+wU/xS9BnccIHXJuTor?= =?us-ascii?Q?MVYZSFFyQwbwoOmiPo1AXtaMKp2NhguyUzo7C19h9e/Gu5rHKC3b5XyGBcgF?= =?us-ascii?Q?QKWb4cMt6aQgNTH5uuvvvH3M3oiYvJwC8koz75dtvkisBoiPE8ETbVg3KpEa?= =?us-ascii?Q?CvhtuWBZ3D5RMsgOWANvI5zbZ59u8UmJrKEmdMegNcvrd9npTMfen4i7rV55?= =?us-ascii?Q?PuNIgAqyI6sIDLix4lxnjcULHCnQHDkqllzkwQVT3M+cIafPURcUJQxfRL1V?= =?us-ascii?Q?1cPYm385OUJmCElabN/ZJOE87e7OXRefr870X3VysmY+M2cBHOSiU5Twq/T5?= =?us-ascii?Q?CdApGuhsDXsgjDoHiGP+/uhOjkXtFOjJ1/X2PZh9W+l5JdOxjQog/KTGomte?= =?us-ascii?Q?S+cplEfr9LR5hrcYUxnSxtggX1tHSSOGApO/asPUQkBj+h8VhbbUvcZkICK5?= =?us-ascii?Q?bJIGl0J2svn7TjN7xav6pJxAVokCw6nZvYaabkc4xTdH8ghL46WDvkZAMib/?= =?us-ascii?Q?l7h++dtYbeuG/JQLop5KGGjh0/GXhnQU88j7Il5BiAd58yH1Oz1zsnCDuyIz?= =?us-ascii?Q?kTF80936AsGfHm5z1xUE64VHVonkDS00qpJMYTXfV66575DZbe1NXL8kpDhN?= =?us-ascii?Q?vpxUfWYdhblZilF8ePCTs0BxpC8NXBU4l6H+kSuiX8Sl0WXy2YuWHnli72tb?= =?us-ascii?Q?Pg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: XyQHv4eGWJOCyRdD8davzvqghsnfYxksJrgqPVZbvRmq/3pOiEDlWmwkyylZkv6OSm11CYoF+pULA/ps1Iz1hgNPRnjBjYKzEh/z2Tcu9/eODkRkrNBhVsC+teKjIwtzM+/6u92oSJOLSVZfrC8aMq+0UeBfAn3WDCmEONEGCN9QZ86JlFjKX1verZKPw+tUQ8eBUPcIQHyqO6PUazmP6sJYGHcFCUcdy0/ituRD9H0D9GXY5h26YHRbPjU7TXtvT5FRmyEpqFVU24og9eulNO37rKP0zZ+0FrdpKteVrtKQbF/ZzOuIGpJMwCOPb3NKh1SdkIuMLY0RPdXGDTODO25lx9ZzhjgLnT6cXDtROy/AcXygvVVRAPBxawT/CGYDTtiUiCZN/a+6LVdq0SbcoT2FMV5woMYCawXp6CSNgqpWFsGkbBKpwfR80koIM5MXBMnox8B0VSJfIwWe0rq7430o2sUR1qrHGE+Z/ZZLPOiRBqeoqDdZNMsR7GlKR+zU2OZTuWSNKKJ0GOjtmhtD6nfelcidQyymcS2QnOkAoPKwkLrPYV6/t1yYX8uWNHQpmensWYMQqDZQ1gWmXUPD+/cVpa+/PfUn19e0HJguSjE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5397893e-fda4-411f-c695-08dc20f809bb X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 18:28:06.9409 (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: NEUtFtRvB6hfeQSsF0H64/FLjG4vq/ERZn0yK1b9o8NKwXukvQss+/qbYR4UB6MvaRCg5d98zm9dyRlBM9iI02U5VQNVs793X/Ib1CBobWs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6640 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-29_12,2024-01-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 suspectscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401290137 X-Proofpoint-GUID: _c_6EQAr0r0XYWkeyB7pKnPjASm1WKsm X-Proofpoint-ORIG-GUID: _c_6EQAr0r0XYWkeyB7pKnPjASm1WKsm X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: There are no legacy ldind nor ldabs BPF instructions with BPF_SIZE_DW. For some reason we were (incorrectly) supporting these. This patch updates the opcodes so the instructions get removed and modifies the GAS manual and testsuite accordingly. See discussion at https://lore.kernel.org/bpf/110aad7a-f8a3-46ed-9fda-2f8ee54dcb89@linux.dev Tested in bpf-uknonwn-none target, x86-64-linux-gnu host. include/ChangeLog: 2024-01-29 Jose E. Marchesi * opcode/bpf.h (enum bpf_insn_id): Remove BPF_INSN_LDINDDW and BPF_INSN_LDABSDW instructions. opcodes/ChangeLog: 2024-01-29 Jose E. Marchesi * bpf-opc.c (bpf_opcodes): Remove BPF_INSN_LDINDDW and BPF_INSN_LDABSDW instructions. gas/ChangeLog: 2024-01-29 Jose E. Marchesi * doc/c-bpf.texi (BPF Instructions): There is no indirect 64-bit load instruction. (BPF Instructions): There is no absolute 64-bit load instruction. * testsuite/gas/bpf/mem.s: Update test accordingly. * testsuite/gas/bpf/mem-be-pseudoc.d: Likewise. * testsuite/gas/bpf/mem-be.d: Likewise. * testsuite/gas/bpf/mem-pseudoc.d: Likewise. * testsuite/gas/bpf/mem-pseudoc.s: Likewise. * testsuite/gas/bpf/mem.d: Likewise. * testsuite/gas/bpf/mem.s: Likewise. --- bfd/doc/bfd.texi | 1 - gas/ChangeLog | 13 ++++++++ gas/doc/c-bpf.texi | 8 ----- gas/testsuite/gas/bpf/mem-be-pseudoc.d | 43 ++++++++++++------------- gas/testsuite/gas/bpf/mem-be.d | 44 ++++++++++++-------------- gas/testsuite/gas/bpf/mem-pseudoc.d | 43 ++++++++++++------------- gas/testsuite/gas/bpf/mem-pseudoc.s | 3 -- gas/testsuite/gas/bpf/mem.d | 44 ++++++++++++-------------- gas/testsuite/gas/bpf/mem.s | 2 -- include/ChangeLog | 5 +++ include/opcode/bpf.h | 4 +-- opcodes/ChangeLog | 5 +++ opcodes/bpf-opc.c | 4 --- 13 files changed, 107 insertions(+), 112 deletions(-) diff --git a/bfd/doc/bfd.texi b/bfd/doc/bfd.texi index 60061d52b6e..e177100561f 100644 --- a/bfd/doc/bfd.texi +++ b/bfd/doc/bfd.texi @@ -199,7 +199,6 @@ IEEE-695. * typedef bfd:: * Error reporting:: * Initialization:: -* Threading:: * Miscellaneous:: * Memory Usage:: * Sections:: diff --git a/gas/ChangeLog b/gas/ChangeLog index 7d390dbdce8..b1c8d09bf1b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,16 @@ +2024-01-29 Jose E. Marchesi + + * doc/c-bpf.texi (BPF Instructions): There is no indirect 64-bit + load instruction. + (BPF Instructions): There is no absolute 64-bit load instruction. + * testsuite/gas/bpf/mem.s: Update test accordingly. + * testsuite/gas/bpf/mem-be-pseudoc.d: Likewise. + * testsuite/gas/bpf/mem-be.d: Likewise. + * testsuite/gas/bpf/mem-pseudoc.d: Likewise. + * testsuite/gas/bpf/mem-pseudoc.s: Likewise. + * testsuite/gas/bpf/mem.d: Likewise. + * testsuite/gas/bpf/mem.s: Likewise. + 2024-01-15 Nick Clifton * configure: Regenerate. diff --git a/gas/doc/c-bpf.texi b/gas/doc/c-bpf.texi index db8cd1115fd..d99538f16a9 100644 --- a/gas/doc/c-bpf.texi +++ b/gas/doc/c-bpf.texi @@ -451,10 +451,6 @@ tree for more information. Absolute loads: @table @code -@item ldabsdw imm32 -@itemx r0 = *(u64 *) skb[imm32] -Absolute 64-bit load. - @item ldabsw imm32 @itemx r0 = *(u32 *) skb[imm32] Absolute 32-bit load. @@ -471,10 +467,6 @@ Absolute 8-bit load. Indirect loads: @table @code -@item ldinddw rs, imm32 -@itemx r0 = *(u64 *) skb[rs + imm32] -Indirect 64-bit load. - @item ldindw rs, imm32 @itemx r0 = *(u32 *) skb[rs + imm32] Indirect 32-bit load. diff --git a/gas/testsuite/gas/bpf/mem-be-pseudoc.d b/gas/testsuite/gas/bpf/mem-be-pseudoc.d index 3d40567223f..b7715c463a2 100644 --- a/gas/testsuite/gas/bpf/mem-be-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-be-pseudoc.d @@ -11,26 +11,23 @@ Disassembly of section .text: 0: 20 00 00 00 00 00 be ef r0=\*\(u32\*\)skb\[0xbeef\] 8: 28 00 00 00 00 00 be ef r0=\*\(u16\*\)skb\[0xbeef\] 10: 30 00 00 00 00 00 be ef r0=\*\(u8\*\)skb\[0xbeef\] - 18: 38 00 00 00 00 00 be ef r0=\*\(u64\*\)skb\[0xbeef\] - 20: 40 03 00 00 00 00 be ef r0=\*\(u32\*\)skb\[r3\+0xbeef\] - 28: 48 05 00 00 00 00 be ef r0=\*\(u16\*\)skb\[r5\+0xbeef\] - 30: 50 07 00 00 00 00 be ef r0=\*\(u8\*\)skb\[r7\+0xbeef\] - 38: 58 09 00 00 00 00 be ef r0=\*\(u64\*\)skb\[r9\+0xbeef\] - 40: 61 21 7e ef 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x7eef\) - 48: 69 21 7e ef 00 00 00 00 r2=\*\(u16\*\)\(r1\+0x7eef\) - 50: 71 21 7e ef 00 00 00 00 r2=\*\(u8\*\)\(r1\+0x7eef\) - 58: 79 21 ff fe 00 00 00 00 r2=\*\(u64\*\)\(r1\+0xfffe\) - 60: 63 12 7e ef 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 - 68: 6b 12 7e ef 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 - 70: 73 12 7e ef 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 - 78: 7b 12 ff fe 00 00 00 00 \*\(u64\*\)\(r1\+0xfffe\)=r2 - 80: 72 10 7e ef 11 22 33 44 \*\(u8\*\)\(r1\+0x7eef\)=0x11223344 - 88: 6a 10 7e ef 11 22 33 44 \*\(u16\*\)\(r1\+0x7eef\)=0x11223344 - 90: 62 10 7e ef 11 22 33 44 \*\(u32\*\)\(r1\+0x7eef\)=0x11223344 - 98: 7a 10 ff fe 11 22 33 44 \*\(u64\*\)\(r1\+0xfffe\)=0x11223344 - a0: 81 21 7e ef 00 00 00 00 r2=\*\(s32\*\)\(r1\+0x7eef\) - a8: 89 21 7e ef 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) - b0: 91 21 7e ef 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) - b8: 99 21 7e ef 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) - c0: 58 05 00 00 00 00 00 00 r0=\*\(u64\*\)skb\[r5\+0x0\] - c8: 61 21 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) + 18: 40 03 00 00 00 00 be ef r0=\*\(u32\*\)skb\[r3\+0xbeef\] + 20: 48 05 00 00 00 00 be ef r0=\*\(u16\*\)skb\[r5\+0xbeef\] + 28: 50 07 00 00 00 00 be ef r0=\*\(u8\*\)skb\[r7\+0xbeef\] + 30: 61 21 7e ef 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x7eef\) + 38: 69 21 7e ef 00 00 00 00 r2=\*\(u16\*\)\(r1\+0x7eef\) + 40: 71 21 7e ef 00 00 00 00 r2=\*\(u8\*\)\(r1\+0x7eef\) + 48: 79 21 ff fe 00 00 00 00 r2=\*\(u64\*\)\(r1\+0xfffe\) + 50: 63 12 7e ef 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 + 58: 6b 12 7e ef 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 + 60: 73 12 7e ef 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 + 68: 7b 12 ff fe 00 00 00 00 \*\(u64\*\)\(r1\+0xfffe\)=r2 + 70: 72 10 7e ef 11 22 33 44 \*\(u8\*\)\(r1\+0x7eef\)=0x11223344 + 78: 6a 10 7e ef 11 22 33 44 \*\(u16\*\)\(r1\+0x7eef\)=0x11223344 + 80: 62 10 7e ef 11 22 33 44 \*\(u32\*\)\(r1\+0x7eef\)=0x11223344 + 88: 7a 10 ff fe 11 22 33 44 \*\(u64\*\)\(r1\+0xfffe\)=0x11223344 + 90: 81 21 7e ef 00 00 00 00 r2=\*\(s32\*\)\(r1\+0x7eef\) + 98: 89 21 7e ef 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) + a0: 91 21 7e ef 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) + a8: 99 21 7e ef 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) + b0: 61 21 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) diff --git a/gas/testsuite/gas/bpf/mem-be.d b/gas/testsuite/gas/bpf/mem-be.d index cd7b35c60a3..fc71cbda9e1 100644 --- a/gas/testsuite/gas/bpf/mem-be.d +++ b/gas/testsuite/gas/bpf/mem-be.d @@ -11,26 +11,24 @@ Disassembly of section .text: 0: 20 00 00 00 00 00 be ef ldabsw 0xbeef 8: 28 00 00 00 00 00 be ef ldabsh 0xbeef 10: 30 00 00 00 00 00 be ef ldabsb 0xbeef - 18: 38 00 00 00 00 00 be ef ldabsdw 0xbeef - 20: 40 03 00 00 00 00 be ef ldindw %r3,0xbeef - 28: 48 05 00 00 00 00 be ef ldindh %r5,0xbeef - 30: 50 07 00 00 00 00 be ef ldindb %r7,0xbeef - 38: 58 09 00 00 00 00 be ef ldinddw %r9,0xbeef - 40: 61 21 7e ef 00 00 00 00 ldxw %r2,\[%r1\+0x7eef\] - 48: 69 21 7e ef 00 00 00 00 ldxh %r2,\[%r1\+0x7eef\] - 50: 71 21 7e ef 00 00 00 00 ldxb %r2,\[%r1\+0x7eef\] - 58: 79 21 ff fe 00 00 00 00 ldxdw %r2,\[%r1\+0xfffe\] - 60: 63 12 7e ef 00 00 00 00 stxw \[%r1\+0x7eef\],%r2 - 68: 6b 12 7e ef 00 00 00 00 stxh \[%r1\+0x7eef\],%r2 - 70: 73 12 7e ef 00 00 00 00 stxb \[%r1\+0x7eef\],%r2 - 78: 7b 12 ff fe 00 00 00 00 stxdw \[%r1\+0xfffe\],%r2 - 80: 72 10 7e ef 11 22 33 44 stb \[%r1\+0x7eef\],0x11223344 - 88: 6a 10 7e ef 11 22 33 44 sth \[%r1\+0x7eef\],0x11223344 - 90: 62 10 7e ef 11 22 33 44 stw \[%r1\+0x7eef\],0x11223344 - 98: 7a 10 ff fe 11 22 33 44 stdw \[%r1\+0xfffe\],0x11223344 - a0: 81 21 7e ef 00 00 00 00 ldxsw %r2,\[%r1\+0x7eef\] - a8: 89 21 7e ef 00 00 00 00 ldxsh %r2,\[%r1\+0x7eef\] - b0: 91 21 7e ef 00 00 00 00 ldxsb %r2,\[%r1\+0x7eef\] - b8: 99 21 7e ef 00 00 00 00 ldxsdw %r2,\[%r1\+0x7eef\] - c0: 79 21 00 00 00 00 00 00 ldxdw %r2,\[%r1\+0x0\] - c8: 40 03 00 00 00 00 00 00 ldindw %r3,0x0 + 18: 40 03 00 00 00 00 be ef ldindw %r3,0xbeef + 20: 48 05 00 00 00 00 be ef ldindh %r5,0xbeef + 28: 50 07 00 00 00 00 be ef ldindb %r7,0xbeef + 30: 61 21 7e ef 00 00 00 00 ldxw %r2,\[%r1\+0x7eef\] + 38: 69 21 7e ef 00 00 00 00 ldxh %r2,\[%r1\+0x7eef\] + 40: 71 21 7e ef 00 00 00 00 ldxb %r2,\[%r1\+0x7eef\] + 48: 79 21 ff fe 00 00 00 00 ldxdw %r2,\[%r1\+0xfffe\] + 50: 63 12 7e ef 00 00 00 00 stxw \[%r1\+0x7eef\],%r2 + 58: 6b 12 7e ef 00 00 00 00 stxh \[%r1\+0x7eef\],%r2 + 60: 73 12 7e ef 00 00 00 00 stxb \[%r1\+0x7eef\],%r2 + 68: 7b 12 ff fe 00 00 00 00 stxdw \[%r1\+0xfffe\],%r2 + 70: 72 10 7e ef 11 22 33 44 stb \[%r1\+0x7eef\],0x11223344 + 78: 6a 10 7e ef 11 22 33 44 sth \[%r1\+0x7eef\],0x11223344 + 80: 62 10 7e ef 11 22 33 44 stw \[%r1\+0x7eef\],0x11223344 + 88: 7a 10 ff fe 11 22 33 44 stdw \[%r1\+0xfffe\],0x11223344 + 90: 81 21 7e ef 00 00 00 00 ldxsw %r2,\[%r1\+0x7eef\] + 98: 89 21 7e ef 00 00 00 00 ldxsh %r2,\[%r1\+0x7eef\] + a0: 91 21 7e ef 00 00 00 00 ldxsb %r2,\[%r1\+0x7eef\] + a8: 99 21 7e ef 00 00 00 00 ldxsdw %r2,\[%r1\+0x7eef\] + b0: 79 21 00 00 00 00 00 00 ldxdw %r2,\[%r1\+0x0\] + b8: 40 03 00 00 00 00 00 00 ldindw %r3,0x0 diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.d b/gas/testsuite/gas/bpf/mem-pseudoc.d index 7c37c16b6b8..b704de51f8f 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-pseudoc.d @@ -11,26 +11,23 @@ Disassembly of section .text: 0: 20 00 00 00 ef be 00 00 r0=\*\(u32\*\)skb\[0xbeef\] 8: 28 00 00 00 ef be 00 00 r0=\*\(u16\*\)skb\[0xbeef\] 10: 30 00 00 00 ef be 00 00 r0=\*\(u8\*\)skb\[0xbeef\] - 18: 38 00 00 00 ef be 00 00 r0=\*\(u64\*\)skb\[0xbeef\] - 20: 40 30 00 00 ef be 00 00 r0=\*\(u32\*\)skb\[r3\+0xbeef\] - 28: 48 50 00 00 ef be 00 00 r0=\*\(u16\*\)skb\[r5\+0xbeef\] - 30: 50 70 00 00 ef be 00 00 r0=\*\(u8\*\)skb\[r7\+0xbeef\] - 38: 58 90 00 00 ef be 00 00 r0=\*\(u64\*\)skb\[r9\+0xbeef\] - 40: 61 12 ef 7e 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x7eef\) - 48: 69 12 ef 7e 00 00 00 00 r2=\*\(u16\*\)\(r1\+0x7eef\) - 50: 71 12 ef 7e 00 00 00 00 r2=\*\(u8\*\)\(r1\+0x7eef\) - 58: 79 12 fe ff 00 00 00 00 r2=\*\(u64\*\)\(r1\+0xfffe\) - 60: 63 21 ef 7e 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 - 68: 6b 21 ef 7e 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 - 70: 73 21 ef 7e 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 - 78: 7b 21 fe ff 00 00 00 00 \*\(u64\*\)\(r1\+0xfffe\)=r2 - 80: 72 01 ef 7e 44 33 22 11 \*\(u8\*\)\(r1\+0x7eef\)=0x11223344 - 88: 6a 01 ef 7e 44 33 22 11 \*\(u16\*\)\(r1\+0x7eef\)=0x11223344 - 90: 62 01 ef 7e 44 33 22 11 \*\(u32\*\)\(r1\+0x7eef\)=0x11223344 - 98: 7a 01 fe ff 44 33 22 11 \*\(u64\*\)\(r1\+0xfffe\)=0x11223344 - a0: 81 12 ef 7e 00 00 00 00 r2=\*\(s32\*\)\(r1\+0x7eef\) - a8: 89 12 ef 7e 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) - b0: 91 12 ef 7e 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) - b8: 99 12 ef 7e 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) - c0: 58 50 00 00 00 00 00 00 r0=\*\(u64\*\)skb\[r5\+0x0\] - c8: 61 12 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) + 18: 40 30 00 00 ef be 00 00 r0=\*\(u32\*\)skb\[r3\+0xbeef\] + 20: 48 50 00 00 ef be 00 00 r0=\*\(u16\*\)skb\[r5\+0xbeef\] + 28: 50 70 00 00 ef be 00 00 r0=\*\(u8\*\)skb\[r7\+0xbeef\] + 30: 61 12 ef 7e 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x7eef\) + 38: 69 12 ef 7e 00 00 00 00 r2=\*\(u16\*\)\(r1\+0x7eef\) + 40: 71 12 ef 7e 00 00 00 00 r2=\*\(u8\*\)\(r1\+0x7eef\) + 48: 79 12 fe ff 00 00 00 00 r2=\*\(u64\*\)\(r1\+0xfffe\) + 50: 63 21 ef 7e 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 + 58: 6b 21 ef 7e 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 + 60: 73 21 ef 7e 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 + 68: 7b 21 fe ff 00 00 00 00 \*\(u64\*\)\(r1\+0xfffe\)=r2 + 70: 72 01 ef 7e 44 33 22 11 \*\(u8\*\)\(r1\+0x7eef\)=0x11223344 + 78: 6a 01 ef 7e 44 33 22 11 \*\(u16\*\)\(r1\+0x7eef\)=0x11223344 + 80: 62 01 ef 7e 44 33 22 11 \*\(u32\*\)\(r1\+0x7eef\)=0x11223344 + 88: 7a 01 fe ff 44 33 22 11 \*\(u64\*\)\(r1\+0xfffe\)=0x11223344 + 90: 81 12 ef 7e 00 00 00 00 r2=\*\(s32\*\)\(r1\+0x7eef\) + 98: 89 12 ef 7e 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) + a0: 91 12 ef 7e 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) + a8: 99 12 ef 7e 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) + b0: 61 12 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.s b/gas/testsuite/gas/bpf/mem-pseudoc.s index 823083d498a..19907753916 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.s +++ b/gas/testsuite/gas/bpf/mem-pseudoc.s @@ -4,11 +4,9 @@ r0 = *(u32 *)skb[48879] r0 = *(u16 *)skb[48879] r0 = *(u8 *)skb[48879] - r0 = *(u64 *)skb[48879] r0 = *(u32 *)skb[r3 + 0xbeef] r0 = *(u16 *)skb[r5 + 0xbeef] r0 = *(u8 *)skb[r7 + 0xbeef] - r0 = *(u64 *)skb[r9 + 0xbeef] r2 = *(u32 *)(r1 + 32495) r2 = *(u16 *)(r1 + 32495) r2 = *(u8 *)(r1 + 32495) @@ -25,5 +23,4 @@ r2 = *(s16*)(r1+0x7eef) r2 = *(s8*)(r1+0x7eef) r2 = *(s64*)(r1+0x7eef) - r0 = *(u64 *)skb[r5 + 0] r2 = *(u32 *)(r1 + 0) diff --git a/gas/testsuite/gas/bpf/mem.d b/gas/testsuite/gas/bpf/mem.d index 9a1e7095df0..e51ebb103fb 100644 --- a/gas/testsuite/gas/bpf/mem.d +++ b/gas/testsuite/gas/bpf/mem.d @@ -11,26 +11,24 @@ Disassembly of section .text: 0: 20 00 00 00 ef be 00 00 ldabsw 0xbeef 8: 28 00 00 00 ef be 00 00 ldabsh 0xbeef 10: 30 00 00 00 ef be 00 00 ldabsb 0xbeef - 18: 38 00 00 00 ef be 00 00 ldabsdw 0xbeef - 20: 40 30 00 00 ef be 00 00 ldindw %r3,0xbeef - 28: 48 50 00 00 ef be 00 00 ldindh %r5,0xbeef - 30: 50 70 00 00 ef be 00 00 ldindb %r7,0xbeef - 38: 58 90 00 00 ef be 00 00 ldinddw %r9,0xbeef - 40: 61 12 ef 7e 00 00 00 00 ldxw %r2,\[%r1\+0x7eef\] - 48: 69 12 ef 7e 00 00 00 00 ldxh %r2,\[%r1\+0x7eef\] - 50: 71 12 ef 7e 00 00 00 00 ldxb %r2,\[%r1\+0x7eef\] - 58: 79 12 fe ff 00 00 00 00 ldxdw %r2,\[%r1\+0xfffe\] - 60: 63 21 ef 7e 00 00 00 00 stxw \[%r1\+0x7eef\],%r2 - 68: 6b 21 ef 7e 00 00 00 00 stxh \[%r1\+0x7eef\],%r2 - 70: 73 21 ef 7e 00 00 00 00 stxb \[%r1\+0x7eef\],%r2 - 78: 7b 21 fe ff 00 00 00 00 stxdw \[%r1\+0xfffe\],%r2 - 80: 72 01 ef 7e 44 33 22 11 stb \[%r1\+0x7eef\],0x11223344 - 88: 6a 01 ef 7e 44 33 22 11 sth \[%r1\+0x7eef\],0x11223344 - 90: 62 01 ef 7e 44 33 22 11 stw \[%r1\+0x7eef\],0x11223344 - 98: 7a 01 fe ff 44 33 22 11 stdw \[%r1\+0xfffe\],0x11223344 - a0: 81 12 ef 7e 00 00 00 00 ldxsw %r2,\[%r1\+0x7eef\] - a8: 89 12 ef 7e 00 00 00 00 ldxsh %r2,\[%r1\+0x7eef\] - b0: 91 12 ef 7e 00 00 00 00 ldxsb %r2,\[%r1\+0x7eef\] - b8: 99 12 ef 7e 00 00 00 00 ldxsdw %r2,\[%r1\+0x7eef\] - c0: 79 12 00 00 00 00 00 00 ldxdw %r2,\[%r1\+0x0\] - c8: 40 30 00 00 00 00 00 00 ldindw %r3,0x0 + 18: 40 30 00 00 ef be 00 00 ldindw %r3,0xbeef + 20: 48 50 00 00 ef be 00 00 ldindh %r5,0xbeef + 28: 50 70 00 00 ef be 00 00 ldindb %r7,0xbeef + 30: 61 12 ef 7e 00 00 00 00 ldxw %r2,\[%r1\+0x7eef\] + 38: 69 12 ef 7e 00 00 00 00 ldxh %r2,\[%r1\+0x7eef\] + 40: 71 12 ef 7e 00 00 00 00 ldxb %r2,\[%r1\+0x7eef\] + 48: 79 12 fe ff 00 00 00 00 ldxdw %r2,\[%r1\+0xfffe\] + 50: 63 21 ef 7e 00 00 00 00 stxw \[%r1\+0x7eef\],%r2 + 58: 6b 21 ef 7e 00 00 00 00 stxh \[%r1\+0x7eef\],%r2 + 60: 73 21 ef 7e 00 00 00 00 stxb \[%r1\+0x7eef\],%r2 + 68: 7b 21 fe ff 00 00 00 00 stxdw \[%r1\+0xfffe\],%r2 + 70: 72 01 ef 7e 44 33 22 11 stb \[%r1\+0x7eef\],0x11223344 + 78: 6a 01 ef 7e 44 33 22 11 sth \[%r1\+0x7eef\],0x11223344 + 80: 62 01 ef 7e 44 33 22 11 stw \[%r1\+0x7eef\],0x11223344 + 88: 7a 01 fe ff 44 33 22 11 stdw \[%r1\+0xfffe\],0x11223344 + 90: 81 12 ef 7e 00 00 00 00 ldxsw %r2,\[%r1\+0x7eef\] + 98: 89 12 ef 7e 00 00 00 00 ldxsh %r2,\[%r1\+0x7eef\] + a0: 91 12 ef 7e 00 00 00 00 ldxsb %r2,\[%r1\+0x7eef\] + a8: 99 12 ef 7e 00 00 00 00 ldxsdw %r2,\[%r1\+0x7eef\] + b0: 79 12 00 00 00 00 00 00 ldxdw %r2,\[%r1\+0x0\] + b8: 40 30 00 00 00 00 00 00 ldindw %r3,0x0 diff --git a/gas/testsuite/gas/bpf/mem.s b/gas/testsuite/gas/bpf/mem.s index adeda473bb8..1a10b595af0 100644 --- a/gas/testsuite/gas/bpf/mem.s +++ b/gas/testsuite/gas/bpf/mem.s @@ -5,11 +5,9 @@ ldabsw 0xbeef ldabsh 0xbeef ldabsb 0xbeef - ldabsdw 0xbeef ldindw %r3, 0xbeef ldindh %r5, 0xbeef ldindb %r7, 0xbeef - ldinddw %r9, 0xbeef ldxw %r2, [%r1+0x7eef] ldxh %r2, [%r1+0x7eef] ldxb %r2, [%r1+0x7eef] diff --git a/include/ChangeLog b/include/ChangeLog index 1c9477a022e..4b667bfa307 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2024-01-29 Jose E. Marchesi + + * opcode/bpf.h (enum bpf_insn_id): Remove BPF_INSN_LDINDDW and + BPF_INSN_LDABSDW instructions. + 2024-01-15 Nick Clifton * 2.42 branch point. diff --git a/include/opcode/bpf.h b/include/opcode/bpf.h index 61f1ec8a079..df1e3bd0918 100644 --- a/include/opcode/bpf.h +++ b/include/opcode/bpf.h @@ -188,9 +188,9 @@ enum bpf_insn_id BPF_INSN_ENDLE16, BPF_INSN_ENDLE32, BPF_INSN_ENDLE64, BPF_INSN_ENDBE16, BPF_INSN_ENDBE32, BPF_INSN_ENDBE64, /* Absolute load instructions. */ - BPF_INSN_LDABSB, BPF_INSN_LDABSH, BPF_INSN_LDABSW, BPF_INSN_LDABSDW, + BPF_INSN_LDABSB, BPF_INSN_LDABSH, BPF_INSN_LDABSW, /* Indirect load instructions. */ - BPF_INSN_LDINDB, BPF_INSN_LDINDH, BPF_INSN_LDINDW, BPF_INSN_LDINDDW, + BPF_INSN_LDINDB, BPF_INSN_LDINDH, BPF_INSN_LDINDW, /* Generic load instructions (to register.) */ BPF_INSN_LDXB, BPF_INSN_LDXH, BPF_INSN_LDXW, BPF_INSN_LDXDW, /* Generic signed load instructions. */ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index a83b68e4a55..4bc815780fd 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2024-01-29 Jose E. Marchesi + + * bpf-opc.c (bpf_opcodes): Remove BPF_INSN_LDINDDW and + BPF_INSN_LDABSDW instructions. + 2024-01-15 Nick Clifton * configure: Regenerate. diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c index 750d048aae3..19e096501a2 100644 --- a/opcodes/bpf-opc.c +++ b/opcodes/bpf-opc.c @@ -198,8 +198,6 @@ const struct bpf_opcode bpf_opcodes[] = BPF_V1, BPF_CODE, BPF_CLASS_LD|BPF_SIZE_H|BPF_MODE_IND}, {BPF_INSN_LDINDW, "ldindw%W%sr , %i32", "r0 = * ( u32 * ) skb [ %sr %I32 ]", BPF_V1, BPF_CODE, BPF_CLASS_LD|BPF_SIZE_W|BPF_MODE_IND}, - {BPF_INSN_LDINDDW, "ldinddw%W%sr , %i32", "r0 = * ( u64 * ) skb [ %sr %I32 ]", - BPF_V1, BPF_CODE, BPF_CLASS_LD|BPF_SIZE_DW|BPF_MODE_IND}, /* Absolute load instructions, designed to be used in socket filters. */ {BPF_INSN_LDABSB, "ldabsb%W%i32", "r0 = * ( u8 * ) skb [ %i32 ]", @@ -208,8 +206,6 @@ const struct bpf_opcode bpf_opcodes[] = BPF_V1, BPF_CODE, BPF_CLASS_LD|BPF_SIZE_H|BPF_MODE_ABS}, {BPF_INSN_LDABSW, "ldabsw%W%i32", "r0 = * ( u32 * ) skb [ %i32 ]", BPF_V1, BPF_CODE, BPF_CLASS_LD|BPF_SIZE_W|BPF_MODE_ABS}, - {BPF_INSN_LDABSDW, "ldabsdw%W%i32", "r0 = * ( u64 * ) skb [ %i32 ]", - BPF_V1, BPF_CODE, BPF_CLASS_LD|BPF_SIZE_DW|BPF_MODE_ABS}, /* Generic load instructions (to register.) */ {BPF_INSN_LDXB, "ldxb%W%dr , [ %sr %o16 ]", "%dr = * ( u8 * ) ( %sr %o16 )", -- 2.30.2