From patchwork Tue Jul 25 20:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 125800 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp2059vqo; Tue, 25 Jul 2023 13:44:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlGDcNz3HwwGof09ygz3LORi/2TSYRztr2WIAXhsjN5tkpmyAJIpVwkF/hgBueIO+AwmvPZH X-Received: by 2002:aa7:d74b:0:b0:520:f5dd:3335 with SMTP id a11-20020aa7d74b000000b00520f5dd3335mr13036eds.41.1690317898454; Tue, 25 Jul 2023 13:44:58 -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 l7-20020aa7c307000000b0051e7235b2e8si8282352edq.542.2023.07.25.13.44.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 13:44:58 -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=bBRtbisD; 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 1FF8238555A3 for ; Tue, 25 Jul 2023 20:44:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1FF8238555A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690317895; bh=7uEHOAao95DcMIazjqz71ZKAIr12cV1osAfOgnxdu44=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=bBRtbisDJDBuAmMQcGKu/Cjh3A/RTGHSki08m6erOwmgAfTwrpcNZRTcU3zqP2Qks Qny8viWZAH8CtGzSaKcivyIpwKiv7r1jqAUOn/pkwWC3dHS+Y0cwHmgHG0iYVTuyx9 nO/4ICWTjCNnXtX7dUGLBsNv8cxIVVlyGTVJZwUk= 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 409103858CDB for ; Tue, 25 Jul 2023 20:44:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 409103858CDB 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 36PJIvqS028706 for ; Tue, 25 Jul 2023 20:44:45 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3s06qtx1cu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 25 Jul 2023 20:44:45 +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 36PJsbXF029536 for ; Tue, 25 Jul 2023 20:44:44 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2040.outbound.protection.outlook.com [104.47.73.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3s05j5ah3r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 25 Jul 2023 20:44:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d69ejwpm8a88w5xNh9GUcm4UozV6EVDPRxLJEt2Fwnyguj5oR6ILzPFfYetzKzhfV/JpyqoHKGES7MhqjGGw62bHpLuHmatCCgu3YRMrg/NiOBp+U+YtJqxEf7vpgbi32exUjDhnrr1TbmwlfaqZL6pKrsI4YlWtOKT97ULINQE4+b/ozSn+tox0PilO7z+nXy5oY4XhvvV6r7PA4p4Njdc0ydg6zVertXhimxLBFtP/Sh43OQD5Dx9YfyiHe5JRTtBshPguvvlt4hYkRKmie+attW/RZ5e+C6ipG2OxzoTBC78lH9BFC7JKE0tyTmKz0rEDWJITaq7sCQjhGoM53w== 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=7uEHOAao95DcMIazjqz71ZKAIr12cV1osAfOgnxdu44=; b=SSIINOvGpqoi0NVrKlKhYCoOO8PU834xJyNZ/nUrKPo3+Oj+D2VLpwZ40iLSBxllJtHDpgQa2I2oq6D5N3csgXiYuW3tAkZa0uD8nNGaWvZn44uDRawJZ8SAxrGwPFjUKNPuJA4yZ6fwJOYj5NBQ2Ix4sTqEv0Q3u2gzzo0VkZ7XRHZEWqL3COANmUHbTsMJOUO/SLNvwnCMBopBOpOgPtmju6QT4ujzCv97syjJeFh8OGDD0YN8SKBVFlSBGyOK7mhzQSE1NTVLM5rd4odOkUW8RRyncXe+A63xn2TCq3wUCBVArbNvdecv7iNUNduZxun6+gLtbYh0RkRbmTo5wg== 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 SA1PR10MB5844.namprd10.prod.outlook.com (2603:10b6:806:22b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Tue, 25 Jul 2023 20:44:42 +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.032; Tue, 25 Jul 2023 20:44:42 +0000 To: binutils@sourceware.org Cc: jose.marchesi@oracle.com Subject: [PATCH] bpf: accept # as an inline comment char Date: Tue, 25 Jul 2023 13:44:35 -0700 Message-Id: <20230725204435.9560-1-david.faust@oracle.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: SA1P222CA0108.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::29) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|SA1PR10MB5844:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b1ef199-97e0-429a-dcef-08db8d4ff8bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nZlj1GaXST5XyyDudvOu6R8P8bvKvkMn0TGvY/FVd1XqvMXWqro9aRX5fEaoSxiJitzSpihQ0m8hsvh8SmCN/JBYMevYF7oSFRK6A0EgWN+1by992JzC6lZXYrFj40XlaytJIAUb9coOU4QAmD7vcpPwvnS8FeVaJyzIzdeJEQiJQ1w0w0SonaEjzPzf81SrlxbC5yyXSoT3V1cLpW69KNkGZXuJXwl8/upKhq8yGGkP2f3s7B5hot9vjdxRT0vdgz0Fd6m4gfMb522z3KYTRhQuH6nVyGdCCN9Sza0eQ+rnC6B2jEozr+GmVc2XWNT4MyQr16Ajgpw2alU1pIow40lfEgNM+vAGzAywymxMAV9k370wRAmZ/G8mA2x0Z6xhHDOL0dCijtOkG0QzQx/VuMAPUYKxHeEsQhgWEtojGowlzuDEtParEmVmeebOhQdU3ThAI8y2IP5a7GMHbs3zkRgGbuI6y0ASGf73nhOG5VfGyfrMqWmG/6nsUd4V5RZN5E5WPJJ/SmYvPHkOL+dvWfHulawYANswomy4DoiCkDSbN2bNTcCAmjHdaOxwFs6Q 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)(346002)(136003)(396003)(376002)(39860400002)(366004)(451199021)(186003)(83380400001)(2616005)(2906002)(66556008)(66476007)(66946007)(6486002)(4326008)(6666004)(41300700001)(44832011)(6916009)(316002)(6512007)(478600001)(86362001)(26005)(1076003)(5660300002)(6506007)(107886003)(8936002)(36756003)(38100700002)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C5clxCg6e593u/ulHKnGfH6Nk877K88jJy4EWu3P7xFpxXnhbQfOgmdDAWx9wo055oskW3j4KzpJicd+I77fDy+ynvAuebna464EqEEOHmwysxMUN7baIHhizTyPMPc+JDPwczukCKGZUsPhvTmY71ddERtWZJYV63pvTwToacvRwUW04EoWtennnHwONR5TDFOF9DthVdK0YIUMfnWZGyF2iekDRJkwmYbI2GOOyvvlRarPS9R65JreoXo2WonxRSAZMHj1cVqDIybNmhadh8hToI1vMoj3mU3ENw7qnkC52ZV8tcKhYRJ3H/FtKy3F1ne74dS6KO68br7BaqJxvGqq/eXvvqmUG0bSqhN+FzpTTTS4BUZxnB1lOClgG5uvfpi12WtR56yKa/xISeh/m6fSm0AUUtymU05nF0zYIiGPXInnLFiQ9yS4CWY6gdLdxNh9fuTNeAkXCHPamT0tcsl7MlipwfX8DIZpwopbmg7aA7AEhjP6NbnuWnZJQxuBPM3DXDIefbl8VQCLAhpL01Rh/RYbQNl/v555cLXwq84jEYYLC1FfJ4ONSZOZfduWFRnw4bkRYHee1Yx4fIkD0n8g3dH4SmGTZOCFx4qk38qoU1K2/MK0PknpFXfxtmunZuIRN0xxh7HrXeO8Q4N3uLAi/RPpBH6PlGYgZKBtBjgwozK8U4T+DdfT6xlfU1yuATHfANmSSIFAuvGXm8ctaLqsdbErpouC9JO9m9zEpAIHsRphjQl70aNVKev3xhF3m7ISOZsJA+zQ58NkNEw2f/EUH953zdpz2miRYOS9Jxi6iiKROm4B6IP7KzaZ9NVj+sIA3w1i3B9rFLPGq11rigdG1BuOUVTG2nz3tnRJ7kXq7YftDXJTuA5sdkq+SPrNVGvYGrzUnri6I3ovl8PAYWSzdJ9N2ZGlKlJPARg/ip1/yfLT1qDGj5rzVPjuC1cnmmiZxCD1UhAy+SMaC64GxWzM7LfEg6SM/QUJF6jTrPcPNxjCSL4oR/EuxvP3Lj4S5aPWG2qwedCJO4vdGOZyfs9i8ewytr345XpiMa/mp6CIIFUwXZhu8WHMuUgMha7KYKygC6ColrL6b51beNjhtmNPdR5alm2QYl6jlfWhxi3ZcteamHrrXkjA78p3aqCBdHTu6QTHZHlNOiw/VYFsiXPHqn2wmaUJzz0+Ax1271ur6dvsyw1i4QJ9w6RL79h9T/J9Rbwle16ERjbgWJFKc5e+u7fSIqMb92j20dmPznS9XrLnF1FD9pUae+jn4mrH+chy0Fq3autXv2oNKqm30yHXL79BjTw5nt8fBMLIlkTTHGuT3McHSnG9je77vapYO2X1PhtqcDKbb0fLmDAwhLVOWtZ//QyORH9YcZ+4Utk07rhnHzad3YLLkUS/x24vNqG/EagCaHpnG1Wspp+G/Q5BrdR4VOpDOEQSbxWTD1jK1uXCnkG9YULOaHk3WcOTZGc/aNU957XpahgHnHI1kw0n0UMFXVUP0XYiyLSwua7nlQWv423OlvVFEyltevvVnx6qgI3GX+1HDobie/Egowjl+AuPykCTSWHw1wBg+JWPXt2zkiTiJwaDM7chPDiE X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: vhpY3Camxy9g6qF2CTHffG9kvr/97rRsh8V3YWGmv0NvYiuvtK6ndVwHb+Spn2XTDGA27VsbJq5JG3sYBwOGP1ci+wcaJJjK/rppvFTjxeI4MytRLnjQTRKcMikR8za8OLpxQHzUMsYerNO24HZEyoDmaJ0x6yx4aWFFoUlF3MtTLfZ+/Vg8dapjSFewrOb/o0smf5fr24fZpJKeVjzFzc9d57vNedVlA+C3T7PMx1BtqQ2BUOjfQSrTNXEAYDZD4iWubNdLtmcZnIPLcUls2XW30bCuyniXxVmTT5cyjid+vbgPbsXUDI9q3NcbTBLF+meS6Y8h100WxJGuQEgJFDqGKg3LHPK6V1Zo3ZLouevRkM4biEjuj/1dji5Dc5Z3Ymtyi2+JrP+a/4YQ0LESU5ajb4EK3TUkdsF/yJWnhceMqpZunnfImKA3i+pIyk15MBsgcFczjaNJS4nfWGz4XSxhmhzNlmK/lSITGJWgXQLcUjMIJurdzs9fwqX9veIL7WrDrNv+tX7/ryjYkQs1ov455nOG7tJlydq4netJq/uzfOOn+b5F8s6UIaw5ZHdK5UBayKT6dOIS+EG+ao1v5IhFi2MNnNSKk/+D0kkk6jRCUD3WuVf0o1/GiDZuZp3G+9CqOFCRaK61U8jabHtXdO+qvk+gb9DcpvrTe3CbJotTozTQ1HGpN1NNbHrATfH90SkQtVQb/shwfADuc32Z8Fklho3J0fM0cQ9fgNjiNWaYbtzm78L+2YiM4RbzTepw X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b1ef199-97e0-429a-dcef-08db8d4ff8bd X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2023 20:44:42.0806 (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: IklNP5GDmUNEb6B0UxUrdHSlURn2gDd7/BEGOb5rLitAwHT9j9vOlI+6ssjNL+yp5kjXTymhSMN7uDbD8V7QYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5844 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-25_12,2023-07-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 phishscore=0 mlxlogscore=728 malwarescore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307250176 X-Proofpoint-ORIG-GUID: EWt0-dJySr2jIHB0LGHSqhbEVhy-ETeQ X-Proofpoint-GUID: EWt0-dJySr2jIHB0LGHSqhbEVhy-ETeQ 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 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: 1772426780935981025 X-GMAIL-MSGID: 1772426780935981025 This little patch makes the BPF assembler accept '#' as an inline comment character, which clang -S seems to use. Tested on bpf-unknown-none. OK? gas/ * config/tc-bpf.c (comment_chars): Add '#'. * doc/c-bpf.texi (BPF Special Characters): Add note that '#' may be used for inline comments. --- gas/config/tc-bpf.c | 2 +- gas/doc/c-bpf.texi | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c index c56b8fe984f..56c434c223d 100644 --- a/gas/config/tc-bpf.c +++ b/gas/config/tc-bpf.c @@ -53,7 +53,7 @@ struct bpf_insn unsigned int has_imm64 : 1; }; -const char comment_chars[] = ";"; +const char comment_chars[] = ";#"; const char line_comment_chars[] = "#"; const char line_separator_chars[] = "`"; const char EXP_CHARS[] = "eE"; diff --git a/gas/doc/c-bpf.texi b/gas/doc/c-bpf.texi index 8f39ab314a7..597b3b30b30 100644 --- a/gas/doc/c-bpf.texi +++ b/gas/doc/c-bpf.texi @@ -64,9 +64,10 @@ the host endianness is used. @cindex line comment character, BPF @cindex BPF line comment character -The presence of a @samp{;} on a line indicates the start of a comment -that extends to the end of the current line. If a @samp{#} appears as -the first character of a line, the whole line is treated as a comment. +The presence of a @samp{;} or a @samp{#} on a line indicates the start +of a comment that extends to the end of the current line. If a +@samp{#} appears as the first character of a line, the whole line is +treated as a comment. @cindex statement separator, BPF Statements and assembly directives are separated by newlines.