From patchwork Mon Dec 19 10:53:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 34473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2337766wrn; Mon, 19 Dec 2022 03:47:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXvvSDsk5BMnELyGC3uIr3C+jTpaG+I39BtygTRNRVSrQPbBcueJJJ6GkvDkKXBa1ko6DByx X-Received: by 2002:a17:906:90d8:b0:7fd:ec83:b8b9 with SMTP id v24-20020a17090690d800b007fdec83b8b9mr6626736ejw.44.1671450462056; Mon, 19 Dec 2022 03:47:42 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gx22-20020a1709068a5600b007b9944592c5si7266638ejc.935.2022.12.19.03.47.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Dec 2022 03:47:42 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=y45FknZP; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 BFEA938D7B15 for ; Mon, 19 Dec 2022 11:00:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BFEA938D7B15 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671447633; bh=+/U2psheoiyl2YtKY4t1YCqA7QLYubxNzxxxUm8C4rA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=y45FknZPccet/kBxBwRUkaDk0dm+1a03jY+Yp7wAASi41/jN7uwcVlAu2V4g/Ff8y 9nn4YZPMLIHCY3gU51NlCPub08Zo6INnrUace+kLjImQruFHQHYfqBwQZt4eGZxF12 HhADJ6D+fxuP4yh3kCwc7IXE+OseFUgpfAC6cFsE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2072.outbound.protection.outlook.com [40.107.6.72]) by sourceware.org (Postfix) with ESMTPS id 98DC43870562 for ; Mon, 19 Dec 2022 10:53:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 98DC43870562 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B0tPzk4Zm9Q/JniA52nFIhbLPcO35QA8JoH26oQhlpG1HhyZhrZCai3mmCZNrm2xLLCVm/FaVAOblMbz1uzQJhZdkrqj2kRI4VgsFaFqv7Bm4Mmrk9wZ6ss/KmTVjEK3WyofiuTGlE9uZ6UfSnb4w5yLmB7shIRlfCu+yKko4P/gKBHLAZhDNSQBUNdTPE4Kp/7oE24vrLpTO1kjnFIRjRT5BLZztyIlS5GLpqfKqdOoWSrrhr0FtkynQ0SIDmx99SAdQ5ovNH0uGxcPuX0d48hFAiTgx4kLAVYbuk4EIZuHIBmP4EsOlZK8+i1LZ1ucwiXmASCidq2Hz63GAL+Q6A== 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=+/U2psheoiyl2YtKY4t1YCqA7QLYubxNzxxxUm8C4rA=; b=AY/PYV/4qCr5M6cGvRlJ3Kvxf6BfH3jIItGd1ykqPsmWox5FSwFlda64dK+jHeggnxfUjATEH9CHo/s5xC/stWMNZ6gSKAaohp4YhhwhvbCNs+yyBE02f8dHopEUeDeQ6oVl+ASyzF7Xs+/6PkulA+geqOxCVJYofk8d28/tZpVLx3pwdsGgbF1ukAFhVOqcF94lh5DXeIuqa5QpEcBO0nJRyGotAzYwgpIPAIsgw3PH0x9bGIfsnBg7394gGFRd4EIKpJrcto6vcVdVWjXRRyD8HJdD5dPpVwU2J6yMfFcb5r3PfWsTYtmbXEx0+1zJYAzDmg8G1jmAWXzshnHUPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB8214.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Mon, 19 Dec 2022 10:53:18 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5924.016; Mon, 19 Dec 2022 10:53:18 +0000 Message-ID: Date: Mon, 19 Dec 2022 11:53:19 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US To: Binutils Subject: [PATCH] gas: re-arrange listing output for .irp and alike X-ClientProxiedBy: FR2P281CA0109.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9c::8) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS8PR04MB8214:EE_ X-MS-Office365-Filtering-Correlation-Id: 04221006-d80b-4a81-67e3-08dae1af3cb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NY/RIJtxlyPH5F7HJPHgrFVWx+Te8Bs8ToAljPUly/S9ARE6soB1SiajMmy5LLmVigja0/Q65kZDeBq4rVR688zk89h29D+D7qGErL0a097OIherL1R/Lar46fdLxh0ZV/g0dXmwvDuEpBH2s6rQFckyMYaHtrYFQMbBYRKrHwfafplYbyQHm4kJB/DesF2RxSuVOeUTnPjZ4d/d3AaWRFvfuw4ryvofonGVdhy9ymVDAWNlZX5RAIj6oMO4cqPGb/82hOpN/iljA/JUUdGWITuOWoTb1WaS1+QERGN3eq+BL4c7HlUY8S4IvuMxvfLl5RH0y44V6GSVtmjiUalHVepV9j4jajizrS1YRcEp81Lt00yTmVBslXs6aE6lXV7hCUJIR8yZu7dr+Qqm7Rl6WyIkGUrLEulgOQ7zyS7XllmkVMA4c5lu+d36tz4eV6hdJmkIczJQyGi4HZtS0NjMZyoGC6ed3J0ZC3LbYZ/0Fd38/r0hR2mA3CtZ1ltGbtQb9EfE1yFwfXiaqDVFOgIm9UqVscUFkMeHcrovN1T2Wjtl+bFNl6ZNLmwmkIxJRKjrAmHP9rkak9tMPbYEI7Ipomv4JPohz5dknvNpa2AuDq0KB+ZsSGqRjs/s61AZjfT1UoBpPQW8L2z3/z4zdOXa+abT8x/X9LwcawhZjGk+Mu9CQzWd0RvCAQ5yR7sg1DiN4it0zwIG2SqCKZAgj36CJnNJC23MhyiM5NjjVpi3uHQU7qfDvzmFxdd/pfjhg13jDBMNVySip8YljS4XyRcEvTwAAvD2nKp9c35RyBJfhAA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(366004)(136003)(376002)(39860400002)(346002)(451199015)(8936002)(36756003)(38100700002)(6506007)(966005)(6486002)(2906002)(41300700001)(478600001)(316002)(186003)(6512007)(26005)(6916009)(86362001)(8676002)(5660300002)(31686004)(31696002)(66946007)(2616005)(66556008)(66476007)(142923001)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?13Iwuse/UxaeKvPDc6FQ2MiIYUYk?= =?utf-8?q?e3NlePUuvPTqO1OHS5Mcighvzp0jyeQ367Qx4kQMEP+kPIvF9CBvJWW5ntS5Dvo+5?= =?utf-8?q?vtuGlnJCwWMLdwuD9nsK1FP94+TuaPsuzdmfMxUO0Uwoghut0DKy4QQTnrwbXkPPO?= =?utf-8?q?HyI7XS2ctPWoTsbrZSd5bkSweoiqSn4iVMium/ONCy+rv6ChZNhmCW6JAatyTmzJ6?= =?utf-8?q?3uxyqWLHyJfgkb+lHAHPdCuHyT/4oTWp0yk7CSzGEo3avs5b+E/43TnWLJ4UosCBa?= =?utf-8?q?qc5cT9ipiVCDUeTSxYyiZBYg5BTbQuu1sjr2gyEzdZrTHxP9LSJsudvzFnTBz8oGq?= =?utf-8?q?Ui9HwUfeWr8XnpIEezX4vIKggV/620Cl4/aarqnXT9BLa7c2AOAqHraSLOZTZG6Qt?= =?utf-8?q?JJ+Vi98rWgrkF1x03DnDMIZZRiNMeFfMeZ5+fJXL7CrGchjCecSMCK2LIuNfChPTm?= =?utf-8?q?3Hx2jjH5awQdbbB7cbLsmw0wKwGrvV95Qz530G7s2aLBt3cJJHTiVKMKth3HEtqzp?= =?utf-8?q?wN0Ajg0RPpgFd58gAJj/ncfrFqXSEZ2TCimTJ7Kluuai4JC+DDqC4hCNsFc5dL7wx?= =?utf-8?q?jZtl/Of2A4o8NK/2zf1xPU3vLJ3o/z5m+o8u/RSu1KEds+GVr3lYEYzCodZ1Ar2zf?= =?utf-8?q?Sivrw3AokoOD5FbQk1yvOaoLP/rKWXrvCosXvBCMgFOuBmVoRgfXKzh9bZd3+2mDx?= =?utf-8?q?YenCX0GirN1t5gapWzvD2cHYgCVM515zR0Zv0prqPqU54JXc5bvMBtM4dwW2zQubp?= =?utf-8?q?FQpf1uBCIe5KXHoQr97o3f2TDPSoqxXOEzP7N4MOpDRypT+9KdH3rhnvbbN73OCFk?= =?utf-8?q?SAeFGgPXsITZxd9191Xum0v3yZvSrlS3kOoxUSlZvFFHZXwk/4ZHNYPJjLQovunJ7?= =?utf-8?q?/7DAjWpcs3dsAb43e4QB7e0r49zjuNCKdkqEQmC4bna0ZGEv3eSMZh9wVi/ClhIvT?= =?utf-8?q?DemU0T4egauNaxV7QweSttDIKkk6lNsama0vmHjm++6S+J6yKS1Yu99vk2oYh/k5W?= =?utf-8?q?bd2u0WlOFszj5V2Az1RnAbQnk+MB4L6DOxkDc++PJRse4S45bXbIXuauBwjNMabpg?= =?utf-8?q?KvO6o06pZYZsm/JOSE4hC+JQV2MQi+OxDbCeTlBEfZUxdXjwAlgPn7E93hOAuSI2l?= =?utf-8?q?hYkzC91o9CV8Hk18FN1htxcpXXrzk2ngBt8ZVZWEWMj+U9rgTo0ZmnUlyVql73X6o?= =?utf-8?q?4gvbXJ3PZLdPZ/jJ6jzn6IYyo3nB+/cT3synCUDNG2253UyuTvzsyGeic6w6MvGnm?= =?utf-8?q?3Yri1B20TEN3lkrgY5Sbg0/hX5GrFzAnvA8ZYdgyupWw2BXK4xQ52fBM2Rr6a/W7o?= =?utf-8?q?Q0/Ev+PZUpac9glKoNRpEexAN6kfIhboaZi0dWN1En3jxJmNxewmnDd7sE7XZ+V1t?= =?utf-8?q?H9LKdcYRcRyg0xILHqWaEDBQWChBomWGpe3leALogpPsQCGSEpe1nAZvs7atrtHLU?= =?utf-8?q?MFW56BVUdMZF93xBvFoaqDIQl9D364a6BnGDRipaKqhqi5GFTROEe0bqsPwGBeTE3?= =?utf-8?q?aDnxqB5Cub8x?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04221006-d80b-4a81-67e3-08dae1af3cb8 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2022 10:53:18.1528 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zh7r5zGnCl8e311bX0xuM5b3cXjVZ/+D7nCYkENraAXslu4dbYefdZdkGF/WthxkkqCylPgSzru/gJGS9PWZ5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8214 X-Spam-Status: No, score=-3028.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP 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: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752642839773502189?= X-GMAIL-MSGID: =?utf-8?q?1752642839773502189?= It is kind of odd to have the expansions of such constructs ahead of their definition in listings with macro expansion enabled. Adjust this by pulling ahead the output of the definition lines, taking care to avoid producing a listing line for (non-existing) line 0 when the source is stdin. --- According to my testing, with respective debugging code in place, the conditional operator then isn't needed anymore in the invocation of print_lines() that is being moved: As long as list->file->linenum is non-zero, it and list->line are now always equal. I didn't make that simplification right away though, as I fear I may be overlooking some corner case. Unless I hear otherwise I intend to commit with that adjustment. The x86 testsuite adjustment goes on top of "x86: rework noavx512-1 testcase" [1]. If the change here is to go in first, the adjustment done here would need folding into there (serving as a test of the new behavior at the same time). [1] https://sourceware.org/pipermail/binutils/2022-December/125209.html --- a/gas/listing.c +++ b/gas/listing.c @@ -1247,18 +1247,7 @@ listing_listing (char *name ATTRIBUTE_UN if (current_hll_file && list->hll_line && (listing & LISTING_HLL)) print_source (current_hll_file, list, width); - if (list->line_contents) - { - if (!((listing & LISTING_NODEBUG) - && debugging_pseudo (list, list->line_contents))) - print_lines (list, - list->file->linenum == 0 ? list->line : list->file->linenum, - list->line_contents, calc_hex (list)); - - free (list->line_contents); - list->line_contents = NULL; - } - else + if (!list->line_contents || list->file->linenum) { while (list->file->linenum < list_line && !list->file->at_end) @@ -1278,6 +1267,18 @@ listing_listing (char *name ATTRIBUTE_UN } } + if (list->line_contents) + { + if (!((listing & LISTING_NODEBUG) + && debugging_pseudo (list, list->line_contents))) + print_lines (list, + list->file->linenum == 0 ? list->line : list->file->linenum, + list->line_contents, calc_hex (list)); + + free (list->line_contents); + list->line_contents = NULL; + } + if (list->edict == EDICT_EJECT) eject = 1; } --- a/gas/testsuite/gas/i386/noavx512-1.l +++ b/gas/testsuite/gas/i386/noavx512-1.l @@ -45,6 +45,8 @@ [ ]*[0-9]+[ ]* [ ]*[0-9]+[ ]+\.irp isa, default, .* #... +[ ]*[0-9]+[ ]+\.endr +#... [ ]*[0-9]+[ ]+> \.arch default [ ]*[0-9]+[ ]+> \.arch default [ ]*[0-9]+[ ]+\?\?\?\? 62F27D4F > vpabsb %zmm5,%zmm6\{%k7\} @@ -399,8 +401,6 @@ [ ]*[0-9]+[ ]+> vpermb %xmm4,%xmm5,%xmm6\{%k7\} [ ]*[0-9]+[ ]+> vpermb %ymm4,%ymm5,%ymm6\{%k7\} #... -[ ]*[0-9]+[ ]+\.endr -[ ]*[0-9]+[ ]* [ ]*[0-9]+[ ]+\?\?\?\? C4E2791C vpabsb %xmm5, %xmm6 [ ]*[0-9]+[ ]+F5 [ ]*[0-9]+[ ]+\?\?\?\? C4E27D1C vpabsb %ymm5, %ymm6