From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by sourceware.org (Postfix) with ESMTPS id 4187A3839C4C for ; Thu, 22 Jul 2021 13:44:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4187A3839C4C Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-16-4Hs6mmVUNcOaCYfSRUtGUA-1; Thu, 22 Jul 2021 15:44:08 +0200 X-MC-Unique: 4Hs6mmVUNcOaCYfSRUtGUA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T2ZTBNae7BJeNgwmcbMhIwGmW8W8JEPNeu+M9j61VQo1RyxgcHfYgGi+zzqcUgWn1Bu4V6dX3KXG3+FJ0PYhbm2hujqRuadccbi/lugiLJZvhJzDxYWHa1wnCsbw3ZMd5m/m5D1aBKeqOYGezTDKBzBxQYOtlIfAfQHgu8dDO2oZ6bS+SWb7/QPrHubwtfP91CplWfNBbG0Limu+vnKINuzj1i5m+UmHoMVz2AUSGAyh5JwpZNkunFHmkWOJMKMHamEQp512Y8Zb9SsJIxkjAiE65h3aZnwFP3KR6tKZg4Y/yBEgABNb7iGOEcjV8Qv79BGJHeXXTKxyz4bvY3DVtg== 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-SenderADCheck; bh=AjtKnhUpgYTvqAT7EuB396DIBvO8eqx+/G/kLQT7pDo=; b=YDkK5XFQuSDc2pwC3EVJydCmyv1Wagm9bAqVSwB+AXJ02E9spTLbj7/uOyy7Kq5GcXizbn+7U28RLL0JseKtCy724Zq/KYhlBQGpz1k1mc2bRMObNPaMvyuP0zMM3pcfLIcR57atyewBUbUHwqF4tNSaXQpYZAy0/P18cpQKyfP3UHtzBKVUeNHMjKF+DWjggC+JZ5C/+9A8oQCZ7GmEGIpMqFYcKSiTaESWrmQ4CYzOT31XKRMlwE1AoYPhs+Xj7Zl15QmQlr9Fq69xxBQUXRL6rV3hjCDsTNBzHrz01CbegpfPeyArWPxogtDXMhQUYq3YMC+L1D7Ygjk+Yf/0RQ== 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 VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB3296.eurprd04.prod.outlook.com (2603:10a6:802:7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.26; Thu, 22 Jul 2021 13:44:07 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea%5]) with mapi id 15.20.4352.025; Thu, 22 Jul 2021 13:44:07 +0000 To: Binutils From: Jan Beulich Subject: [PATCH] x86: express unduly set rounding control bits in disassembly Message-ID: <519eb2ae-1243-fe8d-1f4f-1bdf75a8e374@suse.com> Date: Thu, 22 Jul 2021 15:44:02 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [10.156.60.236] (37.24.206.209) by FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.7 via Frontend Transport; Thu, 22 Jul 2021 13:44:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4dfac48-a2c9-4f25-5fec-08d94d16c70e X-MS-TrafficTypeDiagnostic: VI1PR04MB3296: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:239; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zIUWj3KHiB+DzDpWXNoS13v4WobE16W/T8rumFoqw32Q9ZdKV3wFiJAdwFyxL4Qm6SF7jxICrBlwgTvb9s9MtaNvYQaxSpfzejLvw5D3ZeQHs6wLBpLg92YzM00V8qh64/YPKWmI+zXUA8D+l9jaYCrRCzvWVDnKGJAvYp3siK3vxTB9PcKTcdQTEZTjlZboIrXm9mZxWfmO3+olocBd/OUyqf90iZebWJxjJj77sgjDf2XUFJ1KscnS1Ni16NGIDa+YSr60NI/qKWvAX8aqlMocETSEF7UDoHBPxwiOx9yVuTjXsEnwudX/N5JOC1GCh6+DWwcxJsSzpFHavKMPyhznDugniZ1UiHhDzf7Nyk8gHyW2r69xVGqRSgPHNVEHfgfSleXfn1YlKk6MBd5aJa9YaXCMCqlLZK3alJe3qnHPz6c29y68I0dx+mk8lnjsLCtz2ufqG8XyFUP7gQSpYoeJ13rqYZyY7JiBzdoUwiuP+ULjPP4zqfQfS+dN0pHJPfUB5Xzunn029ryoD6evvSJOmKLGLe+pKU8RnAgsbHw1M4kFnI+S980/bkpwnnKWEnj1CyDPUZbd9HrCmwBYhVwq8Zqf3DDzXs7rUM3FoAeoZ5LY/sCY4q9qNfO3or385VmSQ75dn2obquTbaIshWcm7RjjSiv+DxUHNdDz+X6ECCTi47wln/m0hPuUhTOO/QvXa9jGRKzLs1KBjl1oTe89qBqJIduuqPTsNAXFrZWQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5600.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(346002)(136003)(376002)(366004)(39850400004)(2906002)(31686004)(36756003)(316002)(4326008)(26005)(6666004)(6916009)(86362001)(6486002)(83380400001)(66476007)(186003)(2616005)(956004)(66556008)(38100700002)(66946007)(478600001)(8936002)(5660300002)(16576012)(8676002)(31696002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eEFMNHVEdThLQ1g1aG1DdzNzSVVaK2pwVDRGSHNCYm4yU3lWbW00UlFVQ3lF?= =?utf-8?B?eXVma1g2Z0FJTzI5NXBOallSSWVUeDVzNlVQY2lsb25kNS85d2dNZ0hUVUVH?= =?utf-8?B?OUZzMmJJSTFXemlFdTgrcWt5R3JRQjJHVERYZ0llenNtdy9EekhHQy9pVjFD?= =?utf-8?B?U0VLUEdrVmp3Z00xbHZLajUxcnM3RWsvcWxNc3NCYUJKKzdGNjh1OUE0M05Q?= =?utf-8?B?VUVtQ3p3YTBmU1Y1OFZnNDV6bEZBZlVtZnJXSXJYRklWdzcvS1hDRW5XMVZq?= =?utf-8?B?MmdzenJUNS96WS9TV2YwRFFZQVFwQXVZUElnWlNYRGQwTVFGK0JwYk5TeWNQ?= =?utf-8?B?cURrd2RrOHZST0Z6dE1HenV5M1JSbUV3c2JVMlJXcVBJOUpUTndGZkVUWXky?= =?utf-8?B?NDc5TGtueG1PMlRwUHoxYnpnME10SERIVklvY0laVXNGcGJRbFB3cW9Qc0pj?= =?utf-8?B?blV6RVNBWmZ2KzJhc1NYZFZ4Y0k1elZRV2xMbWJuSmkxN3krU2lDL2lkSTdr?= =?utf-8?B?aVZQTkNkRG5nbE5HN08wWWFOKzlyaTVyek5SajVKcWp2SnU0bndCVXJIRkpV?= =?utf-8?B?SWd6MkgrZEtlcldwa1NUenVpQ090VEd2NlkwOUlJVmhibjJZUmJ2S2xxalZn?= =?utf-8?B?bVg3UXdJNWs1ZXpRMk1sY3ZBMVk4cHQ5UW9yUjExVXg4am0rYW0rbjQrdzdt?= =?utf-8?B?eGNYVWFlNlQ0S0lxYlRoS2ZNZS9teTFFOGh0Sk5mV2JNS29pKzRCSnB6UHR3?= =?utf-8?B?U25kd3plYXBuT0t1ajRmSncwMWtMMWRxUnJncFRGYVExdncwR09MeFk1S3BN?= =?utf-8?B?TU92ZzY1Z2FxWjJHc3RqR3FNMGs4ZWNNa29XOXpKSDQzRkpBVlZ3aStRRkUz?= =?utf-8?B?MG5ZQ0J1VFp2bWJPTmVXOTBhZHFRRmw5eEV4ZDFnRmp0ZEdoWkUvTVRVbFlM?= =?utf-8?B?QVoyT1pyRDhpOWtPa2RhOFh1WUo1dEhURDhXZUdodWFCZ21QdVlsazAyYW1a?= =?utf-8?B?RXFlWGxiNHZOVUxJRm95Q1cwRU9GSTc1RnYrVWZJNjRNblFXZ1E3Sk9odmx6?= =?utf-8?B?RjgxeXdSSmhCS1VPZXBxdWtqdkYwUDM4Z1RaOTE4RTR5NHJHMS96SDl5V0Ns?= =?utf-8?B?TTFOSEI1SFNzTWNzbUtFVjFRYmJvT1VmYnRLMzZWTEJRZTZEOENVM2d0SWRh?= =?utf-8?B?bXFjN2dNOHE0TXoyMFNkcFU3TTA4bEJIaTNGRk8yZmJ3VzlvcGNQUGg2b2cy?= =?utf-8?B?MFpKVlU2OURUYUt0SXVaQTlIVkhiTEFNamJNOC9aS0NpaWVjeDZQK1RQN0JL?= =?utf-8?B?SmFYemkvekdnWmpNSS9MNCtjQjFnRXgzckk4LzdUQ0N3cWp0MWNCWHFvNGZE?= =?utf-8?B?T3NOZ3FsREtrS3FoMmVkS2ZVbmJQOGtGc3J3aFVqT0ZwbnQ0ZFFMOXQrSXlY?= =?utf-8?B?czYxUWhNZWo5dlZGNXkzWVNhL0hDbHlvclVjK25JZFZ4MFlWM1Nqc0hLamN6?= =?utf-8?B?aG9wbHhTaWd4NGFseGZNRzZUVjlzREdVV3hrR1lrZDZpaW5Yb3QrVTAzaXpM?= =?utf-8?B?amZsU0IrL3gzUmNLa21ibFhpZkVSTGN3SjVDK1V3U1hITkVWRHE1WTRMcHkw?= =?utf-8?B?QTlKbUk5eUQwTEl2YTNydFhsMXliUkljV2FTU1htMWtzNE80TWN6V0tJZUUx?= =?utf-8?B?YU14ODBlR3RaVzdCV0RqTkt0VG0zc2JOQ2MxNjF1a2dxTzAxV2N3Q3U5ZUhY?= =?utf-8?Q?IRtjC7+3pfOaeCDSmaqV3WqUprY4okC1nvpz3Nu?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4dfac48-a2c9-4f25-5fec-08d94d16c70e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2021 13:44:07.4872 (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: E8KBI1iLt41u4Hsj+TaZsx0HjiPeW9GBHAKzCcqAuJ84bbvvq4VfJ/PlYd7Gdz1YLQbIl90jlmnItxU84wU0ng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3296 X-Spam-Status: No, score=-3031.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Thu, 22 Jul 2021 13:44:13 -0000 While EVEX.L'L are indeed ignored when EVEX.b stands for just SAE, EVEX.b itself is not ignored when an insn permits neither rounding control nor SAE. While changing this aspect of EVEX.b handling, also alter unduly set embedded broadcast: Don't call BadOp(), screwing up subsequent disassembly, but emit "{bad}" instead. --- a/gas/testsuite/gas/i386/avx512f-nondef.d +++ b/gas/testsuite/gas/i386/avx512f-nondef.d @@ -10,12 +10,11 @@ Disassembly of section .text: 0+ <.text>: [ ]*[a-f0-9]+: 62 f3 d5 1f 0b f4 7b vrndscalesd \$0x7b,\{sae\},%xmm4,%xmm5,%xmm6\{%k7\} [ ]*[a-f0-9]+: 62 f3 d5 5f 0b f4 7b vrndscalesd \$0x7b,\{sae\},%xmm4,%xmm5,%xmm6\{%k7\} -[ ]*[a-f0-9]+: 62 f2 55 1f 3b f4 vpminud %zmm4,%zmm5,%zmm6\{%k7\} -[ ]*[a-f0-9]+: 62 c2 55 1f 3b f4 vpminud %zmm4,%zmm5,%zmm6\{%k7\} +[ ]*[a-f0-9]+: 62 f2 55 4f 3b f4 vpminud %zmm4,%zmm5,%zmm6\{%k7\} +[ ]*[a-f0-9]+: 62 c2 55 4f 3b f4 vpminud %zmm4,%zmm5,%zmm6\{%k7\} +[ ]*[a-f0-9]+: 62 f2 55 1f 3b f4 vpminud \{rn-bad\},%zmm4,%zmm5,%zmm6\{%k7\} [ ]*[a-f0-9]+: 62 f2 7e 48 31 72 7f vpmovdb %zmm6,0x7f0\(%edx\) -[ ]*[a-f0-9]+: 62 vpmovdb %zmm6,\(bad\) -[ ]*[a-f0-9]+: f2 7e 58 bnd jle (0x7d|7d <.text\+0x7d>) -[ ]*[a-f0-9]+: 31 72 7f xor %esi,0x7f\(%edx\) +[ ]*[a-f0-9]+: 62 f2 7e 58 31 72 7f vpmovdb %zmm6,0x7f0\(%edx\)\{bad\} [ ]*[a-f0-9]+: 62 f1 7c 88 58 \(bad\) [ ]*[a-f0-9]+: c3 ret * [ ]*[a-f0-9]+: 62 f2 7d 4f 92 01 vgatherdps \(bad\),%zmm0\{%k7\} --- a/gas/testsuite/gas/i386/avx512f-nondef.s +++ b/gas/testsuite/gas/i386/avx512f-nondef.s @@ -5,13 +5,15 @@ .byte 0x62, 0xf3, 0xd5, 0x1f, 0x0b, 0xf4, 0x7b # vrndscalesd {sae}, $123, %xmm4, %xmm5, %xmm6{%k7} # with not-null RC .byte 0x62, 0xf3, 0xd5, 0x5f, 0x0b, 0xf4, 0x7b -# vpminud %zmm4, %zmm5, %zmm6{%k7} # with 111 REX +# vpminud %zmm4, %zmm5, %zmm6{%k7} # with 11 EVEX.{B,R'} +.byte 0x62, 0xf2, 0x55, 0x4f, 0x3b, 0xf4 +# vpminud %zmm4, %zmm5, %zmm6{%k7} # with not-11 EVEX.{B,R'} +.byte 0x62, 0xc2, 0x55, 0x4f, 0x3b, 0xf4 +# vpminud %zmm4, %zmm5, %zmm6{%k7} # with set EVEX.b bit .byte 0x62, 0xf2, 0x55, 0x1f, 0x3b, 0xf4 -# vpminud %zmm4, %zmm5, %zmm6{%k7} # with not-111 REX -.byte 0x62, 0xc2, 0x55, 0x1f, 0x3b, 0xf4 -# vpmovdb %zmm6, 2032(%rdx) # with unset EVEX.B bit +# vpmovdb %zmm6, 2032(%rdx) # with unset EVEX.b bit .byte 0x62, 0xf2, 0x7e, 0x48, 0x31, 0x72, 0x7f -# vpmovdb %zmm6, 2032(%rdx) # with set EVEX.B bit - we should get (bad) operand +# vpmovdb %zmm6, 2032(%rdx) # with set EVEX.b bit - we should get (bad) operand .byte 0x62, 0xf2, 0x7e, 0x58, 0x31, 0x72, 0x7f # vaddps xmm0, xmm0, xmm3 # with EVEX.z set .byte 0x62, 0xf1, 0x7c, 0x88, 0x58, 0xc3 --- a/gas/testsuite/gas/i386/evex.d +++ b/gas/testsuite/gas/i386/evex.d @@ -8,14 +8,14 @@ Disassembly of section .text: 0+ <_start>: +[a-f0-9]+: 62 f1 d6 38 2a f0 vcvtsi2ssl %eax,\{rd-sae\},%xmm5,%xmm6 - +[a-f0-9]+: 62 f1 57 38 2a f0 vcvtsi2sdl %eax,\(bad\),%xmm5,%xmm6 - +[a-f0-9]+: 62 f1 d7 38 2a f0 vcvtsi2sdl %eax,\(bad\),%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 2a f0 vcvtsi2sdl %eax,\{rd-bad\},%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 d7 38 2a f0 vcvtsi2sdl %eax,\{rd-bad\},%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d6 08 7b f0 vcvtusi2ssl %eax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 57 08 7b f0 vcvtusi2sdl %eax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d7 08 7b f0 vcvtusi2sdl %eax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d6 38 7b f0 vcvtusi2ssl %eax,\{rd-sae\},%xmm5,%xmm6 - +[a-f0-9]+: 62 f1 57 38 7b f0 vcvtusi2sdl %eax,\(bad\),%xmm5,%xmm6 - +[a-f0-9]+: 62 f1 d7 38 7b f0 vcvtusi2sdl %eax,\(bad\),%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 7b f0 vcvtusi2sdl %eax,\{rd-bad\},%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 d7 38 7b f0 vcvtusi2sdl %eax,\{rd-bad\},%xmm5,%xmm6 +[a-f0-9]+: 62 e1 7e 08 2d c0 vcvtss2si %xmm0,%eax +[a-f0-9]+: 62 e1 7c 08 c2 c0 00 vcmpeqps %xmm0,%xmm0,%k0 #pass --- a/gas/testsuite/gas/i386/x86-64-avx512f-nondef.d +++ b/gas/testsuite/gas/i386/x86-64-avx512f-nondef.d @@ -10,10 +10,9 @@ Disassembly of section .text: 0+ <.text>: [ ]*[a-f0-9]+: 62 f3 d5 1f 0b f4 7b vrndscalesd \$0x7b,\{sae\},%xmm4,%xmm5,%xmm6\{%k7\} [ ]*[a-f0-9]+: 62 f3 d5 5f 0b f4 7b vrndscalesd \$0x7b,\{sae\},%xmm4,%xmm5,%xmm6\{%k7\} -[ ]*[a-f0-9]+: 62 f2 55 1f 3b f4 vpminud %zmm4,%zmm5,%zmm6\{%k7\} -[ ]*[a-f0-9]+: 62 c2 55 1f 3b f4 vpminud %zmm12,%zmm5,%zmm22\{%k7\} +[ ]*[a-f0-9]+: 62 f2 55 4f 3b f4 vpminud %zmm4,%zmm5,%zmm6\{%k7\} +[ ]*[a-f0-9]+: 62 c2 55 4f 3b f4 vpminud %zmm12,%zmm5,%zmm22\{%k7\} +[ ]*[a-f0-9]+: 62 f2 55 1f 3b f4 vpminud \{rn-bad\},%zmm4,%zmm5,%zmm6\{%k7\} [ ]*[a-f0-9]+: 62 f2 7e 48 31 72 7f vpmovdb %zmm6,0x7f0\(%rdx\) -[ ]*[a-f0-9]+: 62 vpmovdb %zmm6,\(bad\) -[ ]*[a-f0-9]+: f2 7e 58 bnd jle (0x7d|7d <.text\+0x7d>) -[ ]*[a-f0-9]+: 31 72 7f xor %esi,0x7f\(%rdx\) +[ ]*[a-f0-9]+: 62 f2 7e 58 31 72 7f vpmovdb %zmm6,0x7f0\(%rdx\)\{bad\} #pass --- a/gas/testsuite/gas/i386/x86-64-avx512f-nondef.s +++ b/gas/testsuite/gas/i386/x86-64-avx512f-nondef.s @@ -5,11 +5,13 @@ .byte 0x62, 0xf3, 0xd5, 0x1f, 0x0b, 0xf4, 0x7b # vrndscalesd {sae}, $123, %xmm4, %xmm5, %xmm6{%k7} # with not-null RC .byte 0x62, 0xf3, 0xd5, 0x5f, 0x0b, 0xf4, 0x7b -# vpminud %zmm4, %zmm5, %zmm6{%k7} # with 111 REX +# vpminud %zmm4, %zmm5, %zmm6{%k7} # with 11 EVEX.{B,R'} +.byte 0x62, 0xf2, 0x55, 0x4f, 0x3b, 0xf4 +# vpminud %zmm4, %zmm5, %zmm6{%k7} # with not-11 EVEX.{B,R'} +.byte 0x62, 0xc2, 0x55, 0x4f, 0x3b, 0xf4 +# vpminud %zmm4, %zmm5, %zmm6{%k7} # with set EVEX.b bit .byte 0x62, 0xf2, 0x55, 0x1f, 0x3b, 0xf4 -# vpminud %zmm4, %zmm5, %zmm6{%k7} # with not-111 REX -.byte 0x62, 0xc2, 0x55, 0x1f, 0x3b, 0xf4 -# vpmovdb %zmm6, 2032(%rdx) # with unset EVEX.B bit +# vpmovdb %zmm6, 2032(%rdx) # with unset EVEX.b bit .byte 0x62, 0xf2, 0x7e, 0x48, 0x31, 0x72, 0x7f -# vpmovdb %zmm6, 2032(%rdx) # with set EVEX.B bit - we should get (bad) operand +# vpmovdb %zmm6, 2032(%rdx) # with set EVEX.b bit - we should get (bad) operand .byte 0x62, 0xf2, 0x7e, 0x58, 0x31, 0x72, 0x7f --- a/gas/testsuite/gas/i386/x86-64-evex.d +++ b/gas/testsuite/gas/i386/x86-64-evex.d @@ -9,13 +9,13 @@ Disassembly of section .text: 0+ <_start>: +[a-f0-9]+: 62 f1 d6 38 2a f0 vcvtsi2ss %rax,\{rd-sae\},%xmm5,%xmm6 - +[a-f0-9]+: 62 f1 57 38 2a f0 vcvtsi2sd %eax,\(bad\),%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 2a f0 vcvtsi2sd %eax,\{rd-bad\},%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d7 38 2a f0 vcvtsi2sd %rax,\{rd-sae\},%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d6 08 7b f0 vcvtusi2ss %rax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 57 08 7b f0 vcvtusi2sd %eax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d7 08 7b f0 vcvtusi2sd %rax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d6 38 7b f0 vcvtusi2ss %rax,\{rd-sae\},%xmm5,%xmm6 - +[a-f0-9]+: 62 f1 57 38 7b f0 vcvtusi2sd %eax,\(bad\),%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 7b f0 vcvtusi2sd %eax,\{rd-bad\},%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d7 38 7b f0 vcvtusi2sd %rax,\{rd-sae\},%xmm5,%xmm6 +[a-f0-9]+: 62 e1 7e 08 2d c0 vcvtss2si %xmm0,\(bad\) +[a-f0-9]+: 62 e1 7c 08 c2 c0 00 vcmpeqps %xmm0,%xmm0,\(bad\) --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -159,6 +159,11 @@ static int rex_used; current instruction. */ static int used_prefixes; +/* Flags for EVEX bits which we somehow handled when printing the + current instruction. */ +#define EVEX_b_used 1 +static int evex_used; + /* Flags stored in PREFIXES. */ #define PREFIX_REPZ 1 #define PREFIX_REPNZ 2 @@ -2524,12 +2529,12 @@ static const char *att_names_mask[] = { "%k0", "%k1", "%k2", "%k3", "%k4", "%k5", "%k6", "%k7" }; -static const char *names_rounding[] = +static const char *const names_rounding[] = { - "{rn-sae}", - "{rd-sae}", - "{ru-sae}", - "{rz-sae}" + "{rn-", + "{rd-", + "{ru-", + "{rz-" }; static const struct dis386 reg_table[][8] = { @@ -8578,6 +8583,7 @@ ckprefix (void) prefixes = 0; used_prefixes = 0; rex_used = 0; + evex_used = 0; last_lock_prefix = -1; last_repz_prefix = -1; last_repnz_prefix = -1; @@ -9661,6 +9667,21 @@ print_insn (bfd_vma pc, disassemble_info oappend ("/(bad)"); } } + + /* Check whether rounding control was enabled for an insn not + supporting it. */ + if (modrm.mod == 3 && vex.b && !(evex_used & EVEX_b_used)) + { + for (i = 0; i < MAX_OPERANDS; ++i) + { + obufp = op_out[i]; + if (*obufp) + continue; + oappend (names_rounding[vex.ll]); + oappend ("bad}"); + break; + } + } } } @@ -11316,14 +11337,6 @@ OP_E_memory (int bytemode, int sizeflag) if (vex.evex) { - /* In EVEX, if operand doesn't allow broadcast, vex.b should be 0. */ - if (vex.b - && bytemode != x_mode - && bytemode != evex_half_bcst_xmmq_mode) - { - BadOp (); - return; - } switch (bytemode) { case dw_mode: @@ -11764,10 +11777,9 @@ OP_E_memory (int bytemode, int sizeflag) oappend (scratchbuf); } } - if (vex.b - && (bytemode == x_mode - || bytemode == evex_half_bcst_xmmq_mode)) + if (vex.b) { + evex_used |= EVEX_b_used; if (vex.w || bytemode == evex_half_bcst_xmmq_mode) { @@ -11786,7 +11798,7 @@ OP_E_memory (int bytemode, int sizeflag) abort (); } } - else + else if (bytemode == x_mode) { switch (vex.length) { @@ -11803,6 +11815,9 @@ OP_E_memory (int bytemode, int sizeflag) abort (); } } + else + /* If operand doesn't allow broadcast, vex.b should be 0. */ + oappend ("{bad}"); } } @@ -13495,24 +13510,25 @@ MOVSXD_Fixup (int bytemode, int sizeflag static void OP_Rounding (int bytemode, int sizeflag ATTRIBUTE_UNUSED) { - if (modrm.mod == 3 && vex.b) - switch (bytemode) - { - case evex_rounding_64_mode: - if (address_mode != mode_64bit || !vex.w) - { - oappend ("(bad)"); - break; - } - /* Fall through. */ - case evex_rounding_mode: - oappend (names_rounding[vex.ll]); - break; - case evex_sae_mode: - oappend ("{sae}"); - break; - default: - abort (); - break; - } + if (modrm.mod != 3 || !vex.b) + return; + + switch (bytemode) + { + case evex_rounding_64_mode: + if (address_mode != mode_64bit || !vex.w) + return; + /* Fall through. */ + case evex_rounding_mode: + evex_used |= EVEX_b_used; + oappend (names_rounding[vex.ll]); + break; + case evex_sae_mode: + evex_used |= EVEX_b_used; + oappend ("{"); + break; + default: + abort (); + } + oappend ("sae}"); }