From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060.outbound.protection.outlook.com [40.107.21.60]) by sourceware.org (Postfix) with ESMTPS id BFEA1385842C for ; Fri, 8 Sep 2023 12:53:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BFEA1385842C 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=Nlh2Ffmq9ZB2RSSkO2vHf0iycYTrZoq8q784pcZrG/wM2H/tWcsVwT0qn4sphMaY7CKVE+FOVJvS7TLMAJaidhyh9G1vjs9W8JYqD++hsvzh4qkDhaRWZPA561497q62KQ5l6bbMNjTs9weY2b70oIyPgo1s+XwNTgvIHWsbxXJy907igavgABrfEd21LpYZyj/ujmz1etmAfqrJYNntsfXNqxmkp/XxWmSIGXpVvMxqGLIOYErRRZHfifWufoKEPS/a3sKnPRD4X5i8aF+PxkyJ1PL7bCiKMhXlnKy2fztyl79uO+1dDOlvKTaORNuHR8+Uf970ZybZKJUR5qqIvw== 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=7I27yjMNPw6TLs8YsIHP3bTbinPjm9dhTzymGMZp8GE=; b=BdZ0lX5qoB1sxMMtImBjASM5Fn4oCJSXflpPvnPKCCYFfX45YlvPNYyO3dFvYrueQdFpfnfWj0xlepRq/nK23O+2xRwAfEYBnFYD2KO/4GabCOTxypup1vMKLBMa134PTAj+MPUJLkSgAsGvS1g5tBr/srB4DPbIzdq8J7WWKEVAr8oJkJXKR50+KmdOcw4KHWPBMMwQ8s+rgt+Ewlbpd4uhbge2SuIxewJaIOax2zB5J0t4mfFW1fqQx1Dagfzev9vWa/0xWJPYH1kASELjWObrWyG6INCkWRk9IdSB0PLkoLo8NlNjQzO5LjQeUdcXZaFy76R6JixD7Y9j8kcRcg== 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=7I27yjMNPw6TLs8YsIHP3bTbinPjm9dhTzymGMZp8GE=; b=H82MlkChIZyA6c+A7eeisUhYjRAJ98jUuVW3s1OZswcN4sgErlpVqxsD4+3OSlfRj/WVlv7+smMC9vk9iswYCl23x9wtuNTFUJ4eoIhgdmMNBYYDnTIgNLzOkcP/MmGPKI+0aPTlFtUID/aHrxA1FvQT9CKvSzCB2Xr6RUwQtmnxu8JPi+KJ1TVmcsoJUsDuFVzEOoTR8UWK8eQFZ8DJtMcALKq1hTiUyZvRUwzSSXLKdDhFg45EZmoYLvtAw70JVCyH9QBEaDSqHqYNEo7/TPnC72W3sfYGrZhgLQ0tZuN2TG/bOJKXleABb1sz8ghbU0dcWzn/20oHQwvtoB0wnQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by GVXPR04MB9760.eurprd04.prod.outlook.com (2603:10a6:150:114::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Fri, 8 Sep 2023 12:53:45 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::f749:b27f:2187:6654]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::f749:b27f:2187:6654%6]) with mapi id 15.20.6768.029; Fri, 8 Sep 2023 12:53:44 +0000 Message-ID: Date: Fri, 8 Sep 2023 14:53:43 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: [PATCH 1/4] x86: re-order update_code_flag() Content-Language: en-US To: Binutils Cc: "H.J. Lu" References: <830bde4f-c60e-4ab4-2ca0-86381408254f@suse.com> From: Jan Beulich In-Reply-To: <830bde4f-c60e-4ab4-2ca0-86381408254f@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0122.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::11) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|GVXPR04MB9760:EE_ X-MS-Office365-Filtering-Correlation-Id: 7afccff3-8ca9-4d27-3cfa-08dbb06aa2d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hartqTXP/A6/AHUrQz2UQ/hXLg0S/xX1FfHHu9NMv6VcyJ/9QgHzO1DPnXHft1y2qC6bTuTYYq+7essMTHk8NjhU4hVEyd7dltRiQ/0DGRMi6GD/GK+aYlGVZ7Odrgb1DwWp3vAWGoqdyZimKMIlCji78gv2VTDAegIhdj6miKhwX30VgA2gMjWrth98K7z06+SN5kWIoktOqWtuMbXlH0rw6I7VgwyhiV+18UN0gbFGFnSGV0AImeir7w7QvskpLkRvfyECZuqm2ZD4VJAKAPMHRfAPxo41ejJ/OOZD+tP2qsi9hIGgsKb1eUQegeXS2Iw9br+w8k7m5L26eBhflP5nxdUvumsKqSFxWNrVe9ddktoaRjjKNuqWJiomJtUbU9f9h1gDcZ4On2dUcHg4rlYiWnQsyNGkSAbkn8Q+4++ZW88GTU8CoYKpLYDTypm+n3DmiCYjT7bUnPScVstI1Z9CKS0tM1FDFU0H4PT7NdKPSgFwuyyrVeHt4qC1vRKZgGCogbQMKCr4BNA3JxcdbOUqhJpol8NRItO98GZOD+cZSgEhadnywtIHFaY3AkbGJGsIj9ADf4VO4X8D0KY25eRKkDuBMYKNRJnmBPqwMhbpsaCEipWLOZ2ZhLl/lf6Ok9wjJ3LPY8pXMaoKROW8vxPkVuSQxxD/oe3i3qivSJHAIsQKtCEgQI9/pQb9PifS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(39860400002)(136003)(396003)(376002)(366004)(186009)(451199024)(1800799009)(316002)(6486002)(6506007)(6512007)(83380400001)(478600001)(2906002)(15650500001)(66476007)(66946007)(41300700001)(6916009)(4326008)(8936002)(8676002)(66556008)(5660300002)(2616005)(26005)(36756003)(38100700002)(31696002)(86362001)(31686004)(169823001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OU5OMk5sWlB6cVhsREw5emF1UXJYL0l5eE51d0hEbWxzeStPcDhTYVc4UFJW?= =?utf-8?B?TnZQVzZOSWE4cVpLL292ckc2SHcvWndaRHdOQkViMDd0bmhYNnhHR1pUTDN0?= =?utf-8?B?emJWeVd5VGkxc1V6MjdOcjZOSTR4dW9ZTDlJQm4rMkR6dklQVHpyR2p2TWRF?= =?utf-8?B?cFdHWnR6Ui9tdlBrZmwzM3JlZHFwQi9yQ2xvWTNwUFBnMlZHUmh1QUtwWjEr?= =?utf-8?B?aitIeUJGcFNqSHY5YWt0eEM2aDdiWjNhNEFzTWxubEk5WUZoWFYwV3F6RVpi?= =?utf-8?B?MlhzWlFwMHBSRVVGQ1hWY01tVGNrazhvS2RsTEFiK0E0NDZkRmw3TzNhMlBZ?= =?utf-8?B?VktDbnNzQkxPRTdvSmxYblJHZXZPZGdJRWc4MWIzazF6dzg0b2VVNHd3ZGFT?= =?utf-8?B?cStQd2pqREtPVU1jSFVHZGRPSGFKTnFLOE9kVW1ucjkrdWV1L3o5bG1hY01q?= =?utf-8?B?dDJtVHhrdENrU2x2TWhkS01yd0I3VHd3VENtYzVjaERQUlhnTTBHYU5sOEpB?= =?utf-8?B?ZUxnQU9VNHMra0pnUlllYWZqZE50S2YzUEpWTU5hRjkxbzVlaVcrNkJ2MHNH?= =?utf-8?B?cGRiU21FdCsreXlERDRDRTZhczFCbC9LVkJZVGgwOVdkWUh1RlZNZG5PRGdr?= =?utf-8?B?TzZaVnEyUVBzbjV1M2RaSjQ1ZlZCUUNSY2tFRGMyNWNoQTJmd3NBQmhNdXVt?= =?utf-8?B?eTVrYTZWMC9jcVN6NW1ObHVSYUJWa2lHU3k3aTIvOEk2Sm5Dam8rK1JlcS9k?= =?utf-8?B?OGJNQnBVQUpvRmtJZXM0Tm11Yng5RThFZUcwUmc3TVhZSDduVDdOaXdjVjdP?= =?utf-8?B?cExQT05FZmJvKzZ4KzYxN3NUdHQvT28rcXBTZGFwd0Fsa0dGeG1IMVNMbmdU?= =?utf-8?B?dHhSdXZib3E5Ykg3bVdsWkZhR0ZaSUtiM2VSdHZUNk5TZldLcERnd0Nuc1hj?= =?utf-8?B?RGREcmpoa3ROUjFnbm5UbEFSZW11bW1rZGxzRThtbkFSY1ROaHdGWDhoaVdx?= =?utf-8?B?Wk5KZVpPaEdac21TN1lpM3BWYTJVNi91SCt1LzJZMGFMU05uNXdodDRMcEMy?= =?utf-8?B?L1V1ZEw2UUMyN01sbWJLZFZ4WTBCOUU4L3FTTENGOUx6YndCSy81Z0FPSVNJ?= =?utf-8?B?QkZtNWcwMnJCQTdWWnM0MDFCRGs3M2t5dGpPb0hhRHFRZTBDM2RRcnFrNWxE?= =?utf-8?B?SEs2T0NycnZ1ejJ3RndvY2NQWnVmelJibDZrLzJJNXFRL3RGdEVyK29xWXE2?= =?utf-8?B?Z1A3TW0wUHU5N3Z0ekk0VHBtV2FOYWgyZk9jWURwZDkvQWJYbG56NWpLVjll?= =?utf-8?B?V296Vk1vVVRrMmxZVmpwK1ZXdXZmS0U1azdBejJOTjUvclJJa01sdDlMOTV3?= =?utf-8?B?YlhnTVNSUm04ZUk1YnNLZjdjYkJwTlRRSWt2SDN2NXlhL0QrVWdzQVVPUUhX?= =?utf-8?B?UUVTZXdqalNVd2VONTR6OHNibzdLelNjemNVWDBRckJRRmxERWlEUUxuMFNi?= =?utf-8?B?eFlIUk5STHZVSzhWK0h5YmlwNjQwWVpjYnBHekduSTFXYkpTLzlMZnJiWkJh?= =?utf-8?B?U3VqRWdwaTFWV1diSXN5YUtTVDYrUVpUL2RQdHJ3eWxDS0xySFpvYUswc3Zj?= =?utf-8?B?OXF5dkpuSkVETmVOalI0TEZVdis2VTI5aHBJZjJPcGk5L0RrY0xHT2h3cFhr?= =?utf-8?B?RHVPQ09SQURObktCU1BvNkZlRnJyUGpScHovRWdrSnRrQURLWkJRT3VSSkh2?= =?utf-8?B?bEhZMDN5V2NzRU5sYzl1SkJrY0tpSWFTSlhkWHJVSmRSWjlIM2c1VVVKTDJF?= =?utf-8?B?SDNhVEcwT0ZxWFdTQzZKUEMwdi9Td2NhUEtnVWw3aWRBVW9nVWtMTG1Ed3Z2?= =?utf-8?B?OE4zdDE1MjRBZENRVFZua1k2NkJPcWlJdEx3bmJWNmExQWkwUTFCelNMV1FM?= =?utf-8?B?ZTFsTjhKRjQwZHcwRC9pdXM0ZWd5RnVZTFoydTcwQm5HQ284U0prUUFUTzRU?= =?utf-8?B?UTV0NGwxMWdKMjMvb1JLTGR4WUE1QjBvdFJZeHNPVXpuNE4xUEdzMlNmcysy?= =?utf-8?B?VFpJVFBKanNtY2JaWStuRWY0YTlDZ0M5Y0FvWWNyMDJSTDJ1ZXZsQmN5ZVE5?= =?utf-8?Q?Ya5JssOF+ObaowJ95m8uCTTj8?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7afccff3-8ca9-4d27-3cfa-08dbb06aa2d4 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2023 12:53:44.9009 (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: ta0IPOqrXOXvQC3GbxX+4EO8Mz35U5ATx8XSE85wHIAilbHsi6QCL0WBN0nPVRu1+w+bljTIu4Oq7enpEtSt0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB9760 X-Spam-Status: No, score=-3026.9 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: Do checks before updating state, and bail upon failure of either of the checks. While moving the code, eliminate some redundancy. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -2609,7 +2609,21 @@ add_prefix (unsigned int prefix) static void update_code_flag (int value, int check) { - PRINTF_LIKE ((*as_error)); + PRINTF_LIKE ((*as_error)) = check ? as_fatal : as_bad; + + if (value == CODE_64BIT && !cpu_arch_flags.bitfield.cpulm ) + { + as_error (_("64bit mode not supported on `%s'."), + cpu_arch_name ? cpu_arch_name : default_arch); + return; + } + + if (value == CODE_32BIT && !cpu_arch_flags.bitfield.cpui386) + { + as_error (_("32bit mode not supported on `%s'."), + cpu_arch_name ? cpu_arch_name : default_arch); + return; + } flag_code = (enum flag_code) value; if (flag_code == CODE_64BIT) @@ -2622,24 +2636,7 @@ update_code_flag (int value, int check) cpu_arch_flags.bitfield.cpu64 = 0; cpu_arch_flags.bitfield.cpuno64 = 1; } - if (value == CODE_64BIT && !cpu_arch_flags.bitfield.cpulm ) - { - if (check) - as_error = as_fatal; - else - as_error = as_bad; - (*as_error) (_("64bit mode not supported on `%s'."), - cpu_arch_name ? cpu_arch_name : default_arch); - } - if (value == CODE_32BIT && !cpu_arch_flags.bitfield.cpui386) - { - if (check) - as_error = as_fatal; - else - as_error = as_bad; - (*as_error) (_("32bit mode not supported on `%s'."), - cpu_arch_name ? cpu_arch_name : default_arch); - } + stackop_size = '\0'; }