From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50082.outbound.protection.outlook.com [40.107.5.82]) by sourceware.org (Postfix) with ESMTPS id 54E223858435 for ; Fri, 12 Aug 2022 11:33:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 54E223858435 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KTaZMA2dIxQIVfuOAVpcCzEB47EEkqJmQaO2LknFnBMSmm97zPoIDqCmQUKhkaWrJ9/g0UA9Z7SbhsWa9fZ8hjLodeXaVFY5z+wLW2gnIN9+wmaSPHfoKUTG5tCFHtPsSjSj+JLyKYz9TkDFY0pAUlwsIXReivi/pprRPxLugQuAe2VTM0rXDCQllW3d1q+5Mzxpbgn86xxSi4AXmrCDOF/wbhzRJxkEmdT5zj0dsbSfY1Li1UfSGMF+TFMNATl1V91VZhxD9h4qb6knfDfNiuUz35RLBXnmlBZeGGnxXQ7XoBDLQYz6XJl5/dkS6pnSyYyorom6p034eoLLjdvdKw== 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=WBZRtam8o0fnn6vRn5chXfe26LulNtNTKrV8oZ5YKN0=; b=JIV628EMhGLJUHdArldhmy9KfXauI8gOhQQYT46kmfPA06ySGsL2fgh/TGNe3g4FL12v2uKa4JNQZ3difG4FLy1JlEQiucgYmH34HFzM7j+Gcpy5uDVnstmIME73d8Rh4PGXbtRmXIECJpKmnN0MqEroSVlIgAEMCQKRcxpbSYnrn15rUbPEE9PDihycgd5muWDVKqEbJ9nQaXX/OtDox5J7SoNjhPUfyEMC/d1HbDOW1g2/jcrrDyn9eNOUxBa/Tba5RLLcC1b0eyqCXUcRYYcYaTzxzGwr5BYUsEN1rIaDpYWbzS4W+MrSxQtzRFjuwovBUg49Q+gfWXquD0ogkA== 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 PA4PR04MB9320.eurprd04.prod.outlook.com (2603:10a6:102:2a7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.25; Fri, 12 Aug 2022 11:33:06 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2d5d:bae0:430f:70ad]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2d5d:bae0:430f:70ad%4]) with mapi id 15.20.5525.010; Fri, 12 Aug 2022 11:33:05 +0000 Message-ID: Date: Fri, 12 Aug 2022 13:33:03 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 From: Jan Beulich Subject: [PATCH v1.1 06/12] revert "x86: Also pass -P to $(CPP) when processing i386-opc.tbl" To: Binutils References: Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) 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: 9155b36b-ffdd-4bcd-6989-08da7c566c9d X-MS-TrafficTypeDiagnostic: PA4PR04MB9320:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TmtM8uPhxMvJLK1NfBCgczTrYTGJQOgSj9APJW1PP2Yjw13FqDiQ+7pjxnDCltvDSPFupLDUfNW3NFIODZCJpHupeqQGWh0hxG4d3x49ZpuV/s3yHyaLlhurm4miLFR04byvRdjiImEvbYI+NqhGLGBLl8XNRtXHh4xlnKB8fFFTZ7Fa5Db+djIUM3s30mk5DdZRPclKuC34vXgtbuPWnh/1pJ0e4bd/gdUnkd6/qEXLSR3x0h2YQPW2mC0w35oVvUspRVR2ILPN7vUOHuRX1QmEW++eJTdaTwp3hoHbGt+H5N5TIhU1Ba+/Mk83JlxQ/UUQ/QJdOMJnzlB2O8m063cCDwQuAGsGFlzhk0VvjZuvi5JdRQloBuhPCcbw8fk6g2Z9+KiYFaPVTW4WaeQ4JRETsZWUn8h2QpnlLKE5lhIK7JxcGJ7dkjeYZqECwlrG1jmrUZeAEI7nEBDTiVpJduxNsIinggOTA/ToT9CHG78mSSn9ASPE+dtGP5oo1gAZ4EfpdgT744Z0IcBLaYxjQOcNIZXDllsP0CP4A2hNDtWyszu5IU+cWbNX6EYrrsADaHq3WZ93+zKEr1TlI3Z5pypgjB3xCnML//6DqoQFVMujPDGY1nMcOJK7wv93WLmrSgpzTfNBYcKpMy23Vx7QalLrQGSRvoGnk1EyTyEZLfSETJnGK8mkg0T4lTeNqckZ2CuqKifkCPmB+QRPGV+4ePOTcDJj2UsUC0zTkHZ1Ba+dVLSBoGRty2rnNFpNyoA1+lH3Jg0bsI0juT98mK25W0ENP9PWVWKO8qh6k2S8yKjTFEMngQM3S8FwQJB1LYQ0fLpvcz/9GIv7tHkmx3wmNA== 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)(366004)(346002)(396003)(136003)(376002)(39860400002)(31696002)(86362001)(38100700002)(66476007)(66556008)(66946007)(478600001)(186003)(4326008)(8676002)(6486002)(36756003)(316002)(6916009)(6506007)(2616005)(41300700001)(26005)(6512007)(2906002)(31686004)(5660300002)(8936002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OWxQVGRPWG85d0JBaUdLWFM2clNYaEk5d3ZPUnQ2bFA4Vk9ibmlHdThvN1c0?= =?utf-8?B?VzhjN0Q1ZE5xN0lRUWx6NjhaU2Z3ano3a0RIc25BLzdvN2pZOTNselE1NVpq?= =?utf-8?B?RG9aV1EzRW1qVExJTC9MV2JGN3ErTG44RkxPdXdFMWJveTc2TC9DSG42Sm9l?= =?utf-8?B?L2NxbzNWdW9LeVZ4K29qYzZSK2JhUWZURmRYRmFnR3dWOWw3ZFNzVW1hT09K?= =?utf-8?B?c2lhRW4xNTRiQW8vZEM3NUZDOXVkT3pUbzlkRVRSd3hiMEhQSjk1VzRwSmUy?= =?utf-8?B?MkFOS0VBOWUxL21vZ2IrN0RWdkxaRzJUckJ5b0tNazZCU1VkME5KRENJY2xQ?= =?utf-8?B?STRMeEZRQ2tNRmpHR0Zra3VqMFY1ZWcvcHBIOHlEWGRCQ3NvQURFYklDRG0v?= =?utf-8?B?WTUzVTFmMlA1aWVLZnNxMlZ2Q1Rtc0NlaFdOdkxYdHBrdy9KUVNqaEJ3K0VD?= =?utf-8?B?NmgxV0VMZU5DZU5xT3VBUjNpSUxIa1J4RWhpdUxlMFVlQkMvWEFGREs0VWw1?= =?utf-8?B?QTYwSU9tYmxvUTZPRmJMUG81NkhWN0l5L2RXLy9za3BlOEw1RWN2K1duN1h1?= =?utf-8?B?UDJ0QkYvVHJtakIrZ2JnTXBOaFhpTDVrS1ZtbXBPOG9mMG5kOW5ST2ZVTG80?= =?utf-8?B?TkZrMzJuWm5pd2dxczljd1ZpM2JESGhCOHR6N3JqWmxqR1BrNWpCd3A2TjVE?= =?utf-8?B?NlBOZGxDekVDNDBTS3dvdGlSZWwycU0xQ084SUNRZjNXb0h0WFR1UGR3WUFU?= =?utf-8?B?T0NvTWVGKzY3bndjN2xCekMyWVFOTkUvV21hTkw1YlR0QlNDVHdjTlpHZjQ0?= =?utf-8?B?OG5iakUvV3kxbkxLdVRLdDUwTmdOUlA1MHRvdXYwc3NUTm1BdnRoa3FmOS9x?= =?utf-8?B?L2pzTmZaTllKZHQza1VNeit0bHhRTml2aTZPaFppa2NCVUNsZXMySWFDYmFm?= =?utf-8?B?N1NVWlB6NTVLdklxdy94T1Mzb2tkYVQxRDR3Nnh5MlJvdWRZam90TlR1Ym91?= =?utf-8?B?SDc3RUNwR3JDeXZkcmxSaHdqWmZ4MTlGa1BqblBKQll0c1RYYUdMTXlCYUFV?= =?utf-8?B?VXhlVWZXY2xnQ1c1cHo1YXJ0SjVmSFlmY3VBb2FNRGFKL3QxbHI4b2VGOFk1?= =?utf-8?B?SytLMUxzWnlvWkF1RUxSdzF1STcvWTJCa1RBSVk5RHg3YU1XdWFXZ1psUGUy?= =?utf-8?B?WVVSTThZVzZSVjdzUDRZSGhyM2gwOWtKSFVCdmRmZFgxWHhQMG42WW1VY0VO?= =?utf-8?B?VEliejNlRTlQREtyOTYzMmVTWmxBMmFqOVJPVDBieWN1MzU5ZTZjblhuelVX?= =?utf-8?B?NVVvT2s5bkxxVmZCMzFCZE9aY2srblM1Y1lveUY4bmNWYkNTa0M5VHhUNnRl?= =?utf-8?B?Mk9sQjNjWDg2Mm9NRGc2TTE3RStZc3B6cFpXNUpaNEI5ZENyaWxRZEgyYWRF?= =?utf-8?B?bHlQaEhZT3h4ekZiYUhrMVBPTStZN1RqODZEVy84ZC9qcnprWEpnMVlkNjBn?= =?utf-8?B?ZlZ1T2NJQXBiTnJlYlpEeFZTQ3gzWlFkblFMcnN3djJqeWhkSmp4U2kxdHRU?= =?utf-8?B?eDJVUWxVTVZ1VjE2dGNlQmxSVFpyR1FSTDJjaGNqUE84QkVLWk5adDBWNzNE?= =?utf-8?B?Yk1jcFo2Q1ZPbWdadVVIMTRRVnozaWxBME52a21BaHhveTBEeC9RY284QlF4?= =?utf-8?B?KytRRmRHWW5ZdXFRRGxjakxHNjdDTnpIQ3BLUFhsVllxaCsxdkNMYXhHaHBM?= =?utf-8?B?OGUwREI0cUlSREREbVZoUFRacWJSRGJ0N0NUbzVhUFFNUzlUWTRSTXVQNW5S?= =?utf-8?B?SmNDcXRjYjdyTzlUelZyZm4yQTRIYzRJMzlUSjltRmtLMHMvRmFsTkxtK28x?= =?utf-8?B?YVo3UEsxdCt0V0dSZUVlT2FoT3cyek5Fa01OVGlJOWRIVXgrMS9lWStYbER0?= =?utf-8?B?My9Zdk1KRElVWStzZThOcmZISEU5c2VoM3diUHVXM21YYlI4OWJCc2RYeTFL?= =?utf-8?B?YTFIM3FtN2NCWkRxbWI3WWFtS0JyUmpUS3dWQTFoUGZpNUtNZlRYNWp3cGNF?= =?utf-8?B?NDNKRmxyTDJPWWR1TVBjalpCOURneVRCU1c2MjZIUVdRajh0U3IxYkt1UExC?= =?utf-8?Q?pUeiNAPD2Oh+qbKUxWUxgTK13?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9155b36b-ffdd-4bcd-6989-08da7c566c9d X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 11:33:05.8571 (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: EOUL5amXMzQfgFBk7Mw6LadGRjKom4r+gLtcvkq+xmprximzkvEKpMENXvTs2+frVn+Y74u2geoVRm6FMi3+HA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9320 X-Spam-Status: No, score=-3030.3 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, 12 Aug 2022 11:33:10 -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. --- v1.1: Add comment. --- 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 @@ -22,6 +22,11 @@ #include "i386-opc.h" #undef None +// When necessary lines can be split in a non-standard way, by placing a +// trailing + on a to-be-continued line. This is intended mainly for non-insn +// templates. Insn templates are better kept all on one line to make grep and +// alike produce useful results. + #define Amd64 ISA64=AMD64 #define Intel64 ISA64=INTEL64 #define Intel64Only ISA64=INTEL64ONLY @@ -455,7 +460,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 +876,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 +967,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 +1057,8 @@ pxor, 0x0fef, None, @@ -1309,9 +1314,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 +1474,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 }