From patchwork Fri Jul 21 17:58:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 124044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp374164vqg; Fri, 21 Jul 2023 10:59:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlFSI2wvSwvpuYVQKiCaB2g+3V1TYMYlxOc/cdFVLTBDKgWPVNqVNPqvb4uZBUw7EcOt6cWL X-Received: by 2002:a05:6402:2cf:b0:521:6305:82e7 with SMTP id b15-20020a05640202cf00b00521630582e7mr1946365edx.30.1689962377250; Fri, 21 Jul 2023 10:59:37 -0700 (PDT) Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id f18-20020a056402005200b00516333867fcsi2733520edu.593.2023.07.21.10.59.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 10:59:37 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=em4rpx62; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CA8643853D10 for ; Fri, 21 Jul 2023 17:59:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA8643853D10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689962371; bh=YwAroweG3CPoUixcwNVEewMxc5IKd8GNemeWtHc2RN8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=em4rpx629T3AwyAu9SZun8kr9LJHp0dznMFjy0k/B+iWl8nvjDhBDIvjuke621fVk Sen/o1aspHy9K11r+YfiXwsR2OYMQ78tFDxmRmbZS4pnK6YaBxWkyO9C/PnpzRV2NZ tNZs0Z4vu/Ra7749JlzKtQm0OoeqPUlLLr+P0Ybo= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 1AC23385E45D for ; Fri, 21 Jul 2023 17:59:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AC23385E45D 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 36LEG9Fh016599 for ; Fri, 21 Jul 2023 17:59:22 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3run78c9n5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 21 Jul 2023 17:59:21 +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 36LH5bO1019401 for ; Fri, 21 Jul 2023 17:59:10 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2103.outbound.protection.outlook.com [104.47.58.103]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ruhwas3hf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 21 Jul 2023 17:59:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTSgnYFAwya+dfJNZuuBjqeOYd/tCiYbKBpyX7/AvjWi2AWe/8ZNhwOom63o1uU693QXvzMk7dD0+lLYa4ineGvxiI7yDXbic07laeR3Gy1WfgTFax5dxKbTOIKqX0PV/9jmVxag3V6D2PVMCvpCvQFxxS0oXM0bYBTGpGiddT9UPA5+8ZVZ1W8kBLnhCSTF2r+3r2lN1jNbVLTykkLCBapDn7yvUYlYMJlE+e9bnAowBPMI889w/I46fd+NacvkIWJDFhk0U9cUOkIcxhmdTu+5q8quGG46gaYYiF0UZ0GVuYm8h5SftVefa/dlNXbzf9p+XFJxe4XPWux6Np8d2w== 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=YwAroweG3CPoUixcwNVEewMxc5IKd8GNemeWtHc2RN8=; b=CAAN2GhxvfWSsD8s+pmZCOrL+EfEvInUGfzQvs6E7lVRV7wLZo133zTxF1YpiR4dI/oqvILlXj0G2Ctpvyt2OXcDapkIJWjghP2mGeaLcMjqvp8RJXIkx/jU2PbtVOJJMrxtOnyvKDmJtgZ7fLIspzt5dVecP4YzljV8hOTBEzbrwlWojH6mxad466S4+ZLmyuiNljf8R/IlIRHpFFTof7et4Y/wX4VC7GIM3JRB7Kb3RsFr3V0dejsuD6H1f2k/dLgCK54ijuusrWetWp40cdq05FVSEIAnUJTqL+1+Jy0OCp5QGcBh1J9pJ4QDSdIn9DBQnPLZNyoTz4l/fNxqKQ== 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 Received: from MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) by LV3PR10MB7981.namprd10.prod.outlook.com (2603:10b6:408:21e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24; Fri, 21 Jul 2023 17:59:08 +0000 Received: from MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::827f:8665:2052:16c5]) by MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::827f:8665:2052:16c5%4]) with mapi id 15.20.6609.026; Fri, 21 Jul 2023 17:59:08 +0000 To: binutils@sourceware.org, jose.marchesi@oracle.com Subject: [PATCH] bpf: disasemble offsets of value 0 as "+0" Date: Fri, 21 Jul 2023 10:58:55 -0700 Message-Id: <20230721175855.6460-1-david.faust@oracle.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: LO4P123CA0509.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:272::13) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|LV3PR10MB7981:EE_ X-MS-Office365-Filtering-Correlation-Id: 28cd66aa-e933-43f8-0ede-08db8a142e65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NTfs4/04CH2A06ocZDCPYXEsf805KQj7j89Elhho1fa9DSHQke/lobeJ1YbTaGEgEVoiXBO89dAVuxN5ARSTIucqBSOtqlg+W9HRrjbuHZz5+fEr/ngt6RxoRF+dKcYWW4wYVGXx25eCiA2Fk3nW2yLU5WvzkmPuUF35G7sEPeT3OBq46ulkHJRp3WI7OvPaGmI3u64pKavmIjjfkyM3hL6mtsBDPRO+WNwI6p7EM5v/nit8HF2ZDYNlIml3nuJDH0JZMBUcyi2cg+6CUVpHPgK/30FIG72wxVsEweFYVRAPj1jY8kLuaTUs9RwsHXYscr3yKSg9JOR9ET4FczeRlPJlAN8pSK2PKFpPHgEgLhkUtdz+YCYm5ynwHDf8Zob4J7xvkJuRmx9IWMsu0WMfnCh3Gt1yUuFuZq7M8LOSKNpaw9lsfU5Yw1qb/Wq3vgdP/OoKmA6O67bx0IBDZJ4Zds7kbdhSn8iiH3Uz7IpEV07wyJW7hBeG//JTdamLqpGd7SiKjolZLVDRc6DK8Xpa6WYxgxnJ1CQffFqrYQhPMrCzcvxUtPpZ90zosbdG72ZQ 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:(13230028)(136003)(39860400002)(396003)(346002)(366004)(376002)(451199021)(38100700002)(8676002)(5660300002)(2616005)(66946007)(66556008)(44832011)(6636002)(316002)(66476007)(8936002)(83380400001)(4744005)(2906002)(41300700001)(478600001)(6666004)(36756003)(6506007)(26005)(186003)(1076003)(86362001)(6512007)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8AgH2/nxlPFqH3fkPMM9ljJFyFVEWekhuELWCfw8faK/FG7yUdwtD/GCCTAlE26nDG2Yrqu6dbu9EF1ASX8bdReuqPNStAsg3wSd3FshCU6S4H6ZQ0noLHz3wM6pG+n1FnPUWWbAp6fS9thM3bpty1QGSRCkD1Sc2x7xxiZU6+y41g2abThN7Y0vpH+RXwn/TMU4chKzf8qaUTImtGje9N52hfF9WhgqtCxc7gxIH88cnJC2RMQpDh42Et5Xe0XmHFU5mbJ1jot4oDYpKlGRNyFDulvlIW1SFZyvlmI5Ybmw5zCoVeuWVU7hzUSWktMJbGG5iE7uuTu5W5P3O0QdVv56ihmrfY5xlbdQzS4jZIS5Zj8a4KGhgFtAude9f6Z1uf9ekwrtt5/DDPLiZsARpTpUOFwYUtXZAYA4d3sL8nD1ruqRrWLgHSlljcORFrvrIUkEf6o4wWGADFjLvAf/9JBB/CBZlxYYQruK7eSRcRoTWdRGe86oqcUbHZY53/lqUxGnJO6OQ68UN/pC3mLa3rIWLMk9R+VEXFdXOeAjV5J/Uvs1xNPXSdySS/oAlZw4lr4GkkJGu6BGC82de36DVRntI8TTTVhmqh0gip2J7YmEQNHpI83p0bas1aV0/+U8lYPNK/fN7NVdKYr8chCFPkJxiC54fhqY+rpE5IIO2K5ja1Bin9sxLHWezEYUketbH0SPJcJFQYuCqWG5y0dbjOLtne2M/5UwCSxKKSIA31Zm0t3JI0DrEji0Wx/XHBrQvXXT05uBpsWUadIcFKrlFN8rlJvEIj8WX9KbknfrvAof7SMmcD3HdaWYMMrFoWKOp0Zd9AJE4vyaB64tCvik/UGEWyL+jR8Ii6zUeZpouxccHhI7W0KQXLQpYIVeF7WTMeB2t6wWTpD39UylAOGXVwGyyfusxE3YNGrIggSwXLUrmoBCwwA6aJ/yyQPDbLKZZWh6+wTpOklEuxdktR6nDyn1bDvcaL6YnPpg5jkIjLjO9Kbo4TcV7vqbVTCuiL+MqxQU+CNyTenpSEyPDvjJU4GawermDAr/vMtrWpEDYyzmfsnMRL2vQkMo6tEv8LOcEz69VnMMTpQpwBEbWlmUc2Imeyxo17ihSSKIly99jKQnlVFuhetY4+RVd4bLDU7BCXdPjGpilzW8YMACCUxeAEvuY0445hwxr8Eq5kie4iAuEoWg/f1noUpbSi1hOo5Ep8dhILV6J3ogZk1xAq88oT3E+9zxeia6gnVeeIrMfhxk5dyFsunqenPDMZnRhAaJ7NQ3LQixAsobRX4eo2AgssqRpyBGFLBvF40rxuPjb2CGUzrZbMrW760tLiTaRIbGZfqDUQjoeI2lca5Eor2wvDSSah+a8pZsducAn6vq37foG2wTeoCfCVYHnmrf+eCgw5SCu7bd18PFEwbImLYzDoOKs5FspEH3zP562LGffmRUrwPtRUuCWbua8/FD9IqhThkLaFM2tYCdYIxI6mp0XBRFhZ+tQS9IIpWxJJt7+mgpqDAv0euYGK8peYrWaZwxD/48Y8ylUKHP1juJEakc1S9ZsMvmhXCwEyWb1Ay5gO+hkUHRTU7jkwfJ6hLqhTVI X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IOB+v6zZc8DzI/HdaQjQ7lez0dcq4mFu3tNG0noz59EUpB+VK/81ikxVXBCQvmUALtPFQUjs4HIBtgCaOY2ZSLKeHKl3NAAwRc/2cGJj9Bv6fiPCAcjDB/+KtJJ+1zWhSiXInmRccY2BoiOrlYIfyjhV9iIm+aJW+MmnhjurUgd1GnMEn4eVfW0eqcz2c/Tk3KrmIfNir7c0vPH/xYx0VHtZT0lJpL/KC/umThHROo3usnAojDmPGW1dt/KYoC9+NfrFUVHK9HSpOlUMTPIs9q2dfwGgpf72Lwidmq7MdeV2Af7PRKX3l35WvO3CjmscSQxseyd2CQlblVBm48weTE80heFNSf1qRVDrKdrACoQj1R7GRrTutk4ixRhIU6f8gIEKgKhrE7GLJtoS7vldwdXVgT04TLBVe5WMRgCEiZpB9zrbhPL7fyutbIpfNZsW4YbtJPW0jdshVttxvqYRZtm3Jo72sSNyCoVNuLxUyAJ9b3og+nlOb/uLSV6/NumxljqxiPzU8drVuIMhiQfH1JBZhFDcAqYB3w+/vVVZC9sRimGTdV3umCoX5aSMW94dvFcPY5UmyE8VlshbZJKqPBmy6K1pQI6ALsZgAaQHo8pvGMXOHvgabs+r0jGNQTQrl4lq9uLFsNh7RV6+lFVUiMsyITRh9Sbug+J9+AXTQ5Uc/BsbLjGZxiwjpSNbaCbAsKaVzGL8W3rV16Wv3YMfiNaN56I85w+SRerkBGqIk5hZzxbO2gJOhDQA+Lui3rQE X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28cd66aa-e933-43f8-0ede-08db8a142e65 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2023 17:59:08.6929 (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: yg7FWzIbdwszrT1HKdCjD7MGr7CmBp6JJm7sb9nOnuOaSfi/lCZRKNNGpnkzRa2f1XstjE9qS8787IL7hzIrsA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB7981 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 malwarescore=0 mlxscore=0 adultscore=0 spamscore=0 phishscore=0 bulkscore=0 mlxlogscore=803 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307210158 X-Proofpoint-ORIG-GUID: wVo-IZnrI837CSXrpL8QeKKaFn4eLSOU X-Proofpoint-GUID: wVo-IZnrI837CSXrpL8QeKKaFn4eLSOU X-Spam-Status: No, score=-13.4 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Faust via Binutils From: David Faust Reply-To: David Faust Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772053990029037429 X-GMAIL-MSGID: 1772053990029037429 This tiny patch makes the BPF disassembler to emit, e.g. ldxdw %r1, [%r0+0] instead of ldxdw %r1, [%r00] when the offset is 0, to avoid confusion. Tested on bpf-unknown-none. Maybe obvious, but.. OK? Thanks. opcodes/ * bpf-dis.c (print_insn_bpf): Print 16-bit offsets with value 0 as "+0". --- opcodes/bpf-dis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opcodes/bpf-dis.c b/opcodes/bpf-dis.c index a4dc3dc2523..bb63119e813 100644 --- a/opcodes/bpf-dis.c +++ b/opcodes/bpf-dis.c @@ -231,7 +231,7 @@ print_insn_bpf (bfd_vma pc, disassemble_info *info) if (p[1] == 'o') (*info->fprintf_styled_func) (info->stream, dis_style_immediate, "%s", - asm_obase != 10 || offset16 > 0 ? "+" : ""); + asm_obase != 10 || offset16 >= 0 ? "+" : ""); if (asm_obase == 16 || asm_obase == 8) (*info->fprintf_styled_func) (info->stream, dis_style_immediate, asm_obase == 8 ? "0%" PRIo16 : "0x%" PRIx16,