From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+/U2psheoiyl2YtKY4t1YCqA7QLYubxNzxxxUm8C4rA=; b=kYYGp24zdWkZ0FROIwpsoxwBSANBi2B0Gnh89tF2pl6t0xGjpi1h+V/B4Xx8fHsnNVQTT99YZhjEWdoUbKqQdOCA/+IcL3tV161Ql9JL3A2junEz/GGJq+H3p98F5cFTUrB5exLM29tdvWzC45Cjq2d1KYR9QZ/eX7Qsth/Jx85HsWPsfq14IbRU3AuBS5HvqO0CyRzZbsuWte/QETDDopDN/WcYTo/ZUFszDMDPyXAc3he4Z0Lrj9sSj3wvMuSwt6wT4T71PQ7SPE/mC12Fs6hYj6wcG/rzmQzAoIxD3/4SzkmW3jmG7xU7OW9Za11Ecfqq0XoQW6Wki58zB2AR0A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; 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 From: Jan Beulich Subject: [PATCH] gas: re-arrange listing output for .irp and alike Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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?B?MTNJd3VzZS9VeGFlS3ZQRGM2RlEyTWlJWVVZa2UzTmxlUFV1dlBUcU8xT0hT?= =?utf-8?B?NU1jaWdodnpwMGp5ZVEzNjdReDRrUU1FUCtrUEl2RjlDQnZKV1c1bnRTNUR2?= =?utf-8?B?bys1dnR1R2xuSkN3V01MZHd1RDluc0sxRlA5NCtUdWFQc3V6ZG1mTXhVTzBV?= =?utf-8?B?d29naHV0MERLeTRRUVRucndiWGtQUE9IeUk3WFMyY3RQV29Uc2JyWlNkNWJr?= =?utf-8?B?U3dlb2lxU240aVZNaXVtL09OQ3krcnY2Q2haTmhtQ1c2SkFhdHlUbXpKNjN1?= =?utf-8?B?eHlxV0xIeUpmZ2tiK2xIQUhQZEN1SHlULzRvVFdwMHlrN0NTekdFbzNhdnM1?= =?utf-8?B?YitFLzQzVG5XTEo0VW9zQ0JhcWM1Y1Q5aXBpVkNEVWVUU3hZeWlaQllnNUJU?= =?utf-8?B?YlF1dTFzanIyZ3lFemRaclRIeFA5TFNKc3VkdnpGblRCejhvR3FVaTlId1Vm?= =?utf-8?B?ZVdyOFhucElFZXpYNHZJS2dnVi82MjBDbDQvYWFycW5YVDlCTGE3YzJBT0Fx?= =?utf-8?B?SHJhU0xPWlRaRzZRdEpKK1ZpOThyV2dya0YxeDAzRG5ETUlaWlJpTk1lRmZN?= =?utf-8?B?ZVo1K2ZKWEw3Q3JHY2hqQ2VjU01DSzJMSXVOZkNoUFRtM0h4MmpqSDVhd1Fk?= =?utf-8?B?YmJCN2NiTHNtdzB3S3dHcnZWOTVRejUzMEc3czJhTEJ0M2NKSkhUaVZLTUt0?= =?utf-8?B?aDNIRXRxenB3TjBBamcwUlBwZ0ZkNThnQUpqL25jZnJGcVhTRVoyVENpbVRK?= =?utf-8?B?N0tsdXVhaTRKQytERHFDNGhDTnNGYzVkTDd3eGpadGwvT2YyQTRvOE5LLzJ6?= =?utf-8?B?ZjF4UFUzdkxKM28vejVtK284dS9SU3UxS0VkcytHVnIzbFlFWXpDb2RaMUFy?= =?utf-8?B?MnpmU2l2cnczQW9rb09ENUZiUWsxeXZPYW9MUC9yS1dYcnZDb3NYdkJDTWdG?= =?utf-8?B?T3VCbVZvUmdmWEt6aDliWmQzKzJtRHhZZW5DWDBHaXJOMXQ1Z2FwV3p2RDJj?= =?utf-8?B?SFlnQ1ZNNTE1elIwWnYwcHJxUHFVNTRKWGM1YnZNQnRNNGR3VzJ6UXVicEZR?= =?utf-8?B?cGYxdUJDSWU1S1hIb1FyOTdvM2YyVERQU29xeFhPRXpQN040TU9wRFJ5cFQr?= =?utf-8?B?OUtkSDNyaG52YmJONzNPQ0ZrU0FlRkdnUFhzSVRaeGQ5MTkxWHVtMHYzeVp2?= =?utf-8?B?U3JsUzNrT294VVNsWnZGRkhaWHdrLzRaSE5ZUEpqTFFvdnVuSjcvN0RBaldw?= =?utf-8?B?Y3MzZHNBYjQzZTRRQjdlMHI0OXpqdU5DS2RrcUVRbUM0Ym5hMFpHRXYzZVNN?= =?utf-8?B?Wmg5d1ZpL0NsaEl2VERlbVUwVDRlZ2F1TmF4VjdRd2VTdHRESUtrazZsTnNh?= =?utf-8?B?bWEwdm1Iam0rKzZTK0o2eUtTMVl1OTl2azJvWWgvazVXYmQydTBXbE9Gc3pq?= =?utf-8?B?NVYyQXoxUm5BYlFuaytNQjRMNkRPeGtEYysrUEpSc2U0UzQ1YlhiSVh1YXVC?= =?utf-8?B?d2pOTWFicGdLdk82bzA2cFpZWnNtL0pPU0U0aEMrSlFWMk1RaStPeERiQ2VU?= =?utf-8?B?bEJFZlpVeGRYandBbGdQbjdFOTNoT0F1U0kybGhZa3pDOTFvOUNWOEhrMThG?= =?utf-8?B?TjFodHhjcFhYcnprMm5nQnQ4WlZaV0VXTWorVTlyZ1RvMFptblVseVZxbDcz?= =?utf-8?B?WDZvNGd2YlhKM1BaTGRQWi9qSjZqem42SVl5bzNuQisvY1Qzc3luQ1VETkcy?= =?utf-8?B?MjUzVXl1VHZ6c3lHZWljNnc2TXZHbm0zWXJpMUIyMFRFTjNsa3JnWTVTYmcw?= =?utf-8?B?L2hYNUdyRnpBbnZBOFpZZGd5dXBXdzJCWEs0eFE1MmZCTTJScjZhL1c3b1Ew?= =?utf-8?B?L0V2K1BaVXBhYzlnbEtvTlJwRWV4QU42a2ZJaGJvYVppMGRXTjFFbjNqeEpt?= =?utf-8?B?Tnhld21uRGQ3c0U3WForVjF0SDlMS2RjWVJjUnlnMHhJTEhxV2FFREJRV0No?= =?utf-8?B?Qm9tV0dwZTNsZUFMb2dwUHNRQ0dTRXBlMW5BWnZzN2F0cnRITFVNRlc1NkJW?= =?utf-8?B?VWRNWkY5M3hCdkZvYXFESVFsOUQzNjRhNkJuR0RSaXBhS3FocWk1R0ZUUk9F?= =?utf-8?Q?e0bqsPwGBeTE3aDnxqB5Cub8x?= 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 List-Id: 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