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 DFFC838582A1 for ; Wed, 14 Feb 2024 16:30:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DFFC838582A1 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 DFFC838582A1 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=1707928254; cv=pass; b=AM985qRIXANegKLjPmdonSMH3peFXu1xFiXIZ1TD18Xgdit77ZVF22WUWmcXHtlSw/Vt70u377Wx2pPmtxdgWAM8qwrzBE/e32qwraHSrVqM2diabQXFRYxk/INKS+s/TpZJxjbtS31X8/zuC5627hqOa4iBBMIZ2kXBT00BuXo= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1707928254; c=relaxed/simple; bh=y0RqXifjyuTr15yhUeaTkV2BMoQt5d37XiTXh/IaVHE=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=dyrewW/wpYi0uh29yN+q/TSUrJZjHi2SXc9wOpAmd2aBiN+y+EpFVO4OsHFew4PkYfRPTdSiNDtyXaMfSIMMMpkjdD60Qt87xtvM6dbDpkt0ASn8xrpdPrJ6UwcOnyEtQBaH3867BvncQGq++kf4pl+euWIAYarxl6heAFW4Kkw= ARC-Authentication-Results: i=2; server2.sourceware.org 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 41EGDomZ004021; Wed, 14 Feb 2024 16:30:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : in-reply-to : references : date : message-id : content-type : mime-version; s=corp-2023-11-20; bh=AB54cBSb0ulXfg+I/H1uH0m8IwLX/v7k6S7mMp38SjI=; b=QcPjvn+Nflndb7jgbLRzRZMeQOC0bDYZwH/aVcInr5gc9W0OjBfwc7fKft3c1z4mYpc9 vMsAlzetyKp25vgO5bJ5o7vmKKqLdrzcXvb/XuXTY1a7JRVjaYiGO9/k24baCCsNm84R L3s4/tFVR0tJHQlnwQPAKL76gLW5/r77EMavNN7JtyR7VtwRuqwmqLzcdqemiLilydTM r0AAnEVnrof93LwPQ6U9zu1ynN52oMifu5g7C51s0g9w6UShow6OolSWjIBxDQTAzFrV c9K015VWbT11pZs1QkaEGGNdwqKm/TeiMQjeWhPjK1cnSZB9di9nG7DGpMbEu9TM77k7 UQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w8yu988f7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 Feb 2024 16:30:48 +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 41EGUITr015276; Wed, 14 Feb 2024 16:30:46 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w5yk9665j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 Feb 2024 16:30:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j2iP0bS+PCZWrkvLdsOC1uqBMV6Kt76qWUMflKCxR89hxokrDIvIxb8T7DhadFHvMc9v0Qyd43NLfuG1V2U84FjmP7/W5MLlllIXz/d8xLney20v+erPuwxcPFLx0531OR6nKI4ebkEAGuF9HwE8b2Fy92TV74C6+1CYLOlTxKl39T+J7CHWZtlSIrY4a1BicucgFSlpahzpmOl8PV5yNHpNFw5VQuGHhYoBmlSUaj10U2DzonbIASiTF+dy6Hpy8gPpGXtnwmoHBDDjLDYaMLGtbqFS+NPaI99Eg3Gkye9xTHASmEHuYlSj9vFyErsg90dq8enC7IYOYTFSAvtNcw== 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=AB54cBSb0ulXfg+I/H1uH0m8IwLX/v7k6S7mMp38SjI=; b=JbX1KdLuiDtoigJPweUclC4A3DGX/pKdn/RfCy99YPmVphvan5rqavsXC0Gk6JbtktF9zJvS8X/QrxdnZ7N4bLDWIGNXwszWsZes1/ZUItyin0CVjAvdvPAMymcf7PvXgNQPj/kEHZYtsi3j7wfFLW1Oe2am6Lu+fikHbhua1/lj+CxOj4BzvYDq3jNRRwBWZxDwrwxTfYUhKHxQXL6W6LRaJlQIBySp9h3VBG6zGqE/Rx8j/XK+lLA/455FyI6LshtMOcAaIhyQsMOsWs/Ikx657bk7Vaq5TM+Sbt/VMTh7kKffkGAZMn9vlNVq1rYLdTqFYxwA7BDfUIBs6cFygg== 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=AB54cBSb0ulXfg+I/H1uH0m8IwLX/v7k6S7mMp38SjI=; b=nUtKHcKhbpan4j/9PP7fX9jU32jdjRYKcBF/tuIZpAuRuVMooJreaWk0EhTFUsaScJMOfYKLvPmt2VnSKajXfQYZWTZ4zQF2mG3CeNR4N1WlrKlaCIxpmFBUqXRB011pnx6yNkDCWC3bGNbQn8ScTR7IOl78U41/AS3vinqXjxw= Received: from DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) by IA1PR10MB6193.namprd10.prod.outlook.com (2603:10b6:208:3a7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Wed, 14 Feb 2024 16:30:44 +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.7270.036; Wed, 14 Feb 2024 16:30:43 +0000 From: "Jose E. Marchesi" To: Will Hawkins Cc: binutils@sourceware.org, yonghong.song@linux.dev Subject: Re: [PATCH v3 1/1] objdump, as: Add callx support for BPF CPU v1 In-Reply-To: <20240214160303.869180-2-hawkinsw@obs.cr> (Will Hawkins's message of "Wed, 14 Feb 2024 11:03:00 -0500") References: <20240214160303.869180-1-hawkinsw@obs.cr> <20240214160303.869180-2-hawkinsw@obs.cr> Date: Wed, 14 Feb 2024 17:30:39 +0100 Message-ID: <87bk8jknyo.fsf@oracle.com> User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0380.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18f::7) To DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB3113:EE_|IA1PR10MB6193:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b60d248-f0b4-421b-7a9c-08dc2d7a4a5d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0UY2BQ2IDeKIUzX7RgFMuSZMw6MVQruPeALcvYvjOvju21UvfsJGgHuGThMksyh4+bsJVG6HTANhoF18Da/BeBWRN69blbPDd2lFctyyHvqpzRUZnsd0wmyRSXEqOlTvvdyDYf2jc1jBhZtqlhdBRmRsO8OCbKdbXvyks2553FTK+ueiM9VsYIIU0x2tvujuKY6eHteDc083Z076+LBykTyxUKvpHogpGhbhwHT8SsYvqbrCkimK7QJeCRgQKB6dXsNSe0Riiy9x3hiIkuffgQT3RWl4jTeSVdighlQVyqdNxySa4X6Jnya38wyyYQ0lt/UgTDDJas3L8ZSaIPRU29eQCPeMxO3xgLilbRRuaup8M6da6H545379DHAG8fDRYA2ReRGZuejAXZ12e+PqBYNwFUA3DvvcOr8ehBkWAbRHBTFIdg03LHZ/DOpFvMLCnE0H5vXRGHanj58Sha7SIxKkJW2/roqjXHKIaiKA3XkpU1i50OjeSQfXaKVIfsZn1bOiClt7Qvhnhkr6noNtOCY/eFL5/EgabM9Qbfv5ma5X/sOo2xHjoOJZs63oUGn4 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)(346002)(39860400002)(366004)(136003)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(2906002)(6506007)(36756003)(6486002)(6512007)(6666004)(478600001)(2616005)(41300700001)(83380400001)(4326008)(66476007)(8936002)(5660300002)(316002)(66946007)(86362001)(8676002)(26005)(38100700002)(6916009)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7wQJu3aLioWAT8eNDptDul6r20vE2+cAKLzujE4NJD8aEXR+h275dlemkvep?= =?us-ascii?Q?DBtcnpeJzxcQ98mD9FE8F/p+wq9bFGomPezVtwro9RCfB119CYjMpuuX/fli?= =?us-ascii?Q?8aJAhdHXFVGMBQ3Mb78THEd1R5i9HHccSwE1dIepD5lKR77uiQ7Vo/fzSis1?= =?us-ascii?Q?5lAzsS3qZW/ckKxMbhA+PMiPWnsqN2SEMAmKytRdybIPeBlB140xOJg9VGAY?= =?us-ascii?Q?bwFciHL5FzOqGNPRmlC6xdXkriqbcgHLPBda4t5pzEc7n9JALerjS3zUTfpC?= =?us-ascii?Q?/e8krKKtlWHyNvjXjGPdcNCsQcP1lEP3P1vW1Br1eefpGazMq25LXLXuIcFy?= =?us-ascii?Q?2eQHPHDyyfcek85ybI3CfGmKJps2Zm6lcVth1K6K+FMmDPs05rW1PrhMtHoV?= =?us-ascii?Q?fR+qyz65k53ROx6jUE1f/RNKjs1LdcrhtZKGwrHsPcyWPzFW5wl3/uvJtmrQ?= =?us-ascii?Q?Sdn7CDg7zmfidohKdoVvdlKjWwTcE2ueLPENfHlNUIN//4mnOcj6SrVA4JMF?= =?us-ascii?Q?1SNBZOaUiieLZiyQCiRjGT0NPoVvzHR9qw9z7nWDHnk1sCMfKX03iYrKcm7v?= =?us-ascii?Q?zKEte7o+8q2MgJmchGDPTEPIsfvt38vUK54Z0IFHXrDH0glrTaaaNs7qmMC6?= =?us-ascii?Q?a0wL4g3jCRxOlvAMMh9x0I0K8TYzbZBROZI8i+wB9r4sraV+fPM6c/iIRTwf?= =?us-ascii?Q?ajfq2EnEFkjKJZW+K4fg2YWWhFAaLFnAipGFn0uq7OyAnJX9a165wJxY/SBf?= =?us-ascii?Q?GyCDN4HCxHeBlmgxXZ1/JType/kr18DSZGTKusjyZP13DDcVvzIBJitAxwPe?= =?us-ascii?Q?/utMpPvv5JcStvtTgdOLZCaQckmsGnRwXSMxqrs60PHp6BczbiDAl5beh2c0?= =?us-ascii?Q?ekbaTqHjaXaGfbrY4pFnCwB9RB9O7SwagrmlfnmIsp1mLpxTdkrLqhTRp69g?= =?us-ascii?Q?VJMXbaMrlhbhxU/ZIU9QPbebd7plJ83hSbrMbuy6ka86hfEjDPRAtsrXXUtW?= =?us-ascii?Q?CvTU/MCEyqiINIAM7vehQt9HJljt/bwGdofuluvIYEAOxAAYKAhWjPC6wpRQ?= =?us-ascii?Q?rrWkh7Qe9uUIN2e9SqLbh/bt+yhFIFu8YMp6JOD1I/cnoyZqZho/IkX3Pe3k?= =?us-ascii?Q?jXUCVp+ctRUL2knbbgMUNj0ZH019jA+vuGqZk6XWjtpojaP4QMaSGFtvtCXd?= =?us-ascii?Q?NJQDmwXcx8Fen4I0cHQXoLAbVd/0f2QYJFT9FjttrWlOGCS4sgri2lNOaMd+?= =?us-ascii?Q?oTMoF0evpWTNdaZkm7W64ZTH8nTIzGNsiwg0hiMbspllepGDdnRR7Min9S0d?= =?us-ascii?Q?LXRC7qT6WLv3GdmSK2Cwa7xi1XWxK1ZIVXZ87pvpfV9YUFl5bSrvTqzAQdNx?= =?us-ascii?Q?hwlQLSsd2f2R50AccX1p4qI29E20hbluVgl6T3YSJEXRMmhewFkxZlgUV6JY?= =?us-ascii?Q?r8OJZn+hsReCqrB6K9n6P1OfB6nfV0Sn2i4y2zJyWAOBj129oTepbO5B/Nru?= =?us-ascii?Q?iJZyJOsmMFEIheRTvHe4xlVOFjwSsVevy2fD3wSLXBTzHl6E//GOPaoUaRJ9?= =?us-ascii?Q?nwycpIlxiGY+/AbJSt5yDlbKNgBrGrbKG6jmP7qP8gt2uiTpzzuAk+Jo+Y7B?= =?us-ascii?Q?vA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 8K0RfxD6IjH0mtb2G8/UyHpxRQvmO19Jwjv6EVuTZesf8lCo8018gP6gn975OKrmCR21BWZGyJyBwlG3iqyCn/a0ZeVy9ZxaRWTkQnJ72txgUcG/7O1ykbh6eMZ5X8lgyDmjY9KbZN8D6URYxgWZ1ZkGIf3kcm+mSnwHu1kby3CYpVLXp64tw/YjaGrcKsACxujH10ZDl7qLmvh3NLoqN0gxvSeOWK6+X/19/9rp25LKg9aOiE6b5H2/vXJdjKJ8NTQ0jD4/67rKAwLO3wY47mdXXufHSsAZE9JxbU2cA/ls9RhibkfpzI55S6UNVOEIaVxD1sgchGu/0OnrWoSoSdw2sorFtvQ5yMCZLN6drGzcUuUAApiDHUqO+mVwMGreN5ZGA43R4h5WBTUFqvYK346C5zx2vKTXGqePBytnAqw3LzgT+ok2hRrXA3L7ma8uGWqGJBFxIL9s0EzYwxe5B0vyRhqD4DpLN46RopXYUH1bueSE8BUsQwrw+lRUg7MMnqunxeenyHQUtmoVzg6eANPcWg17PAOPuWI084vIGmPo+lUB6u3ZFz69yje+kNWIAZZSCJC1Mx8qVqoE44WBJ07iXWFVjZQi367PYyFrkGw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b60d248-f0b4-421b-7a9c-08dc2d7a4a5d X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2024 16:30:43.8530 (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: HZwXLpXfQ/+O7+iG2Ozapcgzq+2R1p7CZY6RIMtXuxfj0/E/trI9f37FVcdbzvgW2MAoU7gDPuggCZHN/OKXo95s/Kcsxs80pRVYl/SNYx8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6193 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-02-14_08,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402140127 X-Proofpoint-ORIG-GUID: 4v8MEcFBiky1g5MeC1yGqsILPz5Qe7Ql X-Proofpoint-GUID: 4v8MEcFBiky1g5MeC1yGqsILPz5Qe7Ql 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,KAM_NUMSUBJECT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,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: Hi Will. Thanks for the patch. Please see some comments below. > Add support for (dis)assembling the callx instruction back to CPU v1. > > gas/ChangeLog: > > * testsuite/gas/bpf/indcall-1-pseudoc.d: Refactor tests ... > * testsuite/gas/bpf/indcall-1-pseudoc.s: ... to visually match ... > * testsuite/gas/bpf/indcall-1.d: ... equivalent test in ... > * testsuite/gas/bpf/indcall-1.s: ... clang/llvm. > > include/ChangeLog: > > * opcode/bpf.h (enum bpf_insn_id): BPF_INSN_CALLR to BPF_INSN_CALLX > * (for consistency) and add it to the v1 ISA variant. > > opcodes/ChangeLog: > > * bpf-opc.c: Use BPF_INSN_CALLX instead of BPF_INSN_CALLR. > > Signed-off-by: Will Hawkins > --- > gas/testsuite/gas/bpf/indcall-1-pseudoc.d | 8 ++++---- > gas/testsuite/gas/bpf/indcall-1-pseudoc.s | 6 +++--- > gas/testsuite/gas/bpf/indcall-1.d | 10 +++++----- > gas/testsuite/gas/bpf/indcall-1.s | 6 +++--- > include/opcode/bpf.h | 2 +- > opcodes/bpf-opc.c | 4 ++-- > 6 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d > index 7a95bad8e65..12f9d6a9d49 100644 > --- a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d > +++ b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d > @@ -1,4 +1,4 @@ > -#as: -EL -mdialect=pseudoc -misa-spec=xbpf > +#as: -EL -mdialect=pseudoc -misa-spec=v1 I think this test can now omit -misa-spec entirely. > #objdump: -M xbpf,pseudoc,dec -dr > #source: indcall-1-pseudoc.s > #name: BPF indirect call 1, pseudoc syntax > @@ -10,11 +10,11 @@ Disassembly of section \.text: > 0000000000000000
: > 0: b7 00 00 00 01 00 00 00 r0=1 > 8: b7 01 00 00 01 00 00 00 r1=1 > - 10: b7 02 00 00 02 00 00 00 r2=2 > - 18: 18 06 00 00 38 00 00 00 r6=56 ll > + 10: b7 03 00 00 03 00 00 00 r3=3 > + 18: 18 02 00 00 38 00 00 00 r2=56 ll > 20: 00 00 00 00 00 00 00 00[ ]* > 18: R_BPF_64_64 .text > - 28: 8d 06 00 00 00 00 00 00 callx r6 > + 28: 8d 02 00 00 00 00 00 00 callx r2 > 30: 95 00 00 00 00 00 00 00 exit I don't see any reason for changing the test bodies like this. If it is about matching some llvm test, IMO consistency between binutils and llvm testsuites is not a general goal we can (or should) aim to. Same applies to the other tests changed in the thunk below. > 0000000000000038 : > diff --git a/gas/testsuite/gas/bpf/indcall-1-pseudoc.s b/gas/testsuite/gas/bpf/indcall-1-pseudoc.s > index 2042697f15b..5639e288869 100644 > --- a/gas/testsuite/gas/bpf/indcall-1-pseudoc.s > +++ b/gas/testsuite/gas/bpf/indcall-1-pseudoc.s > @@ -4,9 +4,9 @@ > main: > r0 = 1 > r1 = 1 > - r2 = 2 > - r6 = bar ll > - callx r6 > + r3 = 3 > + r2 = bar ll > + callx r2 > exit > bar: > r0 = 0 > diff --git a/gas/testsuite/gas/bpf/indcall-1.d b/gas/testsuite/gas/bpf/indcall-1.d > index 51103bba2a1..1a2c36999b1 100644 > --- a/gas/testsuite/gas/bpf/indcall-1.d > +++ b/gas/testsuite/gas/bpf/indcall-1.d > @@ -1,5 +1,5 @@ > -#as: -EL -misa-spec=xbpf > -#objdump: -dr -M xbpf,dec > +#as: -EL -misa-spec=v1 > +#objdump: -dr -M v1,dec Likewise, I think this test can just omit the -M v1 and -ima-spec=v1 arguments now. > #source: indcall-1.s > #name: BPF indirect call 1, normal syntax > > @@ -10,11 +10,11 @@ Disassembly of section \.text: > 0000000000000000
: > 0: b7 00 00 00 01 00 00 00 mov %r0,1 > 8: b7 01 00 00 01 00 00 00 mov %r1,1 > - 10: b7 02 00 00 02 00 00 00 mov %r2,2 > - 18: 18 06 00 00 38 00 00 00 lddw %r6,56 > + 10: b7 03 00 00 03 00 00 00 mov %r3,3 > + 18: 18 02 00 00 38 00 00 00 lddw %r2,56 > 20: 00 00 00 00 00 00 00 00[ ]* > 18: R_BPF_64_64 .text > - 28: 8d 06 00 00 00 00 00 00 call %r6 > + 28: 8d 02 00 00 00 00 00 00 call %r2 > 30: 95 00 00 00 00 00 00 00 exit > > 0000000000000038 : > diff --git a/gas/testsuite/gas/bpf/indcall-1.s b/gas/testsuite/gas/bpf/indcall-1.s > index 5d49e41040a..7fbeeeb9a38 100644 > --- a/gas/testsuite/gas/bpf/indcall-1.s > +++ b/gas/testsuite/gas/bpf/indcall-1.s > @@ -4,9 +4,9 @@ > main: > mov %r0, 1 > mov %r1, 1 > - mov %r2, 2 > - lddw %r6, bar > - call %r6 > + mov %r3, 3 > + lddw %r2, bar > + call %r2 > exit > > bar: > diff --git a/include/opcode/bpf.h b/include/opcode/bpf.h > index df1e3bd0918..97e25053175 100644 > --- a/include/opcode/bpf.h > +++ b/include/opcode/bpf.h > @@ -202,7 +202,7 @@ enum bpf_insn_id > BPF_INSN_JAR, BPF_INSN_JEQR, BPF_INSN_JGTR, BPF_INSN_JSGTR, > BPF_INSN_JGER, BPF_INSN_JSGER, BPF_INSN_JLTR, BPF_INSN_JSLTR, > BPF_INSN_JSLER, BPF_INSN_JLER, BPF_INSN_JSETR, BPF_INSN_JNER, > - BPF_INSN_CALLR, BPF_INSN_CALL, BPF_INSN_EXIT, > + BPF_INSN_CALLX, BPF_INSN_CALL, BPF_INSN_EXIT, I don't think it is a good idea to rename BPF_INSN_CALLR to BPF_INSN_CALLX. At the moment the assembler uses the `callx' mnemonic for it and GCC uses the same name because that is what clang does, but if/when the corresponding instruction gets incorporated into BPF, I indend to push for a better name, certainly not something as unmemorable and indescriptive as `callx'. > /* Compare-and-jump instructions (reg OP imm.) */ > BPF_INSN_JEQI, BPF_INSN_JGTI, BPF_INSN_JSGTI, > BPF_INSN_JGEI, BPF_INSN_JSGEI, BPF_INSN_JLTI, BPF_INSN_JSLTI, > diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c > index 19e096501a2..23473fc0cd9 100644 > --- a/opcodes/bpf-opc.c > +++ b/opcodes/bpf-opc.c > @@ -272,8 +272,8 @@ const struct bpf_opcode bpf_opcodes[] = > BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_JSET|BPF_SRC_X}, > {BPF_INSN_JNER, "jne%W%dr , %sr , %d16", "if%w%dr != %sr%wgoto%w%d16", > BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_JNE|BPF_SRC_X}, > - {BPF_INSN_CALLR, "call%W%dr", "callx%w%dr", > - BPF_XBPF, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_X}, > + {BPF_INSN_CALLX, "call%W%dr", "callx%w%dr", > + BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_X}, > {BPF_INSN_CALL, "call%W%d32", "call%w%d32", > BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_K}, > {BPF_INSN_EXIT, "exit", "exit",