From patchwork Fri Mar 3 12:58:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 63892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp392795wrd; Fri, 3 Mar 2023 04:59:10 -0800 (PST) X-Google-Smtp-Source: AK7set8fAoE7pKLL442BK4z8j8VbonGB8NEJcrP1TXqbTK3vwZI/dAfcVs9UkJu5W4Rk8sKOW3R0 X-Received: by 2002:a17:906:348b:b0:8ef:3e41:e719 with SMTP id g11-20020a170906348b00b008ef3e41e719mr1565327ejb.63.1677848350761; Fri, 03 Mar 2023 04:59:10 -0800 (PST) Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id p7-20020a170906b20700b008b17fe8a06bsi367170ejz.70.2023.03.03.04.59.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 04:59:10 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Npghqq9b; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CEEA9385040E for ; Fri, 3 Mar 2023 12:58:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CEEA9385040E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677848324; bh=9pFq6ONTselqCWLT8dcCMwB3q1D3HaVkHMnP87uUBUQ=; h=Date:Subject:To:Cc:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Npghqq9bXdO0AO/cHqxfIUWkjRlZ/uzbrOEyhW80E6LY3tI04Wu/lT+ABy/annFFv lbjksaSxbaY2Y/y1ivg8OvsTu9+Nr7nEI81GdjhGzcKEWZB0lTZPtYtenZLbYIfJzZ nR12hsa2XDSIOBbUXS56T5joaAgej73HFCEZ8OZQ= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2049.outbound.protection.outlook.com [40.107.14.49]) by sourceware.org (Postfix) with ESMTPS id 6CB79385B506 for ; Fri, 3 Mar 2023 12:58:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6CB79385B506 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A2XMNlNiMYpLb6e5DZIo3Rud1HOk6AwIxEhhkGTtkWEiPRdP1hsu8pKBrIDGC6844R1g0zVlAvYtHLlICrRlxS3OdaWxVJG2pS/gGD+Oc6/A35tNm85TVvTQ5dIcAIKyWxPY5r24SDPlQjlBJpwqa3LVTN1frdpYiCjVZR2zroHnaCI6irVNJ+QA3YK8E69qfqqSivM4x2p6qEkAJ8+rpu4+NuSkt8LYaQx5FJGk5e/NO0r7rLyb+3LY7cCAnSRMwU2DCKyIYYVjzi9cafdTGDGk+IkG4+NjNqEn5GN9p0qdTtMNxw4ZBw/sP6VRw5qV+Tsvedhydt8N4NgvLM6m2g== 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=9pFq6ONTselqCWLT8dcCMwB3q1D3HaVkHMnP87uUBUQ=; b=I1jWdiJc7NEZ+w4IdtYq2PpTzvzPq0QSFmTO+YcUbeOIphLQNKiKGEOlw9hR2U6YpzZmFUboI78BmEW+/k3LdMcDcFTn/xlmZkTYBaxchZGB++34p/+I7mihJjOnRaGjTitqH4jc0BcZ/isGMG5pqR1lyNL+sABGZYsydKV6WGqgdkQTk0q4T9FTcBuda3uaXRtYI06XZBDneaJtQLokog6sob7ES0oGdJ8d5sxko2iDjn7mpXUFo4/bWKZFztwH9nbzzVEB9bxfPDGQok+7jMBcUa/avC9nFAx8Er2BqszpDjCvzkBUZ7HraGDJim6+Z+SUuw00pc9+4d0bXQfFAA== 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 PA4PR04MB7725.eurprd04.prod.outlook.com (2603:10a6:102:f1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.18; Fri, 3 Mar 2023 12:58:14 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%7]) with mapi id 15.20.6156.019; Fri, 3 Mar 2023 12:58:14 +0000 Message-ID: <2ab58b70-a02f-cba3-8131-c54eb81b109a@suse.com> Date: Fri, 3 Mar 2023 13:58:12 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH 04/18] x86: use set_rex_vrex() also for short-form handling Content-Language: en-US To: Binutils Cc: "H.J. Lu" , "Jiang, Haochen" References: <764b9e03-18bd-6945-692f-a250522196ca@suse.com> In-Reply-To: <764b9e03-18bd-6945-692f-a250522196ca@suse.com> X-ClientProxiedBy: FRYP281CA0009.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::19) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|PA4PR04MB7725:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e2a3bc5-9cee-4abe-8527-08db1be6f35e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OHa0RdoYgRSnZhwMStbBr/3FB0xuNXk/Q859crgJfhxHstyE2LX1l8091C62fc3+MKUJ2/i9X3LFfPNclXYeF5gB7Ve+d6ztMYrTu/i6S2ZtJMpKysgQ9JKpPHn3DsL95GD8t89irotyroaHd6neicO5KA40CyR9HuC3/chHCHyHDrlxd/yD/w4FjpqgPG8rbls+00Zv/XJiF7d7ZkT9Qh/UkqzxjZUgMBYr9XgAg+RDQMt21FnLf8SbEK2yD4x0pHJF1uK/sQUrZkb5A/6ba9OzYDkgfgKmalIyuVW5lYXLAAJyAPUdWpZGEd1XDLaxNK/UL8mb1YIxsjHT9gwmzUiSD2cKA6HfAY3h5GyIM7H3kGW2q6VVoPC5H643Ve6OTCxVBiV9DTCNDfOiA20xqmnJ6+c0prgUQMKp5BoC+nBEx786wJaCWW+K3Wl+/l4xFuSwuJWaHrRIPJblUXspwvjlV7vShqPR3OftuhCs2ESiILMhDIgJtafpOeMsyeF7tlgQYBK+0sfwrHsqY+VDFQd34sFhIba+gTTD+e61EcbiFScyzlJxhXQQcHCcym7Ue+roO3jmEV9FPQFRq/qRKrCu4useYOqaRml4WY6RHZMEc8uBZA7xdVdqDaQftomM9dNnyjF7KPyC6x0Z2Nszc/YwWqiCNOSZ8c3chFywx/gPD/NupF6r2k9RjxPuRDXHC8El2m2z8mW/jxnrPo8O+DSnARq+KxZ2/d0/26H/gQk= 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)(396003)(366004)(136003)(346002)(39860400002)(376002)(451199018)(38100700002)(4326008)(36756003)(31696002)(66946007)(86362001)(2906002)(41300700001)(66556008)(66476007)(5660300002)(8676002)(6916009)(8936002)(6506007)(26005)(2616005)(186003)(6512007)(478600001)(316002)(54906003)(6486002)(31686004)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?DaDWCVJJlprOQhLEKe+Ga4XYxkkC?= =?utf-8?q?CQ9rV4uEg98WdvRfixSNQIDO49EDwpCyW5UhAcOFlX169W6HCBYkyBxyRKzg1aQS3?= =?utf-8?q?6agEzSjS92Zpr7QdduS2sl4n2un6SaHgBqzyPQDOyjdtnsZIH0DB0YT6ciFp7ZoYJ?= =?utf-8?q?ftG3B7k0PIwIrdnIOhNS8x4RkLcVRxzQRw1WO5Encb5On7VvywGV6JJ1Ij0u290+6?= =?utf-8?q?eJrK7GkWF36tnk0iEpdZiJDp5bvL9JDfrhNcQxD7hwcZJ7mzw02zUzuyQSd+Dz8Jt?= =?utf-8?q?jGDlAxVSjDnnZGsLWFQhzNkVvLoXaltm35EyAPMYYPfieDT0p0CigcabH9rpzliUz?= =?utf-8?q?Gpig9stxtIzOORnD8sQaoaHUigAhVEQl8Rvbu9mTow2KO/lXXGlTKtpft6fo1Shda?= =?utf-8?q?7Gd6pkiqEOLCkq+NnX4uMZ4vvjqQwNW4uUSiDs0ynXc1RdLtmFArqgjFROuT930lc?= =?utf-8?q?ZZqdBY7F8VUwKoLRvtdjO6lXmTe3Tg9+R47GF0vryFbbtgUb2T4BOEj7e2RWjbkvS?= =?utf-8?q?qgDKAMcLDbKUxJTyQAW6e5n5po/fcctK1DGyh5kXEuBZB/r1/+NMS6JUvKMQlXn/w?= =?utf-8?q?BHFb5eyLsNmcM51ENYYxPowXEXupXaYztEnYYdXw7GqC2SPYQ0aEomaYeGc8egtKW?= =?utf-8?q?+zlpooKgkhjO6LzT9ruXFLvJtbIZYlTCr5zPc576UnLaZlZpQUIEE4CPjpRWekxY+?= =?utf-8?q?0x/ozBNttEvNBQUCIURV81eths9EnMNpfz6ft7JClY5CkhqVK4iMH2OUUoBwQinWj?= =?utf-8?q?ZM5k8GwhVZEZWgaWSdb3MXElw6V/vXg/xLrZE4n+P2hYrxTsVoTloitc7w11dweoY?= =?utf-8?q?rqD5j7XKQ8UNuDb0+vUw13ON9RCCemeTC9ceLgNdalpLx0zyUb6d7qpz0Ke6RGwat?= =?utf-8?q?cNOvWmhHDtq44Y2MjxSxUOHtg8U3Ka4e0OMVc6BqlQhBrk9FDtnMilpEVfN72dHs1?= =?utf-8?q?5eUFUtiPJVPY5bcbK3KeH/Suds3in7++tcHeez+sMowR3Tol6EyQaCEND+keSU+qz?= =?utf-8?q?+GaRB1TeBKCtTnAzXWCpVs/gbtiIGTSAwvYmPxqvEbsYykbc31JVkqr4nhj8GV38j?= =?utf-8?q?DFTjaJW9aXKKCnbuZDU2U+VQMXHaLDkqUds77VjiBmQJ7Wh7NuYv+mmN40/PJolbo?= =?utf-8?q?6m5y1SCc9i2GJwH12LjjCZgwUOrnNVtGeoBX17E4IY9IFSXaxdF24K2yAqrc//Rpa?= =?utf-8?q?tiG7MzEaBRe/+PxcY+y5HlikiWBr8XnumfW5IBKAJ9EtgF/u7naq3rJOYq4Q4bLUT?= =?utf-8?q?XVh44brtKFXqVxZC0WBH9HXVfgSt+n45CxZOAMOd2j1NkBEnCt4pzyS69Vi+ZW992?= =?utf-8?q?AZo/t/q0Jkj5hAMruIVWnT+k6qOX7m4VK5G8GZSw5iNEHSGeH8LF8uvulnb2OxXa1?= =?utf-8?q?iu4o98eaxSVY1G+DEd0+J0/mnHKCYXooIyKEfot8sotSJLjAEd/TqilFgfebQVm0T?= =?utf-8?q?nJr4hscgY5WmcnjxBp4U01M52//5jX+G77Fpc5nSSPsSWvbe1v+42VZYNJrl4OcNW?= =?utf-8?q?95upRsGvsC9B?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e2a3bc5-9cee-4abe-8527-08db1be6f35e X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2023 12:58:14.3793 (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: I4+br9vpjZxv8JKAbdm++8Zy3qUfYJv30N/rv5Tqh8S+jUw6j9ciU+EcX5rSSlRhTsZsn9qSpsFZK4ADOYx+/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7725 X-Spam-Status: No, score=-3028.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 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-Patchwork-Original-From: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759351512667414834?= X-GMAIL-MSGID: =?utf-8?q?1759351512667414834?= This is benign for all existing insns, but is going to be needed for handling of .insn operands. The earlier use requires moving up the function, to avoid the need for a forward declaration. --- Split from subsequent patch just to keep the other one's size under control. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -8006,6 +8006,25 @@ finalize_imm (void) return 1; } +static INLINE void set_rex_vrex (const reg_entry *r, unsigned int rex_bit, + bool do_sse2avx) +{ + if (r->reg_flags & RegRex) + { + if (i.rex & rex_bit) + as_bad (_("same type of prefix used twice")); + i.rex |= rex_bit; + } + else if (do_sse2avx && (i.rex & rex_bit) && i.vex.register_specifier) + { + gas_assert (i.vex.register_specifier == r); + i.vex.register_specifier += 8; + } + + if (r->reg_flags & RegVRex) + i.vrex |= rex_bit; +} + static int process_operands (void) { @@ -8230,8 +8249,7 @@ process_operands (void) r = i.op[1].regs; /* Register goes in low 3 bits of opcode. */ i.tm.base_opcode |= r->reg_num; - if ((r->reg_flags & RegRex) != 0) - i.rex |= REX_B; + set_rex_vrex (r, REX_B, false); } if ((i.seg[0] || i.prefix[SEG_PREFIX]) @@ -8261,25 +8279,6 @@ process_operands (void) return 1; } -static INLINE void set_rex_vrex (const reg_entry *r, unsigned int rex_bit, - bool do_sse2avx) -{ - if (r->reg_flags & RegRex) - { - if (i.rex & rex_bit) - as_bad (_("same type of prefix used twice")); - i.rex |= rex_bit; - } - else if (do_sse2avx && (i.rex & rex_bit) && i.vex.register_specifier) - { - gas_assert (i.vex.register_specifier == r); - i.vex.register_specifier += 8; - } - - if (r->reg_flags & RegVRex) - i.vrex |= rex_bit; -} - static const reg_entry * build_modrm_byte (void) {