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 6C5763853830 for ; Fri, 21 Jul 2023 18:02:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6C5763853830 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 (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36LEG8vT016592 for ; Fri, 21 Jul 2023 18:02:34 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-03-30; bh=40CuEt3NgyZ92KwtkQfcgKnfq3bHemqPG/7PYV+f2Pg=; b=hjeLnS6v7Us6RdyDyxjZZEYswSNHdMXD7ns3citmrD4ZSKN6V5AhPZyJ/EvBK4qHP1b+ 8fzvb2LqLaxItf0SXXKXK/5shC6BOixwyR2OINf6Z0bMDvWZnS0G6xl3xoPdBhtQYFUE 7e5/DPsbxBL5BmgvgOf6JZ0Y6Oi+UwXGxsSzZ6+Dle8Lgu/1NSihvw2mPWgUFVBr/3xU EXmZEZ8mbe6+veaPaN8wRB6wn9ed4y0CQ8bvUOVaB3OG4Dbup6aga3XwZpK6slM4eKa3 DbDUWlyaHs5kkjK/7H0/Lnosq3W0WM3TI3G91wdPiXKqctYXRLjajG/xrwbTsgpyQm1M pA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3run78c9wu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 21 Jul 2023 18:02:34 +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 36LHBNZt038244 for ; Fri, 21 Jul 2023 18:02:33 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ruhwa9tx9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 21 Jul 2023 18:02:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l4IEo0udNV7gkOgnPHwNC9gS+7gt6lO0qXf/ukBr42N8/W2L6YiHIgQ6HZP9mn2plFNBahnKWevUimbgcvUA/8oWdhJ170Ss6yNXqBjH9Yuci+1oeCrd56uvwlXd7dfr2q0XVWOcxgYcm0+vzhqPCvwSRsW55M0k4wp4kYrqc/Vl0rghciX3GE1c03tMLy2afqQe1ajOmJkjJ763CI0Se3XhQXSzW0SY/Kr1Krmesytd22kr4bDe1iZP1PZBF9HHnHjKmJB2TzihoidAxe+6AeWlAbvyjblGnD6kRjJucWr9nyCzXAekCoWHis34rXNH3RbSlFGZdt8cwxuTMmLcCg== 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=40CuEt3NgyZ92KwtkQfcgKnfq3bHemqPG/7PYV+f2Pg=; b=NwnlNoPxmwfwyD7lDO7tbUJndl+aZofNWdLnA9wKx2PvyVynAHj2aed4TappOQrHkZuwwQLDtdg/r9dXWdS5kaJ/MR0GJHEOtOJjT7SNSXSyGNfMXXK+IE55uOhjQrZ1xqspfoBNkxtsI4bB7BgvxzhQoz30tjYfYgT4gOFD5XBX4qlg/o1XASBe4lFoTys0ofy+/vjEXAmCrMyIe26IfFknTkm0/CZ9Lq842k9I5RVrn3tLMfBOaYzyFmrMBQ3jc07FR9bNIdUC/hPZaf1HDI+SGy5WZJ3GqufYDilyl5tWcanlIQIJne4F7PHW0AMFZFky/1lvD3vcmbknkbvUag== 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=40CuEt3NgyZ92KwtkQfcgKnfq3bHemqPG/7PYV+f2Pg=; b=cB7h898JQYM/qRAwsF34NZvjYIAN+g/KnJiBt84rNA8SEysV2Vi6lMGWXdxcCVbgJauL69L1dg1J1AbpQ8/sJCtqslz4AIc5bsFD3nDre4hk1xQDlZTiv+YII7rUobo2lfYdJXfLy+3a/3DZZFvvkJ0Spmsqq4B+2AHFyyWZPUg= Received: from BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) by SA1PR10MB7855.namprd10.prod.outlook.com (2603:10b6:806:3a7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.23; Fri, 21 Jul 2023 18:02:30 +0000 Received: from BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::4d0c:9857:9b42:2f6c]) by BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::4d0c:9857:9b42:2f6c%4]) with mapi id 15.20.6609.026; Fri, 21 Jul 2023 18:02:30 +0000 From: "Jose E. Marchesi" To: binutils@sourceware.org Subject: [COMMITTED 2/2] bpf: opcodes, gas: support for signed load V4 instructions Date: Fri, 21 Jul 2023 20:02:20 +0200 Message-Id: <20230721180220.8632-1-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0246.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a7::17) To BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB2888:EE_|SA1PR10MB7855:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bce4ce5-ef43-4220-ae43-08db8a14a6b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 85dtSV54x/MXHF4xNRgOeO7rwP8Las0spqS73dRTkwspHUeDkY5bNp8NEBQLbZ1wfDTfSpzdqe7suLBTmY7NC2aHNxC3MDI0ftnGTmkYkTLY7Juwty0fNyLKH5yhxIbq46UVyal5wI0gebI6c96x2uFEZ4zgbZ0vmFelH/irZgKFDyvO0N3qI+N21O5Bu01+3zacrdU04PUQX0suERcsKk+H9boetKNbkWsdeQzoNK+xrobceaOOBD/7QkgyDD+iY4e8JVBamoyNgfdJnk3TihRiQNeWJ2AeTydhxslapOGGo3Asd1YX/z2K9uBteUDxO2mWeI5piFDkX/RvtTr/JFhUnHVFJfs6bHX0ap4LIcr6e4e4dvh8HXvoDKgCwwthKOL+daZ85gJsE8BJsD16Lvp82hMeKm/ZXIJKNrEUp9Ic7JCb+5Es+SGcqMP9VV8IEwMJ4E6mR+6tavopqUNfgdC4ymdo3tYzufcCs3EtGWUa12etzReZ3CqCfGnZK3hCWpIZNO3GlFpvDgQL7ctgTL1ewHy3tvA1ZEysmkpUy79nSZvSdLYjwY2KqFNfIvEj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB2888.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(136003)(366004)(346002)(376002)(396003)(451199021)(2906002)(8936002)(8676002)(66556008)(66476007)(66946007)(316002)(41300700001)(5660300002)(6916009)(6486002)(1076003)(6512007)(36756003)(186003)(6506007)(478600001)(6666004)(83380400001)(2616005)(26005)(38100700002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+KnBFoIbA2MA2zYfGhvFAkPSJ8yb7L3Ll1OmovYYHYOCnXQ9rgta1x79q/xm?= =?us-ascii?Q?cr6PC8pAgAU8kumfYCY0gWw5+1LoPy8SjD9LIIS3VBFgbdWSa9Eaq2TEanWg?= =?us-ascii?Q?3jnz6zO+1uUo7rexslhOtqCPX3QNJRpXu/SX1fWNPjtEZCCQY2qrsb9kOGv/?= =?us-ascii?Q?TLNRcZayO3Sz7+Bork4ilVkihHOiahpRtBCr4bRsJF3/AqOLv74braowXgZ1?= =?us-ascii?Q?30y9UNsnN5EYNCp/ehNgrXmme5iZPhesGW47nCKd6c8D1I2XjgmxG3igirBe?= =?us-ascii?Q?pHtxEAnSrmceVmGx0XppMarhiRT+TJNRb2roTFHlniaHK5XN3pjCgTZZIH8Y?= =?us-ascii?Q?kPHeAdWKhoE9gPoi3xnE9k39OhI1aDYusruPv9JVixXMWFKzkDNsak/4uE6+?= =?us-ascii?Q?Pq5sT40gX7Qkz/O94yJc6lf8n7RrtoDxjJ9pLO4pudluWDzup6b1AuRbnoBw?= =?us-ascii?Q?cG+8iW5EQYaS/BJ7usK283Q0wD1mNEGbnifcHXgj6JcZNYSGezo5Nbb5Bumo?= =?us-ascii?Q?IwLsTsqxpQyrXcMKtqySSnXDcUkIoa4dMZjfaqGbjqcyfQZrc0Uv79zko8qY?= =?us-ascii?Q?Qp0jXTAz1JS2U48ipv0LkcOcI0byx3q/+cQvOttF6wsZL2lS2x7Mh7KiDXav?= =?us-ascii?Q?Qm237CKqXAKCVe0YMnzbXyBWkGLgAhZyXWyAWyPfh3eMtEfUHUH07ieDwJHC?= =?us-ascii?Q?GAqUlkY9PTbI/ccdVeZxZHvbW0FPIlOWJ/VvBpQ7YlrxO4HH3WT4c/jp3PN3?= =?us-ascii?Q?1nrYZ2j0QyJCTbd6GCtxfS5GAlyccrunRk/0+U4zIdqxSHSAnr+hzs3TrSI4?= =?us-ascii?Q?Ivaapf38z/h0BPekz8ZFeB4eilYybiVtmsfwI9E7NCdCDyrtJQbs6M5TLQ/E?= =?us-ascii?Q?CtT90zZPvkxqelJwniDgH5VauOok1MHIZVbvfCPoJBjyNw3xkeTxVIvd2HRc?= =?us-ascii?Q?NjusCzsiTKVZUcAJRWF2L8IUSX6iFjDGEjUrSILEcxYexiebj8WLbNFBI44H?= =?us-ascii?Q?YUsRsGZL8mpeWn7KL8xMSpux4ldeNaVNi7sDWjqdfAa/J21FIIUOUV/TqnFr?= =?us-ascii?Q?XJSoNvLRaBAs1q9WZQXmG9bGgMFG6r6NPm26HNaHJa6ZH+Qqc+rELUOfCgxS?= =?us-ascii?Q?33Q0e0SDE4zOKu1t5HoMq7AcrC2s+yYds7UGd6OgGoH0JDYHSzsWLLSJALkk?= =?us-ascii?Q?gvbf76fo7qNKqmBhxbb/xTL+7N3hWr6B7ZysFXU29TS1s1t4sir2l/4J6OA+?= =?us-ascii?Q?Vw/TWeTuFkNLztZONCqde2hSA2z8iH54JqVCZtol5EBFBHfgUKm0CSSqEj//?= =?us-ascii?Q?7Vx58qfs5jrq+5pZ1y4veXD7hYxBqYo+Rk3yvwC4tQx1GU8oOPXOpIMA40Z2?= =?us-ascii?Q?R2Ke+rD6WgaVpW2h8NZ0eKRfcSO7p+2IZIdGZZwCbozsvLsFh0ePyjXHqAg6?= =?us-ascii?Q?RyGy8gZexcy6DRPMSp8eStXDtZiCmYBWcv4AyQ7Plvovq/cS8w2LPvmU7ct9?= =?us-ascii?Q?0y5v9NpQBKgMy14OHmBic8j2dZ9jL1fIDNWdf9y2YS+Ulmi/zHoWiyt43X6e?= =?us-ascii?Q?1fbziI1tL4n7ofL9Rb49Kt1FM6GDMzPTZGuoCN3j015V5iipqrhpSDZL1jYN?= =?us-ascii?Q?Xw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: XiVG8jdJZkPb4gUKTctPLqczh6YLcEHXFRELrO0F54pf84muhjrfuBB8dE3rn/i2bnJZ5h8+1ejAKMt0U2Obsk+mK7pfyyXhRUUmprXKA+smuhunqq0qb/umkVibwOeVXr5OaLBt0Ml657cWMcjjLpm1+Z7aFAyo088AsDFxPyT1eVZbUKkDweh84Se1FPkxpmfcbvvHn/ycCEngsEJjGDSe8Mp791F8kwrVY2b7i3/T2nf4pPj6kFiGqRdTuUv/18doNH7RFjKq5nGfSNnq0Vmto1bAdWlELd3o2bmexHggx6IUjQDOacDImd5E18BIwq39fd4/K4dNUwQdufwmHTbRF7lXyX39r2l+RRonwP0tFoFetwhlE0g56LdQCiJ1wrUwc5Xb42UC8QK7yVr99Q0vcIkRSCg5O8Kx/eKxYniuHmhV/8QvasN3VgnU2OevX0Vzc/9eL03rrCMxys76NonagAfqbqVMfeuYkqJZByRliaeyL0l1eMCivZVT+yJwEG5pNzgvUGs8NY+Bdxnb9629vL/Tip3h4dOEUZgvISzb4kilDsm2V24GSsP9JFGe4KLtpP2KBgdwnZvkpABDVjDU2d84N+jSJIcY0TcodHORfnFKpQQAOn3N3fdtA8cNSVVz8aZW677fGED7cmL+7JqnLSNzNABEKWtIW7Rdoqx/tSCWK85gKYRrapMqV48p+CGnCh6Xrl9AjPDzhS3Ng1etwHYWy4jjuiFDNIEJ/fv8L3g6j5zPKl7q9aelzLLc X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bce4ce5-ef43-4220-ae43-08db8a14a6b4 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2888.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2023 18:02:30.6150 (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: bAZyvM8T5qyDGdd3pwA/CfRNg0zKmE8qSOBXVzCKmJ91kdLHt7Qn5p42hQsK7Sgn6UYchK2o4xQjpmX5f81hdBgSd6zoDXla2GAJMf8M25w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7855 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-21_10,2023-07-20_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 phishscore=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307210158 X-Proofpoint-ORIG-GUID: dhCcKaPFiS60ImoP8PkMU4rX8FthdUet X-Proofpoint-GUID: dhCcKaPFiS60ImoP8PkMU4rX8FthdUet X-Spam-Status: No, score=-12.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: This commit adds the signed load to register (ldxs*) instructions introduced in the BPF ISA version 4, including opcodes and assembler tests. Tested in bpf-unknown-none. include/ChangeLog: 2023-07-21 Jose E. Marchesi * opcode/bpf.h (enum bpf_insn_id): Add entries for signed load instructions. (BPF_MODE_SMEM): Define. opcodes/ChangeLog: 2023-07-21 Jose E. Marchesi * bpf-opc.c (bpf_opcodes): Add entries for LDXS{B,W,H,DW} instructions. gas/ChangeLog: 2023-07-21 Jose E. Marchesi * testsuite/gas/bpf/mem.s: Add signed load instructions. * testsuite/gas/bpf/mem-pseudoc.s: Likewise. * testsuite/gas/bpf/mem.d: Likewise. * testsuite/gas/bpf/mem-pseudoc.d: Likewise. * testsuite/gas/bpf/mem-be.d: Likewise. * doc/c-bpf.texi (BPF Instructions): Document the signed load instructions. --- gas/ChangeLog | 10 ++++++++++ gas/doc/c-bpf.texi | 20 ++++++++++++++++++++ gas/testsuite/gas/bpf/mem-be-pseudoc.d | 4 ++++ gas/testsuite/gas/bpf/mem-be.d | 4 ++++ gas/testsuite/gas/bpf/mem-pseudoc.d | 4 ++++ gas/testsuite/gas/bpf/mem-pseudoc.s | 4 ++++ gas/testsuite/gas/bpf/mem.d | 4 ++++ gas/testsuite/gas/bpf/mem.s | 4 ++++ include/ChangeLog | 6 ++++++ include/opcode/bpf.h | 3 +++ opcodes/ChangeLog | 5 +++++ opcodes/bpf-opc.c | 10 ++++++++++ 12 files changed, 78 insertions(+) diff --git a/gas/ChangeLog b/gas/ChangeLog index 66c95a1b9a5..f91c04572ec 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2023-07-21 Jose E. Marchesi + + * testsuite/gas/bpf/mem.s: Add signed load instructions. + * testsuite/gas/bpf/mem-pseudoc.s: Likewise. + * testsuite/gas/bpf/mem.d: Likewise. + * testsuite/gas/bpf/mem-pseudoc.d: Likewise. + * testsuite/gas/bpf/mem-be.d: Likewise. + * doc/c-bpf.texi (BPF Instructions): Document the signed load + instructions. + 2023-07-21 Jose E. Marchesi * testsuite/gas/bpf/alu.s: Test movs instructions. diff --git a/gas/doc/c-bpf.texi b/gas/doc/c-bpf.texi index a3814e95c3a..bebf760f91f 100644 --- a/gas/doc/c-bpf.texi +++ b/gas/doc/c-bpf.texi @@ -483,6 +483,26 @@ Generic 16-bit load. Generic 8-bit load. @end table +Signed load to register instructions: + +@table @code +@item ldxsdw rd, [rs + offset16] +@itemx rd = *(i64 *) (rs + offset16) +Generic 64-bit signed load. + +@item ldxsw rd, [rs + offset16] +@itemx rd = *(i32 *) (rs + offset16) +Generic 32-bit signed load. + +@item ldxsh rd, [rs + offset16] +@itemx rd = *(i16 *) (rs + offset16) +Generic 16-bit signed load. + +@item ldxsb rd, [rs + offset16] +@itemx rd = *(i8 *) (rs + offset16) +Generic 8-bit signed load. +@end table + Store from register instructions: @table @code diff --git a/gas/testsuite/gas/bpf/mem-be-pseudoc.d b/gas/testsuite/gas/bpf/mem-be-pseudoc.d index ef13fe1f8a4..9a1ffc10984 100644 --- a/gas/testsuite/gas/bpf/mem-be-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-be-pseudoc.d @@ -28,3 +28,7 @@ Disassembly of section .text: 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=\*\(i32\*\)\(r1\+0x7eef\) + a8: 89 21 7e ef 00 00 00 00 r2=\*\(i16\*\)\(r1\+0x7eef\) + b0: 91 21 7e ef 00 00 00 00 r2=\*\(i8\*\)\(r1\+0x7eef\) + b8: 99 21 7e ef 00 00 00 00 r2=\*\(i64\*\)\(r1\+0x7eef\) diff --git a/gas/testsuite/gas/bpf/mem-be.d b/gas/testsuite/gas/bpf/mem-be.d index f24efaa4c7b..5746b6a9485 100644 --- a/gas/testsuite/gas/bpf/mem-be.d +++ b/gas/testsuite/gas/bpf/mem-be.d @@ -28,3 +28,7 @@ Disassembly of section .text: 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\] \ No newline at end of file diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.d b/gas/testsuite/gas/bpf/mem-pseudoc.d index 4e8b7d012e3..8481048504d 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-pseudoc.d @@ -28,3 +28,7 @@ Disassembly of section .text: 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=\*\(i32\*\)\(r1\+0x7eef\) + a8: 89 12 ef 7e 00 00 00 00 r2=\*\(i16\*\)\(r1\+0x7eef\) + b0: 91 12 ef 7e 00 00 00 00 r2=\*\(i8\*\)\(r1\+0x7eef\) + b8: 99 12 ef 7e 00 00 00 00 r2=\*\(i64\*\)\(r1\+0x7eef\) diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.s b/gas/testsuite/gas/bpf/mem-pseudoc.s index 7b8c832eb40..1ffa2e25926 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.s +++ b/gas/testsuite/gas/bpf/mem-pseudoc.s @@ -21,3 +21,7 @@ *(u16 *)(r1 + 0x7eef) = 0x11223344 *(u32 *)(r1 + 0x7eef) = 0x11223344 *(u64 *)(r1 + -2) = 0x11223344 + r2 = *(i32*)(r1+0x7eef) + r2 = *(i16*)(r1+0x7eef) + r2 = *(i8*)(r1+0x7eef) + r2 = *(i64*)(r1+0x7eef) diff --git a/gas/testsuite/gas/bpf/mem.d b/gas/testsuite/gas/bpf/mem.d index 669aae36ce7..8b7a488ae01 100644 --- a/gas/testsuite/gas/bpf/mem.d +++ b/gas/testsuite/gas/bpf/mem.d @@ -28,3 +28,7 @@ Disassembly of section .text: 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\] \ No newline at end of file diff --git a/gas/testsuite/gas/bpf/mem.s b/gas/testsuite/gas/bpf/mem.s index 798a18e2436..6323cf1ede7 100644 --- a/gas/testsuite/gas/bpf/mem.s +++ b/gas/testsuite/gas/bpf/mem.s @@ -22,3 +22,7 @@ sth [%r1+0x7eef], 0x11223344 stw [%r1+0x7eef], 0x11223344 stdw [%r1-2], 0x11223344 + ldxsw %r2, [%r1+0x7eef] + ldxsh %r2, [%r1+0x7eef] + ldxsb %r2, [%r1+0x7eef] + ldxsdw %r2, [%r1+0x7eef] diff --git a/include/ChangeLog b/include/ChangeLog index 5872f284533..ccf16619d1a 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2023-07-21 Jose E. Marchesi + + * opcode/bpf.h (enum bpf_insn_id): Add entries for signed load + instructions. + (BPF_MODE_SMEM): Define. + 2023-07-21 Jose E. Marchesi * opcode/bpf.h (BPF_OFFSET16_MOVS8): Define. diff --git a/include/opcode/bpf.h b/include/opcode/bpf.h index 48f06c264ba..a491df6fbdf 100644 --- a/include/opcode/bpf.h +++ b/include/opcode/bpf.h @@ -112,6 +112,7 @@ typedef uint64_t bpf_insn_word; #define BPF_MODE_IND ((uint64_t)0x40 << 56) #define BPF_MODE_MEM ((uint64_t)0x60 << 56) #define BPF_MODE_ATOMIC ((uint64_t)0xc0 << 56) +#define BPF_MODE_SMEM ((uint64_t)0x80 << 56) #define BPF_SIZE_W ((uint64_t)0x00 << 56) #define BPF_SIZE_H ((uint64_t)0x08 << 56) @@ -186,6 +187,8 @@ enum bpf_insn_id BPF_INSN_LDINDB, BPF_INSN_LDINDH, BPF_INSN_LDINDW, BPF_INSN_LDINDDW, /* Generic load instructions (to register.) */ BPF_INSN_LDXB, BPF_INSN_LDXH, BPF_INSN_LDXW, BPF_INSN_LDXDW, + /* Generic signed load instructions. */ + BPF_INSN_LDXSB, BPF_INSN_LDXSH, BPF_INSN_LDXSW, BPF_INSN_LDXSDW, /* Generic store instructions (from register.) */ BPF_INSN_STXBR, BPF_INSN_STXHR, BPF_INSN_STXWR, BPF_INSN_STXDWR, BPF_INSN_STXBI, BPF_INSN_STXHI, BPF_INSN_STXWI, BPF_INSN_STXDWI, diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 55d4e7d657f..f88e9c846fb 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2023-07-21 Jose E. Marchesi + + * bpf-opc.c (bpf_opcodes): Add entries for LDXS{B,W,H,DW} + instructions. + 2023-07-21 Jose E. Marchesi * bpf-opc.c (bpf_opcodes): Add entries for MOVS{8,16,32}R and diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c index 72be1d956d5..efd32577821 100644 --- a/opcodes/bpf-opc.c +++ b/opcodes/bpf-opc.c @@ -217,6 +217,16 @@ const struct bpf_opcode bpf_opcodes[] = {BPF_INSN_LDXDW, "ldxdw%W%dr , [ %sr %o16 ]","%dr = * ( u64 * ) ( %sr %o16 )", BPF_V1, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_DW|BPF_MODE_MEM}, + /* Generic signed load instructions (to register.) */ + {BPF_INSN_LDXSB, "ldxsb%W%dr , [ %sr %o16 ]", "%dr = * ( i8 * ) ( %sr %o16 )", + BPF_V4, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_B|BPF_MODE_SMEM}, + {BPF_INSN_LDXSH, "ldxsh%W%dr , [ %sr %o16 ]", "%dr = * ( i16 * ) ( %sr %o16 )", + BPF_V4, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_H|BPF_MODE_SMEM}, + {BPF_INSN_LDXSW, "ldxsw%W%dr , [ %sr %o16 ]", "%dr = * ( i32 * ) ( %sr %o16 )", + BPF_V4, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_W|BPF_MODE_SMEM}, + {BPF_INSN_LDXSDW, "ldxsdw%W%dr , [ %sr %o16 ]","%dr = * ( i64 * ) ( %sr %o16 )", + BPF_V4, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_DW|BPF_MODE_SMEM}, + /* Generic store instructions (from register.) */ {BPF_INSN_STXBR, "stxb%W[ %dr %o16 ] , %sr", "* ( u8 * ) ( %dr %o16 ) = %sr", BPF_V1, BPF_CODE, BPF_CLASS_STX|BPF_SIZE_B|BPF_MODE_MEM}, -- 2.30.2