From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2057.outbound.protection.outlook.com [40.107.247.57]) by sourceware.org (Postfix) with ESMTPS id 873F638582AB for ; Fri, 3 Feb 2023 07:32:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 873F638582AB 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=nEoY11WsiqmM373vLBIYfpo1gHvEDug1aRt2i+IQ3YyB1SsRqlZAvKAKy2OMHr2ESJKWHp3ezjfF6+JK0kSult2DZLxAGolFDPZQaOf4PfojKAm3AQl1I8z0MjNay/2bXwhdEyCOCYcJEZXuz7zs2b9PqkySR3uDhw8DDEeihJiBl0p3Kdm2wZCkC989yMQFUSQWm17pR7W+Yx20MEdk+FZ0uv9WrRVkQsGkmmO6haKRpp0UcMj2bUUoVD3eUOL/3GG7C6+hUG0PsqK9fzKwarojggUFmST8UZeM7o6V9iICYtUfD6fdwKF4sODr39vRPQJYHA59uXLM7FutlgUI0Q== 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=0Co3HZxqv4aW8dlDt4pZxnOmZmXt+8ZXQs4+zcD0Wno=; b=fvOdZx9p2MHlNJ4ERIiHABUJQtLZU1hKSaGqmWkQD5wpKQQpcHfALoFDcGMMNoL5+dZLtaAJfzFj3GZr9OrmUsEWpuPZMXIoALCwxc+HPrK/VhidCmvwoxwSoa10vNH4TUIyV7hda8YoKuUZLOc63DBiJvTVxWlobfIrFbbm4WL6+2lhK+Z46TVGmRbq9rtd1oIHQIUXk+EdI5EErmbe4c/X6WhiSI/5HudHBHOB0dU+W/4mZu177z6mQLGVWVj39ZVN96ZsVnkYlsTeO6RLtMuZUELKZKom/rgW8sLi4VeIrhGHBw1opZ74QbNpcvV2AJo68AXH0+f+xongrfExoQ== 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=0Co3HZxqv4aW8dlDt4pZxnOmZmXt+8ZXQs4+zcD0Wno=; b=ZNqooKrTBDbMtwl8eYS0+OALYZNUFVJd3Aek4SzKeGJD57r/8WJIKfanUPGkY7vaUeU2aKccKhpd0uIxvZ52+xUUpv/XhihZrMS2vtM6mDUorRHD/WEqSfDoJJRv2Og1ZFsCNtMlHFajDz7Z7Nzv8Vh11OKKQ8ZvfRTJu2fSMmck9qORBOhrRZAOX7XFvnyxvw78JP8fRqW6wrp38zDLJ0g+5YAL8gEijUpswTFqVY/GrzbW9xtvHF9A3PqKlXtkjNBrWGTZxnlX0I45BbLmpDI0gMq+O+eHTeWqBsDeIWjeFfrSxNTbLJ6iwnq4uaw96bFp/xVvuKGZ7zMUPoPD8w== 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 AS4PR04MB9715.eurprd04.prod.outlook.com (2603:10a6:20b:4f9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.25; Fri, 3 Feb 2023 07:32:35 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%6]) with mapi id 15.20.6064.024; Fri, 3 Feb 2023 07:32:35 +0000 Message-ID: <645a01e0-8acf-f55d-1f5a-c9e8bbb1d10f@suse.com> Date: Fri, 3 Feb 2023 08:32:33 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: [PATCH 2/3] x86: simplify a few expressions Content-Language: en-US To: Binutils Cc: "H.J. Lu" References: <1387362a-7920-de18-18e5-9fe42f923f0b@suse.com> From: Jan Beulich In-Reply-To: <1387362a-7920-de18-18e5-9fe42f923f0b@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0104.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::20) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS4PR04MB9715:EE_ X-MS-Office365-Filtering-Correlation-Id: bc3ef4f2-d099-4830-5f3a-08db05b8d1a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wpQKWUVyQul8ErHvCm/SlsSbImWbWjbX9mn5DxYDC4IkxVsDUrcR1wUKOThhQKuXF2Ax2loY5kilDGMOrEL2oO950Ueb3fV/7tmefWBUut3SqiDTEQiW+gIUWCEPWQME+LoyscSSYpvqxzg44b2j2vTqD/UIn2rZO+Z08Eq3LJVhUshzwXRX+OSjMvmqd430lUQAImJ5U7SxWi0oCZA7k456LAupTGHbW6Mq0SET8+xaRZltdB0uYPyml9QjLQd6M9Yh1YclOUksPBwYSbSyhCHxN3uVQybpKyXDeHS6rMwxDgMPWbba1MREV7P/8xbavSGMyj8TLSCQjCG6LGKcqbx2WZ+8SbrrTzqV4YTViWvB2Fv7XUHijTGu+sd9Vv2RbXaLRD08pX3j0tgqxNEcD7/I7y0SwBL7KKU+2VqHRIEwMoxTYN5mUiAq1yrIxsd9PTgevEhK8ZvKIQZGr9sR1bGlyIAtYgtkN2s4eC+eSk/VUSe+b36uSKShXH9+OKiqm/REJCXsyHZRpWbReKP9/KYd3T48YfBUZUp0d1uUIjS6LE0+8adbhX0lkNKVXUjd1y712xZSBWRjyr+JVZCU7eLzuY6295zPvyTJK//opgJdDtA0lzIhiTiXhB9Cf9zxdiA0J1njWfymvNCFhie4kKlF7niUPltVcfnHDOo5QqaUTJBvlk+kJ3LGUSZZ9uvOP7HQTs8hYP7TsOmEeFckW5ag9ipB1ivKz90Ms3ZsSHo= 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:(13230025)(346002)(376002)(39860400002)(136003)(396003)(366004)(451199018)(478600001)(6486002)(66574015)(31696002)(86362001)(38100700002)(36756003)(2616005)(6512007)(26005)(186003)(6506007)(31686004)(5660300002)(66556008)(316002)(4326008)(66946007)(8936002)(41300700001)(6916009)(66476007)(8676002)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QVNwK2E0aC9NQkNoS0tUb0pTR1dkSnJ4WjJ3OHIyemhTN0tuUDJNbEF2ZEtZ?= =?utf-8?B?dUFETG92RUtqeVRkdUxoRzBZczRmNDlOcDRqQlVxY05tbEtSQ0htajdDQlMy?= =?utf-8?B?d0pRbHgzRWNPYXlPazFFZ2dSL1JoOG00clFKVkhXMDU1TlpqOWdvL3JEeFlx?= =?utf-8?B?VjVKSm9ZbUt3WUsrMktkZ2tYeGtCSVIrK0poT1VvdTVNZFBkRW5KTmU2OHBF?= =?utf-8?B?QTNGTlpTenpvYXVIMktrT2poZVN3Qjd4MWFpaTlnT0lwbVR3OU9pVFAzNXVN?= =?utf-8?B?aHoxaFlIakdsdW5aZTIzL29HQ3V3bHpaZll3cGFIRXRYMWk3dXZyM2lqTTJP?= =?utf-8?B?WmE3aVpjWFZERWdWMnd4THJyZmRiQVFvQ3BNMmdZWGwzNGxEaXFaYUpvT21j?= =?utf-8?B?ZjlwR21UUW9xWEYwWG1BSWZNL0dYMVU0NDN1RThQWHc3a1VHU1BKYWVjRFg5?= =?utf-8?B?RHkzUnlnRE5Udk92cjZwajBJZUJMaGtPRGpqSWJwRXdTR1dTd1dFOTI1Y1lx?= =?utf-8?B?OWJQVSs1MnJOcHdoNElMWGw3MXZ6cjE3bFVjeDQvS01sT0tnVndYUjIwZEU2?= =?utf-8?B?Vzh4L2hEekdwa1RTbW5IQWFrVVVpaStCNDdNZWdrRktTQUpWY0tJMytsQVNj?= =?utf-8?B?cmZ0MktleGI3U2NrVnQ2TDRxTTVlRDhYdGdqU1B3L1hBdFNic040SCtMQnlu?= =?utf-8?B?K09XY0grblR2TitNUVJONGd5cDFMVXNTb2hCUzM4ZVh4Y1pPQ3VrdFFxU3k0?= =?utf-8?B?WDJoWnJ5SzIwVGdjOHdrbkxoWHo1RDBFQjJYRmhqU1pxRVpVcnBIbnVKaDlZ?= =?utf-8?B?UlVHS2ZZKzZtN2luaW9DM1pIL1BXZkFoRWJESEY4b3JQc2h3TzJBWnM1MXFx?= =?utf-8?B?L2FQcDhBYmtFRDR3SUNXSVNHNWVFNVZWSm9ZS2xiY1VhQUJKVy9RYS80L1Mz?= =?utf-8?B?MEF3R1hmQ1dDT2tYSjdYM2EzdVNHSDJZREpyYmZNZG5JaHkzTW1mOTYxK2FT?= =?utf-8?B?RHBRS1lpN1diRExmSldtSytlaWxVRVlHNEdOYzhrZ3F3ZHJmT2FidXE1QTZD?= =?utf-8?B?cTkwallnZkdzK0ZGNGllTWNHYkd1dWZ2eDJjckVPRTlyMm5BTXNMdkV3dEIw?= =?utf-8?B?bWFmRXJ0Y3B3b0lHRDMwK0dNTlE0ZXdhYTFReURvcVROTU1PY1AvNm9xaHZO?= =?utf-8?B?VzAxaXo1VlgwazM4MVhVSXpUQjg3Y3F3aGUrN3pYNThuTUM1VnpIUnVmSzlk?= =?utf-8?B?cm9mV0VRakVBNUF5dWtUbUdvMHRXYkk5V25FUFE2eWxteHRnYWJpaXlCK0RO?= =?utf-8?B?eXFaZ0kzSTRpTmhJRXp5akZrYWFORVFpa3ZidDZQOWJuT0VoQ1oxTllKZE5t?= =?utf-8?B?TjJrTUV0ZTU2SVg2c1dhb0R4UHFIYkhpZXZGTmJiMUdiMXkza0xmTllBT0NH?= =?utf-8?B?Uk1xMjI5MGxnc0FLNXh1RFlqMnE1VDAzaXVTaXBhS1pSeStCV3lCRXcrRXY0?= =?utf-8?B?UVB2OEQwWmMzUHBadDlScTRrNDIzRWF2bWJETDhjMVJRSGVUWVVJNm10aHRk?= =?utf-8?B?RUpOZTJ2aVhJanArS294K0RZemFRdDR5cnhaZ0dKcEtOV1JPTDV1RjVqWk5V?= =?utf-8?B?dEMyeEcxRDZNblR4N3lhMnNiWlp2dkFIRGVWMWFwcDR4Q2ZEcTBtbGFhODk3?= =?utf-8?B?MHFPNXQ2WGJSV3k1Y2JIQnJJQStUL2FtZTQvUm9iZHZCajh2VkxHMWlSb0xz?= =?utf-8?B?VmVPaXh4WldWMFZRWkltM082WjllNW9jWTE1RytuZnBPdjUxWGJKYnV2eFBX?= =?utf-8?B?WVVqSkxsUHBFZzZIZGM1dHEzbExxT0MvMHJpNm5jUnAybXhFcDBSOWtORFpI?= =?utf-8?B?aUthR1BzeGY4WGNxWmhZcW1JR1UvMTVoOHZKc0pDQ3pWSnJMcXRhNDRyRkEv?= =?utf-8?B?NXdQNHY0UlhPRXdHUnBuRTlkQUh0MnpNcmVlRGRLbjczelhtVTlUVEhGODA5?= =?utf-8?B?L0gwQmJYWTNDTzM3bjRuNmwzSTloVW1ZMVVkYXZubFNIVG9tRlEreEJaMHBF?= =?utf-8?B?elhoNU5MeTBqYjluMjJFaitEM05ZYml6L1hMK0hXRm52bmd6dEJVTEU2R0ph?= =?utf-8?Q?grNTHy1Hx9ZuY4tAIFaCh0V0u?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc3ef4f2-d099-4830-5f3a-08db05b8d1a1 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2023 07:32:35.3754 (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: aopAVnJx1paeBjk60H7j2I76POAZ1/KgG/Mgeko6Cn4GOaP5wsLZsykjE3TiZ0c9iWnKNzv3HgeSFSctZdAtPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9715 X-Spam-Status: No, score=-3028.6 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: Fold adjacent comparisons when, by ORing in a certain mask, the same effect can be achieved by a single one. In load_insn_p() this extends to further uses of an already available local variable. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -4576,8 +4576,7 @@ load_insn_p (void) else if (i.tm.opcode_modifier.opcodespace == SPACE_BASE) { /* test, not, neg, mul, imul, div, idiv. */ - if ((i.tm.base_opcode == 0xf6 || i.tm.base_opcode == 0xf7) - && i.tm.extension_opcode != 1) + if (base_opcode == 0xf7 && i.tm.extension_opcode != 1) return 1; /* inc, dec. */ @@ -4589,13 +4588,12 @@ load_insn_p (void) return 1; /* rol, ror, rcl, rcr, shl/sal, shr, sar. */ - if ((base_opcode == 0xc1 - || (i.tm.base_opcode >= 0xd0 && i.tm.base_opcode <= 0xd3)) + if ((base_opcode == 0xc1 || (base_opcode | 2) == 0xd3) && i.tm.extension_opcode != 6) return 1; /* Check for x87 instructions. */ - if (base_opcode >= 0xd8 && base_opcode <= 0xdf) + if ((base_opcode | 6) == 0xdf) { /* Skip fst, fstp, fstenv, fstcw. */ if (i.tm.base_opcode == 0xd9 @@ -4638,7 +4636,7 @@ load_insn_p (void) { /* bt, bts, btr, btc. */ if (i.tm.base_opcode == 0xba - && (i.tm.extension_opcode >= 4 && i.tm.extension_opcode <= 7)) + && (i.tm.extension_opcode | 3) == 7) return 1; /* cmpxchg8b, cmpxchg16b, xrstors, vmptrld. */ @@ -4673,14 +4671,7 @@ load_insn_p (void) /* add, or, adc, sbb, and, sub, xor, cmp, test, xchg. */ if (i.tm.opcode_modifier.opcodespace == SPACE_BASE - && (base_opcode == 0x1 - || base_opcode == 0x9 - || base_opcode == 0x11 - || base_opcode == 0x19 - || base_opcode == 0x21 - || base_opcode == 0x29 - || base_opcode == 0x31 - || base_opcode == 0x39 + && ((base_opcode | 0x38) == 0x39 || (base_opcode | 2) == 0x87)) return 1; @@ -4708,8 +4699,7 @@ insert_lfence_after (void) chosen by the adversary using an LVI method, then this data-dependent behavior may leak some aspect of the secret. */ - if (((i.tm.base_opcode | 0x1) == 0xa7 - || (i.tm.base_opcode | 0x1) == 0xaf) + if (((i.tm.base_opcode | 0x9) == 0xaf) && i.prefix[REP_PREFIX]) { as_warn (_("`%s` changes flags which would affect control flow behavior"), @@ -4779,8 +4769,7 @@ insert_lfence_before (void) /* Output or/not/shl and lfence before near ret. */ if (lfence_before_ret != lfence_before_ret_none - && (i.tm.base_opcode == 0xc2 - || i.tm.base_opcode == 0xc3)) + && (i.tm.base_opcode | 1) == 0xc3) { if (last_insn.kind != last_insn_other && last_insn.seg == now_seg)