From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2049.outbound.protection.outlook.com [40.107.8.49]) by sourceware.org (Postfix) with ESMTPS id D72523858296 for ; Fri, 10 Mar 2023 10:19:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D72523858296 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=Mt2T/L45iU+WD6cMQHhMM6lIqAuTtSgGz8a83Wwm90npu2FffuqnUfq6OKIqACQMpZvioPQAxiGPUOlS5kHLJ6msRtcxXxrZP2x3QlK6IAXFsS4hiuriAsJ7a4TeobILZ2RP+mfPA+rThrM49bJT2fTe/G2jXyGKOJn5Rg77oUqkK3xA/YFRqhtzpDTWrCSb1pqXMcTZHi2gfD9W/7N5nUzWqStDZenHtqidOektzLarCDslcnamOEZN3/5BcBQJ3UxcEeYnm3afeFXNu91T8uSkWyYiXru7t3Um8ETo1GlXnxklsffVhZK+yR43VisAuPiCdr1YgJKm/hQDNLtZsw== 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=AQrE54d80o+ktge0VRbtWG/fK9romdcaT1bfeROoOFo=; b=BgilLlUqgOjEg0Y+/VKlRhzp+MdAfK6RM7BXWlVRgZvZenaRXgG9PCEMAVv0p5ch/KzS1Nv1GJKT1WKr8ZjKTewkcDcNx8U/wqAtJ4leqqVSXWzOys5pzSHVoH1Xz+G16tXQDiFjosC8nXAe9xVH44yl3xY1ZEJ2lVxNX39MEVGUc+zdK/Ay3lMsQXwDWLWBflwgj5vb9z95y/h/Hfgny+pIMnM3/j4bWl7KmfR+OEtqyemOHdJ5BJ82TU7ZVbjsXMZJeIgJCxfMyy9H7WxrmCJpM1pPDq/96mWGxkKUT2H+JQIh0yRCPk14GdbsXxccAlnKiMeStCNXzOLcSd/LhA== 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=AQrE54d80o+ktge0VRbtWG/fK9romdcaT1bfeROoOFo=; b=nx0saiwVtkDAZ/IaCB5oKMlyvs+zr/38jY5qtcXGj333J/5AmJ2QGi5gPGDC0tRnfx9MwcSikFmlmTBXohmfryMrSTJJwzHQsLOFbMB2PCbWiQBmZm9iHnSH7h4IttfKMcWEVXgZeCK+2sm1FSunO5C8UbmczcLtrzgQPHyjrqrz5FMQFuRp1DiCGCYGnyPaF0sm/IRgKXJvhFqWErfoVkMW6U+8ZXzZc4hV5ISEcBerLT80RXcik1DSk6AoLmtFztbrfLShKWdiOlwNqjD/7f7ohnPhKmrdSisiXvdSQTSHpCGu2/MOyj5BxC6uONZ3kq02ItCIfCBOeR+AUmFfNg== 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 DB9PR04MB9819.eurprd04.prod.outlook.com (2603:10a6:10:4c0::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.19; Fri, 10 Mar 2023 10:19:52 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%5]) with mapi id 15.20.6178.019; Fri, 10 Mar 2023 10:19:52 +0000 Message-ID: <8df023f9-58a5-dca7-badd-f3354ed18442@suse.com> Date: Fri, 10 Mar 2023 11:19:50 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH v2 02/14] x86: parse VEX and alike specifiers for .insn Content-Language: en-US To: Binutils Cc: "H.J. Lu" , "Jiang, Haochen" References: From: Jan Beulich In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::6) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|DB9PR04MB9819:EE_ X-MS-Office365-Filtering-Correlation-Id: 700ae67c-cd13-49db-6f36-08db2150fcc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zFxq74lonEzFukbiOTeiQ2jOVz8xPqu09or4DJEAgCROCsOMqi84nS0lqhDbKMBvOHVvcu+IuP/pPzLDKmdx7YDuxmXr3RZhoosOtivlWkD69N1iNagmk2OVJy78qUjQcoGrccLkRVu7biohhtsdIGLORz1N+t7K+v0OucfPQEpzaJVnQ8lXP2EkZrMKTr+tJUUE8WOXyXHMSq8bI2rur+GengCSb55NtYBBDzAQ5QJKUJSm23fG3Bm2D/W6LoS92+n+75LaLMKnBzmF7q4KcHRb6HjErii6mjvNygI+92pTvQkDHsztu1BU1JqL1HWqb0Fc/Cz/+DLl5oBVQFZE8S1icd5lh1uj8oAg89tk77ruJtkzCS58/fPdI61KBqhEfHlEcb1W8aNcH+ncgcR7Xora8uUGyFo9xQWwluWbvtxZ+hl23tqtpC5cUAr0GrDxsiHAfIfJyhja+vLHCND0LoeCAlfrTxFTGrUGk3qHmlhHEMPVJibHsMLoYnyF0w6xJxoYhk3O0HFOQv6jmRhPiBTuXwUPKBcSatb2z38DYkzis5NfQzgzd17u0TuJbfsuSBdxi8ur2S7UJxT5vaov8/aStWrLuitYwpzlD3jDDGwxfnDAx3sOIoZtht1a6iN92aMnpxAzUPaKCKMBrVonLh2jNCF+OtcToJ9xuUsnJIoyBlnUKjtp6hXqX9gYtZbC9OuuXZZySRUDeGJKlguU7umIrzwwyEJP2VBOabyJ4NXPhJtE29iJTWc09YRWlCYa 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)(39860400002)(136003)(346002)(376002)(366004)(451199018)(36756003)(5660300002)(83380400001)(26005)(186003)(6486002)(6506007)(6512007)(2616005)(66946007)(478600001)(316002)(4326008)(6916009)(8676002)(66556008)(8936002)(41300700001)(31696002)(86362001)(66476007)(54906003)(38100700002)(2906002)(31686004)(142923001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WllyTmdGNkJJVWhJb1hrYS9MTUYrNktEcmY5TkkwcC9zOXp2OW1Gcnhuc0pE?= =?utf-8?B?VEp0MW5TbXpxSERVWWRPeUZGcC83L2ozdUJ6R05lTkJiR25jRjJsaDduOWRC?= =?utf-8?B?YTMvMmREUElwZWtkNnpSWnpNUzF3MXlZL3YyMmdET1RSMFgxTWpIcXNhZmYr?= =?utf-8?B?WWM2LzRWbkIvV0J6MG1MNDV4UU03ZC8yc09xUnYwbVZ2N3BOTGNQR2xSTzYw?= =?utf-8?B?TFhMVmU0N2htNGF5UDhLWnpKQVZXMVJqQndWUFphYnpld2tuUWpmZ0ZGSEtY?= =?utf-8?B?MlFZTDdZRXVsNjJnc2U4bGsra0tscDF5SW85Z0VsVi8xai9DV0NVd1crRjd2?= =?utf-8?B?ekt6ZmYzR1VtbUZzcUtxSWRaQ0g0d01sNmkxTFFjaFRZaGQ5eUlGaVM4aEI3?= =?utf-8?B?TTNIZURGOUhwL3lMRDhGUXVpbVkweDlyZkxjZVlkcDhyY0FaRmtOUVBodUZS?= =?utf-8?B?aXNkM3llMmtyZUlZNkdnU3dKVGQvcGVFeGtuUEdMUnpnM1EwanhreGNLdDR4?= =?utf-8?B?ckFEMjhrdC80ZjZRWDJnUElSZ3RoN3EwdzBrdE9OYm9qZG1OWWhDZWtLQWU0?= =?utf-8?B?WU8xNXZ3TmZkc2RGT3RpU2JMb3ZoeWdzbGM3amRHcFdrL0srSlc2eTFMSVN1?= =?utf-8?B?V2g3TG94Nmgxa0dXSDBtdlIxdW8rNm0zV3hsMTIrS0F4V3h2VTdpY3I5NU94?= =?utf-8?B?bCt5eFF2aHcxaHdRUm1ubWZHNWZmT3pyZk5oZ1p1czd5cmdXMEVOQWhpTlp6?= =?utf-8?B?OThLRVZLQ292WktlT3hMZ1dISXFrY1NSdnRXT0duVkpzeVpRR1UrdlVFMWUy?= =?utf-8?B?NXRTYTB4YnF4WmZVTGNHaVhucEdma3RJOWR5R2JZb3ZadU5GMEVyQTVreDNk?= =?utf-8?B?KytTeEUwOG9lWFU3NTVOZmM5dWNCSlVKVDdEUGo0eUNkYjQ3Ym5BRzRrOFUr?= =?utf-8?B?ZmJMaUlPMUFaQ1MwWGFUWVBLMWhKYWtEUmU0MjN4RXVNaGFnV0FCV3p3RklC?= =?utf-8?B?RlI2N2dwRk9IdndyT0U0MVJVVzBRb1c4bVJXZWo0VytqWXpQcHZUaUNDd2Q0?= =?utf-8?B?SVViTHJqeXpsRTJKNjJ2WmxmRVJFZFBhdFJNcVd2YUVTOTliaGlGL2l1VXkr?= =?utf-8?B?c1h2R0ZVUkY4WGdDaW5VckJqaGJiK2dlTmZ2K21PTk96Zk1hTnlpYldNT2lQ?= =?utf-8?B?YjBPY1ZKUlF6NURWK1YyN3dOU0NNdDhlY2hzOWk0ZXZ0dEdwY1F4d0pwcDVx?= =?utf-8?B?Q0V4ckhiNWFmVmdpbkhpSEdyMXZiUGN6Y1AzcmtlZ3QzdWRPc2R3eVRNd1Yy?= =?utf-8?B?Y0JWOTVhZ1JGenFLTHRoclpyK0VKUk5JVWdMd3NTRFNyUjlOOWZxRlFKSEt5?= =?utf-8?B?ZnZHemJEblBSb2dHbnd6YVBZWW50VUhkL254QS9LNHcvZWwvS0NNUTdSWmJz?= =?utf-8?B?MWZPT0hQODJjRmJrd0NzVjhYclg1NUZ1QzQwL1Zvb1Z2Z2swVHlobWVuNGhs?= =?utf-8?B?T2l3TENiS1FjYUZIQWlubWhCUFh6VkJBTERjV2lWaDZJU3dUYlpoa1RuZy9P?= =?utf-8?B?ZjU5ZytyR09UQzAyMGs3QlJubnJjai9NM05lZmJ3alJlWk0vQit1RzdCak4z?= =?utf-8?B?VjFDZzcyZHovd2NreGN6QTNOa3Q3TWVsREJwV1g4S3p0VmZ1N0J0TzFDTFJk?= =?utf-8?B?eHIvMjQzaWhIQVdlZ3Z3YWFnWmtCRGVTbFVidzhqZ0VqYlFnRmRkNUsvV3Qv?= =?utf-8?B?a2VOU3RzNmUwL245ZDVjYytHNEJBb3k4UUJTeGJBOFUzWEpVd1BvZ054OGRC?= =?utf-8?B?anlSV080RDlhWDN6amtQZUVOODlXZUhhRVZ0eEVTdTZlNGtpY3VZU1hWRjhL?= =?utf-8?B?Uzd1SUtXRFZvUkhnSlNCelNmRDNQTW1zVnREN1lMaTVKODJ5cnk5b1BKVkFO?= =?utf-8?B?Ukw0ZjFLeXRvU1RreS9NTmVrMWR0M1NKSnRzRGM5c2R2UkQwalZjemVuWGU3?= =?utf-8?B?K0xVVUJQeC9ZUFVQbWhuRlBxbVRIVlhIaWVjQ05TMVdML1l0ak5vWEZCcU9D?= =?utf-8?B?MGNNMnBmQ29GZ3A1TktSbWpnNnM3RFYzZEJucGR1emNiOGJUSEdsZ0JxNENo?= =?utf-8?Q?HzffXb3NNpzsGWjRc/wcpwpRi?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 700ae67c-cd13-49db-6f36-08db2150fcc4 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2023 10:19:52.6295 (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: 7l0moMB9k+hO1AJGCju37jaYMXo/K4VT3+GwrcbdZ8kT8TRYsMPqmYBIOJ+rk8sDN/U5wEWFcdAFdOEUDL9/xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9819 X-Spam-Status: No, score=-3028.2 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: All encoding spaces can be used this way; there's a certain risk that the bits presently reserved could be used for other purposes down the road, but people using .insn are expected to know what they're doing anyway. Plus this way there's at least _some_ way to have those bits set. For now this will only allow operand-less insns to be encoded this way. --- For now only numeric parts of the specifiers are handled in a case- insensitive manner. All other parts have to use upper case letters. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -307,6 +307,9 @@ struct _i386_insn unsigned int prefixes; unsigned char prefix[MAX_PREFIXES]; + /* .insn allows for reserved opcode spaces. */ + unsigned char insn_opcode_space; + /* Register is in low 3 bits of opcode. */ bool short_form; @@ -568,6 +571,9 @@ static expressionS im_expressions[MAX_IM /* Current operand we are working on. */ static int this_operand = -1; +/* Are we processing a .insn directive? */ +#define dot_insn() (i.tm.mnem_off == MN__insn) + /* We support four different modes. FLAG_CODE variable is used to distinguish these. */ @@ -3648,6 +3654,8 @@ build_vex_prefix (const insn_template *t vector_length = avxscalar; else if (i.tm.opcode_modifier.vex == VEX256) vector_length = 1; + else if (dot_insn () && i.tm.opcode_modifier.vex == VEX128) + vector_length = 0; else { unsigned int op; @@ -3715,7 +3723,9 @@ build_vex_prefix (const insn_template *t /* The high 3 bits of the second VEX byte are 1's compliment of RXB bits from REX. */ - i.vex.bytes[1] = (~i.rex & 0x7) << 5 | i.tm.opcode_space; + i.vex.bytes[1] = ((~i.rex & 7) << 5) + | (!dot_insn () ? i.tm.opcode_space + : i.insn_opcode_space); i.vex.bytes[2] = (w << 7 | register_specifier << 3 @@ -3851,7 +3861,9 @@ build_evex_prefix (void) bits from REX. */ gas_assert (i.tm.opcode_space >= SPACE_0F); gas_assert (i.tm.opcode_space <= SPACE_EVEXMAP6); - i.vex.bytes[1] = (~i.rex & 0x7) << 5 | i.tm.opcode_space; + i.vex.bytes[1] = ((~i.rex & 7) << 5) + | (!dot_insn () ? i.tm.opcode_space + : i.insn_opcode_space); /* The fifth bit of the second EVEX byte is 1's compliment of the REX_R bit in VREX. */ @@ -3968,6 +3980,13 @@ build_evex_prefix (void) case EVEX512: vec_length = 2 << 5; break; + case EVEX_L3: + if (dot_insn ()) + { + vec_length = 3 << 5; + break; + } + /* Fall through. */ default: abort (); break; @@ -10742,6 +10761,7 @@ s_insn (int dummy ATTRIBUTE_UNUSED) bad: *saved_ilp = saved_char; ignore_rest_of_line (); + i.tm.mnem_off = 0; return; } line += end - line; @@ -10764,6 +10784,9 @@ s_insn (int dummy ATTRIBUTE_UNUSED) && (*e == '.' || is_space_char (*e))) { xop = true; + /* Arrange for build_vex_prefix() to emit 0x8f. */ + i.tm.opcode_space = SPACE_XOP08; + i.insn_opcode_space = n; line = e; } } @@ -10787,6 +10810,188 @@ s_insn (int dummy ATTRIBUTE_UNUSED) if (line > end && *line == '.') { + /* Length specifier (VEX.L, XOP.L, EVEX.L'L). */ + switch (line[1]) + { + case 'L': + switch (line[2]) + { + case '0': + if (evex) + i.tm.opcode_modifier.evex = EVEX128; + else + i.tm.opcode_modifier.vex = VEX128; + break; + + case '1': + if (evex) + i.tm.opcode_modifier.evex = EVEX256; + else + i.tm.opcode_modifier.vex = VEX256; + break; + + case '2': + if (evex) + i.tm.opcode_modifier.evex = EVEX512; + break; + + case '3': + if (evex) + i.tm.opcode_modifier.evex = EVEX_L3; + break; + + case 'I': + if (line[3] == 'G') + { + if (evex) + i.tm.opcode_modifier.evex = EVEXLIG; + else + i.tm.opcode_modifier.vex = VEXScalar; /* LIG */ + ++line; + } + break; + } + + if (i.tm.opcode_modifier.vex || i.tm.opcode_modifier.evex) + line += 3; + break; + + case '1': + if (line[2] == '2' && line[3] == '8') + { + if (evex) + i.tm.opcode_modifier.evex = EVEX128; + else + i.tm.opcode_modifier.vex = VEX128; + line += 4; + } + break; + + case '2': + if (line[2] == '5' && line[3] == '6') + { + if (evex) + i.tm.opcode_modifier.evex = EVEX256; + else + i.tm.opcode_modifier.vex = VEX256; + line += 4; + } + break; + + case '5': + if (evex && line[2] == '1' && line[3] == '2') + { + i.tm.opcode_modifier.evex = EVEX512; + line += 4; + } + break; + } + } + + if (line > end && *line == '.') + { + /* embedded prefix (VEX.pp, XOP.pp, EVEX.pp). */ + switch (line[1]) + { + case 'N': + if (line[2] == 'P') + line += 3; + break; + + case '6': + if (line[2] == '6') + { + i.tm.opcode_modifier.opcodeprefix = PREFIX_0X66; + line += 3; + } + break; + + case 'F': case 'f': + if (line[2] == '3') + { + i.tm.opcode_modifier.opcodeprefix = PREFIX_0XF3; + line += 3; + } + else if (line[2] == '2') + { + i.tm.opcode_modifier.opcodeprefix = PREFIX_0XF2; + line += 3; + } + break; + } + } + + if (line > end && !xop && *line == '.') + { + /* Encoding space (VEX.mmmmm, EVEX.mmmm). */ + switch (line[1]) + { + case '0': + if (TOUPPER (line[2]) != 'F') + break; + if (line[3] == '.' || is_space_char (line[3])) + { + i.insn_opcode_space = SPACE_0F; + line += 3; + } + else if (line[3] == '3' + && (line[4] == '8' || TOUPPER (line[4]) == 'A') + && (line[5] == '.' || is_space_char (line[5]))) + { + i.insn_opcode_space = line[4] == '8' ? SPACE_0F38 : SPACE_0F3A; + line += 5; + } + break; + + case 'M': + if (ISDIGIT (line[2]) && line[2] != '0') + { + char *e; + unsigned long n = strtoul (line + 2, &e, 10); + + if (n <= (evex ? 15 : 31) + && (*e == '.' || is_space_char (*e))) + { + i.insn_opcode_space = n; + line = e; + } + } + break; + } + } + + if (line > end && *line == '.' && line[1] == 'W') + { + /* VEX.W, XOP.W, EVEX.W */ + switch (line[2]) + { + case '0': + i.tm.opcode_modifier.vexw = VEXW0; + break; + + case '1': + i.tm.opcode_modifier.vexw = VEXW1; + break; + + case 'I': + if (line[3] == 'G') + { + i.tm.opcode_modifier.vexw = VEXWIG; + ++line; + } + break; + } + + if (i.tm.opcode_modifier.vexw) + line += 3; + } + + if (line > end && *line && !is_space_char (*line)) + { + /* Improve diagnostic a little. */ + if (*line == '.' && line[1] && !is_space_char (line[1])) + ++line; + goto done; } input_line_pointer = line; @@ -10815,24 +11020,30 @@ s_insn (int dummy ATTRIBUTE_UNUSED) } /* Trim off encoding space. */ - if (j > 1 && !i.tm.opcode_space && (val >> ((j - 1) * 8)) == 0x0f) + if (j > 1 && !i.insn_opcode_space && (val >> ((j - 1) * 8)) == 0x0f) { uint8_t byte = val >> ((--j - 1) * 8); - i.tm.opcode_space = SPACE_0F; + i.insn_opcode_space = SPACE_0F; switch (byte & -(j > 1)) { case 0x38: - i.tm.opcode_space = SPACE_0F38; + i.insn_opcode_space = SPACE_0F38; --j; break; case 0x3a: - i.tm.opcode_space = SPACE_0F3A; + i.insn_opcode_space = SPACE_0F3A; --j; break; } + i.tm.opcode_space = i.insn_opcode_space; val &= ((uint64_t)1 << (j * 8)) - 1; } + if (!i.tm.opcode_space && (vex || evex)) + /* Arrange for build_vex_prefix() to properly emit 0xC4/0xC5. + Also avoid hitting abort() there or in build_evex_prefix(). */ + i.tm.opcode_space = i.insn_opcode_space == SPACE_0F ? SPACE_0F + : SPACE_0F38; if (j > 2) { @@ -10842,12 +11053,33 @@ s_insn (int dummy ATTRIBUTE_UNUSED) i.opcode_length = j; i.tm.base_opcode = val; + if (vex || xop) + { + if (!i.tm.opcode_modifier.vex) + i.tm.opcode_modifier.vex = VEXScalar; /* LIG */ + + build_vex_prefix (NULL); + i.rex &= REX_OPCODE; + } + else if (evex) + { + if (!i.tm.opcode_modifier.evex) + i.tm.opcode_modifier.evex = EVEXLIG; + + build_evex_prefix (); + i.rex &= REX_OPCODE; + } + output_insn (); + done: *saved_ilp = saved_char; input_line_pointer = line; demand_empty_rest_of_line (); + + /* Make sure dot_insn() won't yield "true" anymore. */ + i.tm.mnem_off = 0; } #ifdef TE_PE --- a/gas/testsuite/gas/i386/insn-32.d +++ b/gas/testsuite/gas/i386/insn-32.d @@ -11,4 +11,6 @@ Disassembly of section .text: [ ]*[a-f0-9]+: f3 90[ ]+pause [ ]*[a-f0-9]+: d9 ee[ ]+fldz [ ]*[a-f0-9]+: f3 0f 01 e8[ ]+setssbsy +[ ]*[a-f0-9]+: c5 fc 77[ ]+vzeroall +[ ]*[a-f0-9]+: c4 e1 7c 77[ ]+vzeroall #pass --- a/gas/testsuite/gas/i386/insn-32.s +++ b/gas/testsuite/gas/i386/insn-32.s @@ -12,3 +12,7 @@ insn: # setssbsy .insn 0xf30f01e8 + + # vzeroall + .insn VEX.256.0F.WIG 0x77 + .insn {vex3} VEX.L1 0x0f77 --- a/gas/testsuite/gas/i386/insn-64.d +++ b/gas/testsuite/gas/i386/insn-64.d @@ -11,4 +11,6 @@ Disassembly of section .text: [ ]*[a-f0-9]+: f3 90[ ]+pause [ ]*[a-f0-9]+: d9 ee[ ]+fldz [ ]*[a-f0-9]+: f3 0f 01 e8[ ]+setssbsy +[ ]*[a-f0-9]+: c5 fc 77[ ]+vzeroall +[ ]*[a-f0-9]+: c4 e1 7c 77[ ]+vzeroall #pass --- a/gas/testsuite/gas/i386/insn-64.s +++ b/gas/testsuite/gas/i386/insn-64.s @@ -12,3 +12,7 @@ insn: # setssbsy .insn 0xf30f01e8 + + # vzeroall + .insn VEX.256.0F.WIG 0x77 + .insn {vex3} VEX.L1 0x0f77 --- a/opcodes/i386-opc.h +++ b/opcodes/i386-opc.h @@ -643,12 +643,14 @@ enum 3: 256bit EVEX prefix. 4: Length-ignored (LIG) EVEX prefix. 5: Length determined from actual operands. + 6: L'L = 3 (reserved, .insn only) */ #define EVEX512 1 #define EVEX128 2 #define EVEX256 3 #define EVEXLIG 4 #define EVEXDYN 5 +#define EVEX_L3 6 EVex, /* AVX512 masking support: