From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60064.outbound.protection.outlook.com [40.107.6.64]) by sourceware.org (Postfix) with ESMTPS id C261A3857409 for ; Fri, 5 Aug 2022 12:23:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C261A3857409 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fy2TjD8YJR796//FMM2zR6mypkvaM8IuLqclweQaJl7eDiTQbc+yGTgxCgM4klweHuGbGwGkrYwuUmmDh84JfYRUkMb+7SmEIYAXZk0dse7adpPx2gkI8VI0ugCFe0Cs56gW4Z111O9ec0iZQxg/9BgqiBTT+EtyJMnRU/3Cn0AhlFI1YPuYljaWD6u6WD/5NzEnhirEwAlnW15i4l4CfkGzDYjkIKzW7GjjowG7lU1DPHyP3c753AWnpPLImIxP3pzbxTqBCwyGLIhq2AeF7DIuVUgEThcR6Per+olowmkSM4KmU5w9n9iTzuryl6/3JTdC8lBoaaC5L0TmbHyKWQ== 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=QUNdmMY7im19z56E5QpBMaTM7wXFslxb/YOpzN1qkvE=; b=CfkHDkM1bvHDwtFSs/9IyAwXYdATdYzJAcpbncvZNDwauUbbp65ZZLaAdsTu77ldqqG/TCxwYnOVOX6BsuTs51Tg80IN8Ka+1Eq2JEWPlglEYH2ymmNIUJEr4ieTtnfj7WK0CJYnlKeNZfLkRRcAOCQxjxor+BXMkJLEAdILzmMhpWr+GqV6neWzZKmpUm/+xwsaj++AByzN33ODGq9k7iD6sO9J8wblph3ftqfaCXPEzJmVW577gllPs0JUNnAvJYouWxZJHkSHn7rwR1uzOiMhv2dmiYHPUB5Nul/5u8sqdCpccb2BgiYJqjKLB8FjOwvT8xG0pY9WrNymOVB1Lg== 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 PA4PR04MB7616.eurprd04.prod.outlook.com (2603:10a6:102:e7::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Fri, 5 Aug 2022 12:23:20 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::d475:4e1c:e4df:495b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::d475:4e1c:e4df:495b%3]) with mapi id 15.20.5504.015; Fri, 5 Aug 2022 12:23:20 +0000 Message-ID: <146313cd-154f-4001-05a8-6b25a90a14d2@suse.com> Date: Fri, 5 Aug 2022 14:23:18 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH 06/12] revert "x86: Also pass -P to $(CPP) when processing i386-opc.tbl" Content-Language: en-US To: Binutils References: From: Jan Beulich In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0025.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::23) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5725dae-d51b-4eb7-28e9-08da76dd4883 X-MS-TrafficTypeDiagnostic: PA4PR04MB7616:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vaqcJjaCYWKdeI4uB1b22NXePhjkssFWDOxwNESLK2kygbl0aMOU5HW7nZUDtu9OvzKJjHqimejkrddESRLz3CeDxv5JrETmNmGMt+X0Fw1m97CgxLpZdGmgLyGPKf7LcUJxvAD1ipxYpWHft+5QFzPKl5Glxqni7wDNzKAo1UM+KHuFQ/+bP3IcRCpjIzVTK2SXgcENp7bRnL11634bKj2M83tr7Ya/Ru8tDO3jQ6CBp65eH1zb5dzkNKKlethZUcP7SeMZWQtcXEliliU68UvAkACbmhYbyv3MnYOwrQFtLgImwuLdzeDR9x4sJyemRMWoIHwtS/XVQRtFzwMly3Xwfx2LAeZo0AaA49sIMyeJaLVTsTkkr+WZ+GCjrrVHakzQY++lcFw6jgO5rlNSJFZamhRXciUJi8d2V6wmDwcfHzACt7q9YgWi0+ORpGj1WvPiqWtWOoWlRlJfcV1WpYGcPh7ypi4VDa54ksEO3uTu+/ZhvyXRfzA3xHjgr6gXpBP7fmauUyaGPg/gsflccoTgdZCYWF/HRlm1HsleDnfL/AFxNOqcy4jQZjhbmWthHNlb4beu8wrvecJBZo5US+7DyL3G8QjfIsGv3o+A+humcPYWqO5ZWgLrc2CKVJGWLw3gEGvdM3sJVBjplTbFIkbgH9qmw7tJpDLx90TvYSLoqdbCWWuijMVDvpteZjhk+UREX67+rCZORSYdGk6plcZhYTkGkp0T/7dyy3nNcXP4BApiW7LBbS0CQGPVvezTDJ9PyHeQtA7LapvpCd8MBuXDiNYwrKQWM1DpGC1wYla9WvxHZGcQfNhq/neNc45X0eJKVhSzkFcmVTegzfWE0A== 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:(13230016)(346002)(136003)(39860400002)(376002)(396003)(366004)(316002)(86362001)(8936002)(6916009)(36756003)(6512007)(31696002)(66556008)(66946007)(8676002)(4326008)(6506007)(26005)(41300700001)(66476007)(83380400001)(2616005)(186003)(38100700002)(31686004)(6486002)(478600001)(2906002)(5660300002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U1psRUNtdThrbzZrdkRndnJBZjZJZnYranpQcHVsVnVub0dQS1U3NHJuNFNI?= =?utf-8?B?MzhjZWNxUi9JckRuNmZuMFYreENqR3ROWjQ0TnJock05UDJ4NmhQRTNZZnFT?= =?utf-8?B?c2pvQkVhQU91MjByTTJ6Q0JGL3dVMTMyQ2ZNRHhXQUVBTzB5MGJxdk05MXAx?= =?utf-8?B?WURSbW9Pc3pOUUxTcFp1bHdkcEJzT1VQditCU2pUdnM5c2FaeHV2YTB2QWlx?= =?utf-8?B?MzM4SkRydGdIWHpqRU52S2FFQk12TzBjQ01zQXhxN3ZhVTh0RTJVZXR4cFRR?= =?utf-8?B?VFFKQnBMOTUwWHZKRjBBRWdTTkFUL1BncG9VeTBMNzRhb1JnMlNsSUNRSSty?= =?utf-8?B?ZXhQZlJjQnhCMWNyVHp3L0tjK3F0S2VJalFFNUQvSVEzbmxKbUFxUitwUEpC?= =?utf-8?B?UlordG5mK1ZPaUxhbnlWaWZCSkZIUC9tU3phbjBZM3FLOUhLNVhVSWR0T3la?= =?utf-8?B?ckhIN0hWaElFU1Z5MzlCYmQyTlVTeWlXSXBCM1hrWTZwNnpRdjRvSi9pNG0w?= =?utf-8?B?SGNCam1IN0xjWVkzZmRvQllwNXpNd29aVGwxMUpxOHRyS2R4cUUrZXUrQVVN?= =?utf-8?B?ZXRwOEtNcGtDenkzcm13THE0eUo2WGJvdm9JY29CNWJKWGhXemIzR2ZnZkxI?= =?utf-8?B?ZFlmRmpHWEM5NFo3MkJVY1Ixc3dlVFJuTktqdUhvR1dtNVlYTmo1UTZPRTRw?= =?utf-8?B?cFppRDNZRWFFRlhUODFPcTVWS0ZuSU1TTDIzbVdyT1Z6SDN2N3luczF2UHFP?= =?utf-8?B?eWtZaTVXbFBpU1dvazE4WDlodlpOYXV4SEhYbFYrazJYeVU4ZG84ekM1UzQ5?= =?utf-8?B?VWFGenVmeHBwNUN2cWN5Um9jUFhYV3pLQlR4Z09vbHhOYkVQanZ4TFc3TDV4?= =?utf-8?B?SStRVmFYOTRpQUxqdHlpUTU1QTFCWHBkSHpxM3hocko2RncrTDNUTHRyQTUz?= =?utf-8?B?aDlPeTJiZld4VlQwTEVVeEt1eW9PTVgzcnVxVGdtRFpFRmFFN2RhQ2d4TWpU?= =?utf-8?B?ekJBd24zVU1GK1YzakN2VVVPclFZYWpzMS9lanprOU4zSjE4OVErZWU5OHdW?= =?utf-8?B?cnBzd3ZhOXYyZVRJU3MwUTRib05lRXJUMWJ5UTdta0tVM0l4dE4xRlovMjBv?= =?utf-8?B?ZFozbklLcmpubFFxQzJMVjdETEx4V0U0S01QSVhubkQwRDZDNlE2SCsyaWhL?= =?utf-8?B?ZENrRE1hM0dwS2R1T290ODZEeVdFcXl4NUs4VERVdys3RC83RFNDWFcyNVRh?= =?utf-8?B?elJCZ29CRTNXRVhvTEJqTTZiTGN6M0RxNjE1Zm0xZVZJY1BaRE1jUDg4UWpj?= =?utf-8?B?NjhQZFFnWWIrU2hPNGt6MmR4d2JFVnI2ZnMySDNZUHJLRE5JU0J1Y05Eemd2?= =?utf-8?B?b01wNFVFUWdPY1M0VlNvUVg3UmFBMmQvU2xVeUtWVnVsUGN3MWVGTjdndHdS?= =?utf-8?B?TUlSQ3BYa3NYY1BvMXhLZHB1TVRzSjM5dkxqZDV5anN6UFVXRVFDZ3I4aWVh?= =?utf-8?B?cDRrcFd3UnYwclRFZXpvcU50RlR5cVNNelM3cDZQMkRxZHZEcG8yUzcyMVdw?= =?utf-8?B?eTZKc0pMWEdUMEhxTWlKWGhKWmdZQmtkblJlMHQyR2V0Q0tkdEFodVMvNUU4?= =?utf-8?B?L0QxMUJjakRoUzBVQ0lvTVhXTXViOTdsT3BEdDdUclAvV0kyd2kzOFpJV3hD?= =?utf-8?B?UlNCYUZKVkd1NG9oN2ZHbW5oYWJDZWRJUUV3WjkxemlSbUUwNjVsakpaQ1BC?= =?utf-8?B?Wm1QWFJXM05ZS0g5TWJwdGR0SVdUSUNCSHFWSWhUYlQwNS9IdXVWaXhtc3Uz?= =?utf-8?B?Q2FIOVh4bG1ZVW50anFaU3BLOTNHT043dEs1Y04yWW1xNDVLWU0zZHhmOE04?= =?utf-8?B?ZksxTC82Uk1zamxmWGRCTVlQTWdWVzNBZmFEYXFhN2ZScGFaUGdzc0ZFTFFU?= =?utf-8?B?V2x0SHU0YVJUS1ZBN3ptMS9FcUtCNXQ0QVN0MTFwb0FNWlR1VDB2ZGs0UHpx?= =?utf-8?B?M3JTWTIzUTU1a0VCY281dk9PbHFoVVZOeEp5aVVqeEw5SHc1QVVzdVg1UVox?= =?utf-8?B?TWFrb21welVOa2cvUjkwV3dndUZ2c1V4TlZrQmxJR2Jkd0d2TFVzSzNlZFJH?= =?utf-8?Q?2MahJZ04fKI5kQzt0lIR34wrq?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5725dae-d51b-4eb7-28e9-08da76dd4883 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 12:23:20.3845 (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: 7zBlP0iFUb89jiIP+JT9lpOS0RLRy8INBiamfxm5guBIVuKqhemR3NpHVI9pYWWGV6yp2pxMEtMgsZCRmj/oJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7616 X-Spam-Status: No, score=-3030.4 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, 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-List-Received-Date: Fri, 05 Aug 2022 12:23:26 -0000 This reverts commit 384f368958f2a5bb083660e58e5f8a010e6ad429, which broke i386-gen's emitting of diagnostics. As a replacement to address the original issue of newer gcc no longer splicing lines when dropping the line continuation backslashes, switch to using + as the line continuation character, doing the line splicing in i386-gen. --- Alternatives to using + that I see are &, \+, or \&. To me a single character looks preferable, but I don't really have a strong opinion on + vs &. An option would be to additionally require "," to be the last "real" character before a line continuation, reducing the risk of ambiguity. Yet another alternative would be to recognize template definitions as the only constructs (currently) wanting to be split across lines, and do line splicing just for them by looking for the trailing > character. --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -559,7 +559,7 @@ $(srcdir)/i386-tbl.h: $(srcdir)/i386-ini @echo $@ $(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl i386-opc.h - $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \ + $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \ < $(srcdir)/i386-opc.tbl \ | ./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir) --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -1534,7 +1534,7 @@ $(srcdir)/i386-tbl.h: $(srcdir)/i386-ini @echo $@ $(srcdir)/i386-init.h: i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl i386-opc.h - $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \ + $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \ < $(srcdir)/i386-opc.tbl \ | ./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir) --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -1764,17 +1764,36 @@ process_i386_opcodes (FILE *table) if (fgets (buf, sizeof (buf), fp) == NULL) break; - lineno++; - p = remove_leading_whitespaces (buf); - /* Skip comments. */ - str = strstr (p, "//"); - if (str != NULL) - str[0] = '\0'; + for ( ; ; ) + { + lineno++; + + /* Skip comments. */ + str = strstr (p, "//"); + if (str != NULL) + { + str[0] = '\0'; + remove_trailing_whitespaces (p); + break; + } + + /* Look for line continuation character. */ + remove_trailing_whitespaces (p); + j = strlen (buf); + if (!j || buf[j - 1] != '+') + break; + if (j >= sizeof (buf) - 1) + fail (_("%s: %d: (continued) line too long\n"), filename, lineno); - /* Remove trailing white spaces. */ - remove_trailing_whitespaces (p); + if (fgets (buf + j - 1, sizeof (buf) - j + 1, fp) == NULL) + { + fprintf (stderr, "%s: Line continuation on last line?\n", + filename); + break; + } + } switch (p[0]) { --- a/opcodes/i386-opc.tbl +++ b/opcodes/i386-opc.tbl @@ -455,7 +455,7 @@ enter, 0xc8, None, Cpu64, DefaultSize|No leave, 0xc9, None, Cpu186|CpuNo64, DefaultSize|No_bSuf|No_sSuf|No_qSuf|No_ldSuf, {} leave, 0xc9, None, Cpu64, DefaultSize|No_bSuf|No_lSuf|No_sSuf|No_ldSuf|NoRex64, {} - // Conditional jumps. @@ -871,9 +871,9 @@ rex.wrxb, 0x4f, None, Cpu64, No_bSuf|No_ // Pseudo prefixes (base_opcode == PSEUDO_PREFIX) - {}, PSEUDO_PREFIX, Prefix_, , No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|IsPrefix, {} @@ -962,13 +962,13 @@ pause, 0xf390, None, Cpu186, No_bSuf|No_ // MMX/SSE2 instructions. - - emms, 0xf77, None, CpuMMX, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, {} @@ -1052,8 +1052,8 @@ pxor, 0x0fef, None, @@ -1309,9 +1309,9 @@ invpcid, 0x660f3882, None, CpuINVPCID|Cp // SSSE3 instructions. - phaddw, 0x0f3801, None, , Modrm|||No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { ||Unspecified|BaseIndex, } @@ -1469,14 +1469,14 @@ gf2p8mulb, 0x660f38cf, None, vaddpd, 0x6658, None, CpuAVX, Modrm|Vex|Space0F|VexVVVV=1|VexWIG|CheckRegSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }