From patchwork Fri Nov 24 07:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Cui, Lili" X-Patchwork-Id: 169222 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp956270vqx; Thu, 23 Nov 2023 23:02:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpTQ4pkfHwhJ7SkGMRTA+GIfA+vbFsR6YCWzX2RA34v0tapbwPXvqeBKI1cLalfiFWVb+l X-Received: by 2002:a05:620a:126a:b0:778:ba73:1650 with SMTP id b10-20020a05620a126a00b00778ba731650mr1632877qkl.30.1700809355253; Thu, 23 Nov 2023 23:02:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700809355; cv=pass; d=google.com; s=arc-20160816; b=Laeh7yY+o+os1JOGMvy6lajPcgaWaExmxgETh3vPFSDllKFU7O5BpB4cKRkP++9v4B b1wH5ESoIiUJFcw2SrrVlN9JEbOz+5cceyZMM7OKYJNUqJqOefEcLLnsQJtoZwePDaZm wO2KL98xgJJLRJ64+zyV1dCEwwtr+uA0Yil2cAnzJiA0a0+3be9V8gv6Cl6R7qd6FBSC tx8IopmHYhzKD3eFm4SyrxkNY7HksZfLouAclg0OL372YxSBlVv7SxvwLPLA0KJnVQa8 WjB7GLCM07mCK+UskniyAF3CINVlzcN4io1gCMPPwhB+0PwNYyqQnFJNZzFEl5mRMJ4d Samw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=pWeaBAhEaeGO1MGgmNQrEPxbhZpmRniZ2f1NiIhdrOI=; fh=ohjlW8amWAkl3RFBwC5ojAZtif/RVDQZdYLiyUWJyq8=; b=Y8z5xqjl9SUmgF6wZL9hIvzDJSTz4OOK9ntEYJiBwMwHCe9V9rfbeNPLL2zLT8XwgJ 511f8bMUkSj2PjLsVQ7m+ovKPbvtH/74t9m9exJlR0BEEqEH5rOq4KjgW2qtDHfRhTDA I1lQ6OpDQbaU+2Ax6PUeUWJarn9pYKdTPQ8DRwJ83W0NFW1fQfSmvttlaUW1eDDv0PoX geQaqcpnRlH90YHitcBrEjZcXAgF4RtnBS/ogZlaOV6Tw2iylns+vsQYfaqP0wZ9bsRz Yflv97+Tcclj9aqw2ET2R6HyD4m1WEnvqOJ9wKm4Pc3f708MyJrBQX+yHtG8q660yJmr GnZA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YJletNGA; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id h12-20020a05620a284c00b00775907603f0si2615983qkp.470.2023.11.23.23.02.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 23:02:35 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YJletNGA; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 617D63858413 for ; Fri, 24 Nov 2023 07:02:34 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by sourceware.org (Postfix) with ESMTPS id 3C5973858D20 for ; Fri, 24 Nov 2023 07:02:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C5973858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3C5973858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=134.134.136.126 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700809348; cv=none; b=d/7BHGspCV78AHPnjpBxanCVe4c5gnAUZzKRtN7R3zlSn6XtHQUD2GCIWVYXLVa7hkosU1nTEoiYnHHi9GpQ5v/SlZsvz5pUnp0QsK8en5rkMaypt/hm1RVqUmCpayffG/PxgonUro2vl8s9vYqRri2XHeXH1Ao2DCzHx8YMNyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700809348; c=relaxed/simple; bh=0n1nAYmtboURk0XOeWBK1FU2GIbwm/EbOkp4d/GrERY=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=bbD096tyhpPGaCw5Oidk4kQvcpWgSu08bLuNDhdOgUX9Gncaa/3OiRHdz0tk+Yq1JEg3xIb/m0/uyHLBDz6eZhhECluVGxo+ce3V1uerq+qOvBMFsYEs1GgOiOOEMlOZ+q2Hcd6TtrJh18eBhbiPiyeZRa0vew7xwW/BDFkeQqo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700809338; x=1732345338; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0n1nAYmtboURk0XOeWBK1FU2GIbwm/EbOkp4d/GrERY=; b=YJletNGAPh1M1CbJRL/E2Qhzo8+CAo5DD/OBIZKr2XZmk9Rci+Vd2w61 UO9KpPjlE4HQmfiTDekPZ4aM4P11ORkG4DkSxin2F/0gGXY5i2gCcSWNT 6BcSONwNnKG+qFdNGMKQTlTR+XxpijVzsvKKX5fzW6JP7D1cbUZLA8/qL CRVYPhmZvvPU3zn37mXa7JtLJHp/tQD5VZIihdf0/hPWrKjtFpxUwlkno QuoWEkM8095+lM5KG93sL/LHT4x4j/RM4R3PB4FgcIHF+nyeao1E9zhfQ SbLKjdJMr943mRSiLN1REkyaC0+zGwfn3RHMHQlVWLdx2TcKRYHW98oP4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="377408770" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="377408770" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 23:02:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="911358838" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="911358838" Received: from scymds04.sc.intel.com ([10.82.73.238]) by fmsmga001.fm.intel.com with ESMTP; 23 Nov 2023 23:02:16 -0800 Received: from shgcc101.sh.intel.com (shgcc101.sh.intel.com [10.239.85.97]) by scymds04.sc.intel.com (Postfix) with ESMTP id 71706200311D; Thu, 23 Nov 2023 23:02:14 -0800 (PST) From: "Cui, Lili" To: binutils@sourceware.org Cc: jbeulich@suse.com, hongjiu.lu@intel.com Subject: [PATCH 1/9] Make const_1_mode print $1 in AT&T syntax Date: Fri, 24 Nov 2023 07:02:05 +0000 Message-Id: <20231124070213.3886483-1-lili.cui@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783427870256901010 X-GMAIL-MSGID: 1783427870256901010 Make const_1_mode print $1 in AT&T syntax, otherwise there will be correctness issues when it is extended to support APX NDD, gas/ChangeLog: * testsuite/gas/i386/intel.d: Adjust testcase. * testsuite/gas/i386/lfence-load.d: Ditto. * testsuite/gas/i386/noreg16-data32.d: Ditto. * testsuite/gas/i386/noreg16.d: Ditto. * testsuite/gas/i386/noreg32-data16.d: Ditto. * testsuite/gas/i386/noreg32.d: Ditto. * testsuite/gas/i386/noreg64-data16.d: Ditto. * testsuite/gas/i386/noreg64-rex64.d: Ditto. * testsuite/gas/i386/noreg64.d: Ditto. * testsuite/gas/i386/opcode-suffix.d: Ditto. * testsuite/gas/i386/opcode.d: Ditto. * testsuite/gas/i386/x86-64-lfence-load.d: Ditto. * testsuite/gas/i386/x86-64-opcode.d: Ditto. opcodes/ChangeLog: * i386-dis.c (OP_I): Make const_1_mode print $1 in AT&T syntax. --- gas/testsuite/gas/i386/intel.d | 6 ++-- gas/testsuite/gas/i386/lfence-load.d | 2 +- gas/testsuite/gas/i386/noreg16-data32.d | 32 ++++++++++----------- gas/testsuite/gas/i386/noreg16.d | 32 ++++++++++----------- gas/testsuite/gas/i386/noreg32-data16.d | 32 ++++++++++----------- gas/testsuite/gas/i386/noreg32.d | 32 ++++++++++----------- gas/testsuite/gas/i386/noreg64-data16.d | 32 ++++++++++----------- gas/testsuite/gas/i386/noreg64-rex64.d | 32 ++++++++++----------- gas/testsuite/gas/i386/noreg64.d | 32 ++++++++++----------- gas/testsuite/gas/i386/opcode-suffix.d | 6 ++-- gas/testsuite/gas/i386/opcode.d | 10 +++---- gas/testsuite/gas/i386/x86-64-lfence-load.d | 2 +- gas/testsuite/gas/i386/x86-64-opcode.d | 6 ++-- opcodes/i386-dis.c | 2 ++ 14 files changed, 130 insertions(+), 128 deletions(-) diff --git a/gas/testsuite/gas/i386/intel.d b/gas/testsuite/gas/i386/intel.d index bc212893853..c3e45c2e38c 100644 --- a/gas/testsuite/gas/i386/intel.d +++ b/gas/testsuite/gas/i386/intel.d @@ -208,8 +208,8 @@ Disassembly of section .text: [ ]*[a-f0-9]+: cd 90 [ ]*int \$0x90 [ ]*[a-f0-9]+: ce [ ]*into [ ]*[a-f0-9]+: cf [ ]*iret -[ ]*[a-f0-9]+: d0 90 90 90 90 90 [ ]*rclb -0x6f6f6f70\(%eax\) -[ ]*[a-f0-9]+: d1 90 90 90 90 90 [ ]*rcll -0x6f6f6f70\(%eax\) +[ ]*[a-f0-9]+: d0 90 90 90 90 90 [ ]*rclb \$1,-0x6f6f6f70\(%eax\) +[ ]*[a-f0-9]+: d1 90 90 90 90 90 [ ]*rcll \$1,-0x6f6f6f70\(%eax\) [ ]*[a-f0-9]+: d2 90 90 90 90 90 [ ]*rclb %cl,-0x6f6f6f70\(%eax\) [ ]*[a-f0-9]+: d3 90 90 90 90 90 [ ]*rcll %cl,-0x6f6f6f70\(%eax\) [ ]*[a-f0-9]+: d4 90 [ ]*aam \$0x90 @@ -527,7 +527,7 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 66 ca 90 90 [ ]*lretw \$0x9090 [ ]*[a-f0-9]+: 66 cb [ ]*lretw [ ]*[a-f0-9]+: 66 cf [ ]*iretw -[ ]*[a-f0-9]+: 66 d1 90 90 90 90 90 [ ]*rclw -0x6f6f6f70\(%eax\) +[ ]*[a-f0-9]+: 66 d1 90 90 90 90 90 [ ]*rclw \$1,-0x6f6f6f70\(%eax\) [ ]*[a-f0-9]+: 66 d3 90 90 90 90 90 [ ]*rclw %cl,-0x6f6f6f70\(%eax\) [ ]*[a-f0-9]+: 66 e5 90 [ ]*in \$0x90,%ax [ ]*[a-f0-9]+: 66 e7 90 [ ]*out %ax,\$0x90 diff --git a/gas/testsuite/gas/i386/lfence-load.d b/gas/testsuite/gas/i386/lfence-load.d index 33ebef5432f..eb94bdcbb68 100644 --- a/gas/testsuite/gas/i386/lfence-load.d +++ b/gas/testsuite/gas/i386/lfence-load.d @@ -83,7 +83,7 @@ Disassembly of section .text: +[a-f0-9]+: 0f ae e8 lfence +[a-f0-9]+: 58 pop %eax +[a-f0-9]+: 0f ae e8 lfence - +[a-f0-9]+: 66 d1 11 rclw \(%ecx\) + +[a-f0-9]+: 66 d1 11 rclw \$1,\(%ecx\) +[a-f0-9]+: 0f ae e8 lfence +[a-f0-9]+: f7 01 01 00 00 00 testl \$0x1,\(%ecx\) +[a-f0-9]+: 0f ae e8 lfence diff --git a/gas/testsuite/gas/i386/noreg16-data32.d b/gas/testsuite/gas/i386/noreg16-data32.d index 7561b549ebb..237e25dd0e1 100644 --- a/gas/testsuite/gas/i386/noreg16-data32.d +++ b/gas/testsuite/gas/i386/noreg16-data32.d @@ -96,43 +96,43 @@ Disassembly of section .text: *[a-f0-9]+: f3 0f ae 27 ptwrite \(%bx\) *[a-f0-9]+: 66 ff 37 pushl \(%bx\) *[a-f0-9]+: 66 06 pushl %es - *[a-f0-9]+: 66 d1 17 rcll \(%bx\) + *[a-f0-9]+: 66 d1 17 rcll \$1,\(%bx\) *[a-f0-9]+: 66 c1 17 02 rcll \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 17 rcll %cl,\(%bx\) - *[a-f0-9]+: 66 d1 17 rcll \(%bx\) - *[a-f0-9]+: 66 d1 1f rcrl \(%bx\) + *[a-f0-9]+: 66 d1 17 rcll \$1,\(%bx\) + *[a-f0-9]+: 66 d1 1f rcrl \$1,\(%bx\) *[a-f0-9]+: 66 c1 1f 02 rcrl \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 1f rcrl %cl,\(%bx\) - *[a-f0-9]+: 66 d1 1f rcrl \(%bx\) - *[a-f0-9]+: 66 d1 07 roll \(%bx\) + *[a-f0-9]+: 66 d1 1f rcrl \$1,\(%bx\) + *[a-f0-9]+: 66 d1 07 roll \$1,\(%bx\) *[a-f0-9]+: 66 c1 07 02 roll \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 07 roll %cl,\(%bx\) - *[a-f0-9]+: 66 d1 07 roll \(%bx\) - *[a-f0-9]+: 66 d1 0f rorl \(%bx\) + *[a-f0-9]+: 66 d1 07 roll \$1,\(%bx\) + *[a-f0-9]+: 66 d1 0f rorl \$1,\(%bx\) *[a-f0-9]+: 66 c1 0f 02 rorl \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 0f rorl %cl,\(%bx\) - *[a-f0-9]+: 66 d1 0f rorl \(%bx\) + *[a-f0-9]+: 66 d1 0f rorl \$1,\(%bx\) *[a-f0-9]+: 66 83 1f 01 sbbl \$0x1,\(%bx\) *[a-f0-9]+: 66 81 1f 89 00 00 00 sbbl \$0x89,\(%bx\) *[a-f0-9]+: 66 81 1f 34 12 00 00 sbbl \$0x1234,\(%bx\) *[a-f0-9]+: 66 af scas %es:\(%di\),%eax *[a-f0-9]+: 66 af scas %es:\(%di\),%eax - *[a-f0-9]+: 66 d1 27 shll \(%bx\) + *[a-f0-9]+: 66 d1 27 shll \$1,\(%bx\) *[a-f0-9]+: 66 c1 27 02 shll \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 27 shll %cl,\(%bx\) - *[a-f0-9]+: 66 d1 27 shll \(%bx\) - *[a-f0-9]+: 66 d1 3f sarl \(%bx\) + *[a-f0-9]+: 66 d1 27 shll \$1,\(%bx\) + *[a-f0-9]+: 66 d1 3f sarl \$1,\(%bx\) *[a-f0-9]+: 66 c1 3f 02 sarl \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 3f sarl %cl,\(%bx\) - *[a-f0-9]+: 66 d1 3f sarl \(%bx\) - *[a-f0-9]+: 66 d1 27 shll \(%bx\) + *[a-f0-9]+: 66 d1 3f sarl \$1,\(%bx\) + *[a-f0-9]+: 66 d1 27 shll \$1,\(%bx\) *[a-f0-9]+: 66 c1 27 02 shll \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 27 shll %cl,\(%bx\) - *[a-f0-9]+: 66 d1 27 shll \(%bx\) - *[a-f0-9]+: 66 d1 2f shrl \(%bx\) + *[a-f0-9]+: 66 d1 27 shll \$1,\(%bx\) + *[a-f0-9]+: 66 d1 2f shrl \$1,\(%bx\) *[a-f0-9]+: 66 c1 2f 02 shrl \$0x2,\(%bx\) *[a-f0-9]+: 66 d3 2f shrl %cl,\(%bx\) - *[a-f0-9]+: 66 d1 2f shrl \(%bx\) + *[a-f0-9]+: 66 d1 2f shrl \$1,\(%bx\) *[a-f0-9]+: 66 ab stos %eax,%es:\(%di\) *[a-f0-9]+: 66 ab stos %eax,%es:\(%di\) *[a-f0-9]+: 66 83 2f 01 subl \$0x1,\(%bx\) diff --git a/gas/testsuite/gas/i386/noreg16.d b/gas/testsuite/gas/i386/noreg16.d index 86f852fb4ca..e4149b03a6e 100644 --- a/gas/testsuite/gas/i386/noreg16.d +++ b/gas/testsuite/gas/i386/noreg16.d @@ -95,43 +95,43 @@ Disassembly of section .text: *[a-f0-9]+: f3 0f ae 27 ptwrite \(%bx\) *[a-f0-9]+: ff 37 push \(%bx\) *[a-f0-9]+: 06 push %es - *[a-f0-9]+: d1 17 rclw \(%bx\) + *[a-f0-9]+: d1 17 rclw \$1,\(%bx\) *[a-f0-9]+: c1 17 02 rclw \$0x2,\(%bx\) *[a-f0-9]+: d3 17 rclw %cl,\(%bx\) - *[a-f0-9]+: d1 17 rclw \(%bx\) - *[a-f0-9]+: d1 1f rcrw \(%bx\) + *[a-f0-9]+: d1 17 rclw \$1,\(%bx\) + *[a-f0-9]+: d1 1f rcrw \$1,\(%bx\) *[a-f0-9]+: c1 1f 02 rcrw \$0x2,\(%bx\) *[a-f0-9]+: d3 1f rcrw %cl,\(%bx\) - *[a-f0-9]+: d1 1f rcrw \(%bx\) - *[a-f0-9]+: d1 07 rolw \(%bx\) + *[a-f0-9]+: d1 1f rcrw \$1,\(%bx\) + *[a-f0-9]+: d1 07 rolw \$1,\(%bx\) *[a-f0-9]+: c1 07 02 rolw \$0x2,\(%bx\) *[a-f0-9]+: d3 07 rolw %cl,\(%bx\) - *[a-f0-9]+: d1 07 rolw \(%bx\) - *[a-f0-9]+: d1 0f rorw \(%bx\) + *[a-f0-9]+: d1 07 rolw \$1,\(%bx\) + *[a-f0-9]+: d1 0f rorw \$1,\(%bx\) *[a-f0-9]+: c1 0f 02 rorw \$0x2,\(%bx\) *[a-f0-9]+: d3 0f rorw %cl,\(%bx\) - *[a-f0-9]+: d1 0f rorw \(%bx\) + *[a-f0-9]+: d1 0f rorw \$1,\(%bx\) *[a-f0-9]+: 83 1f 01 sbbw \$0x1,\(%bx\) *[a-f0-9]+: 81 1f 89 00 sbbw \$0x89,\(%bx\) *[a-f0-9]+: 81 1f 34 12 sbbw \$0x1234,\(%bx\) *[a-f0-9]+: af scas %es:\(%di\),%ax *[a-f0-9]+: af scas %es:\(%di\),%ax - *[a-f0-9]+: d1 27 shlw \(%bx\) + *[a-f0-9]+: d1 27 shlw \$1,\(%bx\) *[a-f0-9]+: c1 27 02 shlw \$0x2,\(%bx\) *[a-f0-9]+: d3 27 shlw %cl,\(%bx\) - *[a-f0-9]+: d1 27 shlw \(%bx\) - *[a-f0-9]+: d1 3f sarw \(%bx\) + *[a-f0-9]+: d1 27 shlw \$1,\(%bx\) + *[a-f0-9]+: d1 3f sarw \$1,\(%bx\) *[a-f0-9]+: c1 3f 02 sarw \$0x2,\(%bx\) *[a-f0-9]+: d3 3f sarw %cl,\(%bx\) - *[a-f0-9]+: d1 3f sarw \(%bx\) - *[a-f0-9]+: d1 27 shlw \(%bx\) + *[a-f0-9]+: d1 3f sarw \$1,\(%bx\) + *[a-f0-9]+: d1 27 shlw \$1,\(%bx\) *[a-f0-9]+: c1 27 02 shlw \$0x2,\(%bx\) *[a-f0-9]+: d3 27 shlw %cl,\(%bx\) - *[a-f0-9]+: d1 27 shlw \(%bx\) - *[a-f0-9]+: d1 2f shrw \(%bx\) + *[a-f0-9]+: d1 27 shlw \$1,\(%bx\) + *[a-f0-9]+: d1 2f shrw \$1,\(%bx\) *[a-f0-9]+: c1 2f 02 shrw \$0x2,\(%bx\) *[a-f0-9]+: d3 2f shrw %cl,\(%bx\) - *[a-f0-9]+: d1 2f shrw \(%bx\) + *[a-f0-9]+: d1 2f shrw \$1,\(%bx\) *[a-f0-9]+: ab stos %ax,%es:\(%di\) *[a-f0-9]+: ab stos %ax,%es:\(%di\) *[a-f0-9]+: 83 2f 01 subw \$0x1,\(%bx\) diff --git a/gas/testsuite/gas/i386/noreg32-data16.d b/gas/testsuite/gas/i386/noreg32-data16.d index 1ec6b9e8670..e3ae2116bb1 100644 --- a/gas/testsuite/gas/i386/noreg32-data16.d +++ b/gas/testsuite/gas/i386/noreg32-data16.d @@ -103,44 +103,44 @@ Disassembly of section .text: *[a-f0-9]+: f3 0f ae 20 ptwrite \(%eax\) *[a-f0-9]+: 66 ff 30 pushw \(%eax\) *[a-f0-9]+: 66 06 pushw %es - *[a-f0-9]+: 66 d1 10 rclw \(%eax\) + *[a-f0-9]+: 66 d1 10 rclw \$1,\(%eax\) *[a-f0-9]+: 66 c1 10 02 rclw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 10 rclw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 10 rclw \(%eax\) - *[a-f0-9]+: 66 d1 18 rcrw \(%eax\) + *[a-f0-9]+: 66 d1 10 rclw \$1,\(%eax\) + *[a-f0-9]+: 66 d1 18 rcrw \$1,\(%eax\) *[a-f0-9]+: 66 c1 18 02 rcrw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 18 rcrw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 18 rcrw \(%eax\) - *[a-f0-9]+: 66 d1 00 rolw \(%eax\) + *[a-f0-9]+: 66 d1 18 rcrw \$1,\(%eax\) + *[a-f0-9]+: 66 d1 00 rolw \$1,\(%eax\) *[a-f0-9]+: 66 c1 00 02 rolw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 00 rolw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 00 rolw \(%eax\) - *[a-f0-9]+: 66 d1 08 rorw \(%eax\) + *[a-f0-9]+: 66 d1 00 rolw \$1,\(%eax\) + *[a-f0-9]+: 66 d1 08 rorw \$1,\(%eax\) *[a-f0-9]+: 66 c1 08 02 rorw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 08 rorw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 08 rorw \(%eax\) + *[a-f0-9]+: 66 d1 08 rorw \$1,\(%eax\) *[a-f0-9]+: 66 83 18 01 sbbw \$0x1,\(%eax\) *[a-f0-9]+: 66 81 18 89 00 sbbw \$0x89,\(%eax\) *[a-f0-9]+: 66 81 18 34 12 sbbw \$0x1234,\(%eax\) *[a-f0-9]+: 66 81 18 78 56 sbbw \$0x5678,\(%eax\) *[a-f0-9]+: 66 af scas %es:\(%edi\),%ax *[a-f0-9]+: 66 af scas %es:\(%edi\),%ax - *[a-f0-9]+: 66 d1 20 shlw \(%eax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%eax\) *[a-f0-9]+: 66 c1 20 02 shlw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 20 shlw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 20 shlw \(%eax\) - *[a-f0-9]+: 66 d1 38 sarw \(%eax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%eax\) + *[a-f0-9]+: 66 d1 38 sarw \$1,\(%eax\) *[a-f0-9]+: 66 c1 38 02 sarw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 38 sarw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 38 sarw \(%eax\) - *[a-f0-9]+: 66 d1 20 shlw \(%eax\) + *[a-f0-9]+: 66 d1 38 sarw \$1,\(%eax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%eax\) *[a-f0-9]+: 66 c1 20 02 shlw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 20 shlw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 20 shlw \(%eax\) - *[a-f0-9]+: 66 d1 28 shrw \(%eax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%eax\) + *[a-f0-9]+: 66 d1 28 shrw \$1,\(%eax\) *[a-f0-9]+: 66 c1 28 02 shrw \$0x2,\(%eax\) *[a-f0-9]+: 66 d3 28 shrw %cl,\(%eax\) - *[a-f0-9]+: 66 d1 28 shrw \(%eax\) + *[a-f0-9]+: 66 d1 28 shrw \$1,\(%eax\) *[a-f0-9]+: 66 ab stos %ax,%es:\(%edi\) *[a-f0-9]+: 66 ab stos %ax,%es:\(%edi\) *[a-f0-9]+: 66 83 28 01 subw \$0x1,\(%eax\) diff --git a/gas/testsuite/gas/i386/noreg32.d b/gas/testsuite/gas/i386/noreg32.d index 9dbef908ce7..8bb08ca73c6 100644 --- a/gas/testsuite/gas/i386/noreg32.d +++ b/gas/testsuite/gas/i386/noreg32.d @@ -101,44 +101,44 @@ Disassembly of section .text: *[a-f0-9]+: f3 0f ae 20 ptwrite \(%eax\) *[a-f0-9]+: ff 30 push \(%eax\) *[a-f0-9]+: 06 push %es - *[a-f0-9]+: d1 10 rcll \(%eax\) + *[a-f0-9]+: d1 10 rcll \$1,\(%eax\) *[a-f0-9]+: c1 10 02 rcll \$0x2,\(%eax\) *[a-f0-9]+: d3 10 rcll %cl,\(%eax\) - *[a-f0-9]+: d1 10 rcll \(%eax\) - *[a-f0-9]+: d1 18 rcrl \(%eax\) + *[a-f0-9]+: d1 10 rcll \$1,\(%eax\) + *[a-f0-9]+: d1 18 rcrl \$1,\(%eax\) *[a-f0-9]+: c1 18 02 rcrl \$0x2,\(%eax\) *[a-f0-9]+: d3 18 rcrl %cl,\(%eax\) - *[a-f0-9]+: d1 18 rcrl \(%eax\) - *[a-f0-9]+: d1 00 roll \(%eax\) + *[a-f0-9]+: d1 18 rcrl \$1,\(%eax\) + *[a-f0-9]+: d1 00 roll \$1,\(%eax\) *[a-f0-9]+: c1 00 02 roll \$0x2,\(%eax\) *[a-f0-9]+: d3 00 roll %cl,\(%eax\) - *[a-f0-9]+: d1 00 roll \(%eax\) - *[a-f0-9]+: d1 08 rorl \(%eax\) + *[a-f0-9]+: d1 00 roll \$1,\(%eax\) + *[a-f0-9]+: d1 08 rorl \$1,\(%eax\) *[a-f0-9]+: c1 08 02 rorl \$0x2,\(%eax\) *[a-f0-9]+: d3 08 rorl %cl,\(%eax\) - *[a-f0-9]+: d1 08 rorl \(%eax\) + *[a-f0-9]+: d1 08 rorl \$1,\(%eax\) *[a-f0-9]+: 83 18 01 sbbl \$0x1,\(%eax\) *[a-f0-9]+: 81 18 89 00 00 00 sbbl \$0x89,\(%eax\) *[a-f0-9]+: 81 18 34 12 00 00 sbbl \$0x1234,\(%eax\) *[a-f0-9]+: 81 18 78 56 34 12 sbbl \$0x12345678,\(%eax\) *[a-f0-9]+: af scas %es:\(%edi\),%eax *[a-f0-9]+: af scas %es:\(%edi\),%eax - *[a-f0-9]+: d1 20 shll \(%eax\) + *[a-f0-9]+: d1 20 shll \$1,\(%eax\) *[a-f0-9]+: c1 20 02 shll \$0x2,\(%eax\) *[a-f0-9]+: d3 20 shll %cl,\(%eax\) - *[a-f0-9]+: d1 20 shll \(%eax\) - *[a-f0-9]+: d1 38 sarl \(%eax\) + *[a-f0-9]+: d1 20 shll \$1,\(%eax\) + *[a-f0-9]+: d1 38 sarl \$1,\(%eax\) *[a-f0-9]+: c1 38 02 sarl \$0x2,\(%eax\) *[a-f0-9]+: d3 38 sarl %cl,\(%eax\) - *[a-f0-9]+: d1 38 sarl \(%eax\) - *[a-f0-9]+: d1 20 shll \(%eax\) + *[a-f0-9]+: d1 38 sarl \$1,\(%eax\) + *[a-f0-9]+: d1 20 shll \$1,\(%eax\) *[a-f0-9]+: c1 20 02 shll \$0x2,\(%eax\) *[a-f0-9]+: d3 20 shll %cl,\(%eax\) - *[a-f0-9]+: d1 20 shll \(%eax\) - *[a-f0-9]+: d1 28 shrl \(%eax\) + *[a-f0-9]+: d1 20 shll \$1,\(%eax\) + *[a-f0-9]+: d1 28 shrl \$1,\(%eax\) *[a-f0-9]+: c1 28 02 shrl \$0x2,\(%eax\) *[a-f0-9]+: d3 28 shrl %cl,\(%eax\) - *[a-f0-9]+: d1 28 shrl \(%eax\) + *[a-f0-9]+: d1 28 shrl \$1,\(%eax\) *[a-f0-9]+: ab stos %eax,%es:\(%edi\) *[a-f0-9]+: ab stos %eax,%es:\(%edi\) *[a-f0-9]+: 83 28 01 subl \$0x1,\(%eax\) diff --git a/gas/testsuite/gas/i386/noreg64-data16.d b/gas/testsuite/gas/i386/noreg64-data16.d index f1e67096a58..802eb4053d3 100644 --- a/gas/testsuite/gas/i386/noreg64-data16.d +++ b/gas/testsuite/gas/i386/noreg64-data16.d @@ -106,44 +106,44 @@ Disassembly of section .text: *[a-f0-9]+: 66 0f a1 popw %fs *[a-f0-9]+: 66 ff 30 pushw \(%rax\) *[a-f0-9]+: 66 0f a0 pushw %fs - *[a-f0-9]+: 66 d1 10 rclw \(%rax\) + *[a-f0-9]+: 66 d1 10 rclw \$1,\(%rax\) *[a-f0-9]+: 66 c1 10 02 rclw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 10 rclw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 10 rclw \(%rax\) - *[a-f0-9]+: 66 d1 18 rcrw \(%rax\) + *[a-f0-9]+: 66 d1 10 rclw \$1,\(%rax\) + *[a-f0-9]+: 66 d1 18 rcrw \$1,\(%rax\) *[a-f0-9]+: 66 c1 18 02 rcrw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 18 rcrw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 18 rcrw \(%rax\) - *[a-f0-9]+: 66 d1 00 rolw \(%rax\) + *[a-f0-9]+: 66 d1 18 rcrw \$1,\(%rax\) + *[a-f0-9]+: 66 d1 00 rolw \$1,\(%rax\) *[a-f0-9]+: 66 c1 00 02 rolw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 00 rolw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 00 rolw \(%rax\) - *[a-f0-9]+: 66 d1 08 rorw \(%rax\) + *[a-f0-9]+: 66 d1 00 rolw \$1,\(%rax\) + *[a-f0-9]+: 66 d1 08 rorw \$1,\(%rax\) *[a-f0-9]+: 66 c1 08 02 rorw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 08 rorw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 08 rorw \(%rax\) + *[a-f0-9]+: 66 d1 08 rorw \$1,\(%rax\) *[a-f0-9]+: 66 83 18 01 sbbw \$0x1,\(%rax\) *[a-f0-9]+: 66 81 18 89 00 sbbw \$0x89,\(%rax\) *[a-f0-9]+: 66 81 18 34 12 sbbw \$0x1234,\(%rax\) *[a-f0-9]+: 66 81 18 78 56 sbbw \$0x5678,\(%rax\) *[a-f0-9]+: 66 af scas %es:\(%rdi\),%ax *[a-f0-9]+: 66 af scas %es:\(%rdi\),%ax - *[a-f0-9]+: 66 d1 20 shlw \(%rax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%rax\) *[a-f0-9]+: 66 c1 20 02 shlw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 20 shlw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 20 shlw \(%rax\) - *[a-f0-9]+: 66 d1 38 sarw \(%rax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%rax\) + *[a-f0-9]+: 66 d1 38 sarw \$1,\(%rax\) *[a-f0-9]+: 66 c1 38 02 sarw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 38 sarw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 38 sarw \(%rax\) - *[a-f0-9]+: 66 d1 20 shlw \(%rax\) + *[a-f0-9]+: 66 d1 38 sarw \$1,\(%rax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%rax\) *[a-f0-9]+: 66 c1 20 02 shlw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 20 shlw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 20 shlw \(%rax\) - *[a-f0-9]+: 66 d1 28 shrw \(%rax\) + *[a-f0-9]+: 66 d1 20 shlw \$1,\(%rax\) + *[a-f0-9]+: 66 d1 28 shrw \$1,\(%rax\) *[a-f0-9]+: 66 c1 28 02 shrw \$0x2,\(%rax\) *[a-f0-9]+: 66 d3 28 shrw %cl,\(%rax\) - *[a-f0-9]+: 66 d1 28 shrw \(%rax\) + *[a-f0-9]+: 66 d1 28 shrw \$1,\(%rax\) *[a-f0-9]+: 66 ab stos %ax,%es:\(%rdi\) *[a-f0-9]+: 66 ab stos %ax,%es:\(%rdi\) *[a-f0-9]+: 66 83 28 01 subw \$0x1,\(%rax\) diff --git a/gas/testsuite/gas/i386/noreg64-rex64.d b/gas/testsuite/gas/i386/noreg64-rex64.d index cd8679e626a..e33851d8093 100644 --- a/gas/testsuite/gas/i386/noreg64-rex64.d +++ b/gas/testsuite/gas/i386/noreg64-rex64.d @@ -105,44 +105,44 @@ Disassembly of section .text: *[a-f0-9]+: f3 48 0f ae 20 ptwriteq \(%rax\) *[a-f0-9]+: 48 ff 30 rex\.W push \(%rax\) *[a-f0-9]+: 48 0f a0 rex\.W push %fs - *[a-f0-9]+: 48 d1 10 rclq \(%rax\) + *[a-f0-9]+: 48 d1 10 rclq \$1,\(%rax\) *[a-f0-9]+: 48 c1 10 02 rclq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 10 rclq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 10 rclq \(%rax\) - *[a-f0-9]+: 48 d1 18 rcrq \(%rax\) + *[a-f0-9]+: 48 d1 10 rclq \$1,\(%rax\) + *[a-f0-9]+: 48 d1 18 rcrq \$1,\(%rax\) *[a-f0-9]+: 48 c1 18 02 rcrq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 18 rcrq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 18 rcrq \(%rax\) - *[a-f0-9]+: 48 d1 00 rolq \(%rax\) + *[a-f0-9]+: 48 d1 18 rcrq \$1,\(%rax\) + *[a-f0-9]+: 48 d1 00 rolq \$1,\(%rax\) *[a-f0-9]+: 48 c1 00 02 rolq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 00 rolq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 00 rolq \(%rax\) - *[a-f0-9]+: 48 d1 08 rorq \(%rax\) + *[a-f0-9]+: 48 d1 00 rolq \$1,\(%rax\) + *[a-f0-9]+: 48 d1 08 rorq \$1,\(%rax\) *[a-f0-9]+: 48 c1 08 02 rorq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 08 rorq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 08 rorq \(%rax\) + *[a-f0-9]+: 48 d1 08 rorq \$1,\(%rax\) *[a-f0-9]+: 48 83 18 01 sbbq \$0x1,\(%rax\) *[a-f0-9]+: 48 81 18 89 00 00 00 sbbq \$0x89,\(%rax\) *[a-f0-9]+: 48 81 18 34 12 00 00 sbbq \$0x1234,\(%rax\) *[a-f0-9]+: 48 81 18 78 56 34 12 sbbq \$0x12345678,\(%rax\) *[a-f0-9]+: 48 af scas %es:\(%rdi\),%rax *[a-f0-9]+: 48 af scas %es:\(%rdi\),%rax - *[a-f0-9]+: 48 d1 20 shlq \(%rax\) + *[a-f0-9]+: 48 d1 20 shlq \$1,\(%rax\) *[a-f0-9]+: 48 c1 20 02 shlq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 20 shlq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 20 shlq \(%rax\) - *[a-f0-9]+: 48 d1 38 sarq \(%rax\) + *[a-f0-9]+: 48 d1 20 shlq \$1,\(%rax\) + *[a-f0-9]+: 48 d1 38 sarq \$1,\(%rax\) *[a-f0-9]+: 48 c1 38 02 sarq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 38 sarq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 38 sarq \(%rax\) - *[a-f0-9]+: 48 d1 20 shlq \(%rax\) + *[a-f0-9]+: 48 d1 38 sarq \$1,\(%rax\) + *[a-f0-9]+: 48 d1 20 shlq \$1,\(%rax\) *[a-f0-9]+: 48 c1 20 02 shlq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 20 shlq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 20 shlq \(%rax\) - *[a-f0-9]+: 48 d1 28 shrq \(%rax\) + *[a-f0-9]+: 48 d1 20 shlq \$1,\(%rax\) + *[a-f0-9]+: 48 d1 28 shrq \$1,\(%rax\) *[a-f0-9]+: 48 c1 28 02 shrq \$0x2,\(%rax\) *[a-f0-9]+: 48 d3 28 shrq %cl,\(%rax\) - *[a-f0-9]+: 48 d1 28 shrq \(%rax\) + *[a-f0-9]+: 48 d1 28 shrq \$1,\(%rax\) *[a-f0-9]+: 48 ab stos %rax,%es:\(%rdi\) *[a-f0-9]+: 48 ab stos %rax,%es:\(%rdi\) *[a-f0-9]+: 48 83 28 01 subq \$0x1,\(%rax\) diff --git a/gas/testsuite/gas/i386/noreg64.d b/gas/testsuite/gas/i386/noreg64.d index 354d89069ae..2afdef38f92 100644 --- a/gas/testsuite/gas/i386/noreg64.d +++ b/gas/testsuite/gas/i386/noreg64.d @@ -107,44 +107,44 @@ Disassembly of section .text: *[a-f0-9]+: f3 0f ae 20 ptwritel \(%rax\) *[a-f0-9]+: ff 30 push \(%rax\) *[a-f0-9]+: 0f a0 push %fs - *[a-f0-9]+: d1 10 rcll \(%rax\) + *[a-f0-9]+: d1 10 rcll \$1,\(%rax\) *[a-f0-9]+: c1 10 02 rcll \$0x2,\(%rax\) *[a-f0-9]+: d3 10 rcll %cl,\(%rax\) - *[a-f0-9]+: d1 10 rcll \(%rax\) - *[a-f0-9]+: d1 18 rcrl \(%rax\) + *[a-f0-9]+: d1 10 rcll \$1,\(%rax\) + *[a-f0-9]+: d1 18 rcrl \$1,\(%rax\) *[a-f0-9]+: c1 18 02 rcrl \$0x2,\(%rax\) *[a-f0-9]+: d3 18 rcrl %cl,\(%rax\) - *[a-f0-9]+: d1 18 rcrl \(%rax\) - *[a-f0-9]+: d1 00 roll \(%rax\) + *[a-f0-9]+: d1 18 rcrl \$1,\(%rax\) + *[a-f0-9]+: d1 00 roll \$1,\(%rax\) *[a-f0-9]+: c1 00 02 roll \$0x2,\(%rax\) *[a-f0-9]+: d3 00 roll %cl,\(%rax\) - *[a-f0-9]+: d1 00 roll \(%rax\) - *[a-f0-9]+: d1 08 rorl \(%rax\) + *[a-f0-9]+: d1 00 roll \$1,\(%rax\) + *[a-f0-9]+: d1 08 rorl \$1,\(%rax\) *[a-f0-9]+: c1 08 02 rorl \$0x2,\(%rax\) *[a-f0-9]+: d3 08 rorl %cl,\(%rax\) - *[a-f0-9]+: d1 08 rorl \(%rax\) + *[a-f0-9]+: d1 08 rorl \$1,\(%rax\) *[a-f0-9]+: 83 18 01 sbbl \$0x1,\(%rax\) *[a-f0-9]+: 81 18 89 00 00 00 sbbl \$0x89,\(%rax\) *[a-f0-9]+: 81 18 34 12 00 00 sbbl \$0x1234,\(%rax\) *[a-f0-9]+: 81 18 78 56 34 12 sbbl \$0x12345678,\(%rax\) *[a-f0-9]+: af scas %es:\(%rdi\),%eax *[a-f0-9]+: af scas %es:\(%rdi\),%eax - *[a-f0-9]+: d1 20 shll \(%rax\) + *[a-f0-9]+: d1 20 shll \$1,\(%rax\) *[a-f0-9]+: c1 20 02 shll \$0x2,\(%rax\) *[a-f0-9]+: d3 20 shll %cl,\(%rax\) - *[a-f0-9]+: d1 20 shll \(%rax\) - *[a-f0-9]+: d1 38 sarl \(%rax\) + *[a-f0-9]+: d1 20 shll \$1,\(%rax\) + *[a-f0-9]+: d1 38 sarl \$1,\(%rax\) *[a-f0-9]+: c1 38 02 sarl \$0x2,\(%rax\) *[a-f0-9]+: d3 38 sarl %cl,\(%rax\) - *[a-f0-9]+: d1 38 sarl \(%rax\) - *[a-f0-9]+: d1 20 shll \(%rax\) + *[a-f0-9]+: d1 38 sarl \$1,\(%rax\) + *[a-f0-9]+: d1 20 shll \$1,\(%rax\) *[a-f0-9]+: c1 20 02 shll \$0x2,\(%rax\) *[a-f0-9]+: d3 20 shll %cl,\(%rax\) - *[a-f0-9]+: d1 20 shll \(%rax\) - *[a-f0-9]+: d1 28 shrl \(%rax\) + *[a-f0-9]+: d1 20 shll \$1,\(%rax\) + *[a-f0-9]+: d1 28 shrl \$1,\(%rax\) *[a-f0-9]+: c1 28 02 shrl \$0x2,\(%rax\) *[a-f0-9]+: d3 28 shrl %cl,\(%rax\) - *[a-f0-9]+: d1 28 shrl \(%rax\) + *[a-f0-9]+: d1 28 shrl \$1,\(%rax\) *[a-f0-9]+: ab stos %eax,%es:\(%rdi\) *[a-f0-9]+: ab stos %eax,%es:\(%rdi\) *[a-f0-9]+: 83 28 01 subl \$0x1,\(%rax\) diff --git a/gas/testsuite/gas/i386/opcode-suffix.d b/gas/testsuite/gas/i386/opcode-suffix.d index 946a0a4d7a0..ca6af50c9cf 100644 --- a/gas/testsuite/gas/i386/opcode-suffix.d +++ b/gas/testsuite/gas/i386/opcode-suffix.d @@ -206,8 +206,8 @@ Disassembly of section .text: *[0-9a-f]+: cd 90[ ]+int[ ]+\$0x90 *[0-9a-f]+: ce[ ]+into *[0-9a-f]+: cf[ ]+iretl - *[0-9a-f]+: d0 90 90 90 90 90[ ]+rclb[ ]+-0x6f6f6f70\(%eax\) - *[0-9a-f]+: d1 90 90 90 90 90[ ]+rcll[ ]+-0x6f6f6f70\(%eax\) + *[0-9a-f]+: d0 90 90 90 90 90[ ]+rclb[ ]+\$1,-0x6f6f6f70\(%eax\) + *[0-9a-f]+: d1 90 90 90 90 90[ ]+rcll[ ]+\$1,-0x6f6f6f70\(%eax\) *[0-9a-f]+: d2 90 90 90 90 90[ ]+rclb[ ]+%cl,-0x6f6f6f70\(%eax\) *[0-9a-f]+: d3 90 90 90 90 90[ ]+rcll[ ]+%cl,-0x6f6f6f70\(%eax\) *[0-9a-f]+: d4 90[ ]+aam[ ]+\$0x90 @@ -523,7 +523,7 @@ Disassembly of section .text: *[0-9a-f]+: 66 ca 90 90[ ]+lretw[ ]+\$0x9090 *[0-9a-f]+: 66 cb[ ]+lretw *[0-9a-f]+: 66 cf[ ]+iretw - *[0-9a-f]+: 66 d1 90 90 90 90 90[ ]+rclw[ ]+-0x6f6f6f70\(%eax\) + *[0-9a-f]+: 66 d1 90 90 90 90 90[ ]+rclw[ ]+\$1,-0x6f6f6f70\(%eax\) *[0-9a-f]+: 66 d3 90 90 90 90 90[ ]+rclw[ ]+%cl,-0x6f6f6f70\(%eax\) *[0-9a-f]+: 66 e5 90[ ]+inw[ ]+\$0x90,%ax *[0-9a-f]+: 66 e7 90[ ]+outw[ ]+%ax,\$0x90 diff --git a/gas/testsuite/gas/i386/opcode.d b/gas/testsuite/gas/i386/opcode.d index 7631195d8d4..f7af22518e2 100644 --- a/gas/testsuite/gas/i386/opcode.d +++ b/gas/testsuite/gas/i386/opcode.d @@ -205,8 +205,8 @@ Disassembly of section .text: 279: cd 90 [ ]*int \$0x90 27b: ce [ ]*into 27c: cf [ ]*iret - 27d: d0 90 90 90 90 90 [ ]*rclb -0x6f6f6f70\(%eax\) - 283: d1 90 90 90 90 90 [ ]*rcll -0x6f6f6f70\(%eax\) + 27d: d0 90 90 90 90 90 [ ]*rclb \$1,-0x6f6f6f70\(%eax\) + 283: d1 90 90 90 90 90 [ ]*rcll \$1,-0x6f6f6f70\(%eax\) 289: d2 90 90 90 90 90 [ ]*rclb %cl,-0x6f6f6f70\(%eax\) 28f: d3 90 90 90 90 90 [ ]*rcll %cl,-0x6f6f6f70\(%eax\) 295: d4 90 [ ]*aam \$0x90 @@ -522,7 +522,7 @@ Disassembly of section .text: 869: 66 ca 90 90 [ ]*lretw \$0x9090 86d: 66 cb [ ]*lretw 86f: 66 cf [ ]*iretw - 871: 66 d1 90 90 90 90 90 [ ]*rclw -0x6f6f6f70\(%eax\) + 871: 66 d1 90 90 90 90 90 [ ]*rclw \$1,-0x6f6f6f70\(%eax\) 878: 66 d3 90 90 90 90 90 [ ]*rclw %cl,-0x6f6f6f70\(%eax\) 87f: 66 e5 90 [ ]*in \$0x90,%ax 882: 66 e7 90 [ ]*out %ax,\$0x90 @@ -610,8 +610,8 @@ Disassembly of section .text: +[a-f0-9]+: f7 c9 04 00 00 00 test \$(0x)?0*4,%ecx +[a-f0-9]+: c0 f0 02 shl \$0x2,%al +[a-f0-9]+: c1 f0 01 shl \$0x1,%eax - +[a-f0-9]+: d0 f0 shl %al - +[a-f0-9]+: d1 f0 shl %eax + +[a-f0-9]+: d0 f0 shl \$1,%al + +[a-f0-9]+: d1 f0 shl \$1,%eax +[a-f0-9]+: d2 f0 shl %cl,%al +[a-f0-9]+: d3 f0 shl %cl,%eax #pass diff --git a/gas/testsuite/gas/i386/x86-64-lfence-load.d b/gas/testsuite/gas/i386/x86-64-lfence-load.d index b4a03db811d..726236826e8 100644 --- a/gas/testsuite/gas/i386/x86-64-lfence-load.d +++ b/gas/testsuite/gas/i386/x86-64-lfence-load.d @@ -90,7 +90,7 @@ Disassembly of section .text: +[a-f0-9]+: 0f ae e8 lfence +[a-f0-9]+: 58 pop %rax +[a-f0-9]+: 0f ae e8 lfence - +[a-f0-9]+: 66 d1 11 rclw \(%rcx\) + +[a-f0-9]+: 66 d1 11 rclw \$1,\(%rcx\) +[a-f0-9]+: 0f ae e8 lfence +[a-f0-9]+: f7 01 01 00 00 00 testl \$0x1,\(%rcx\) +[a-f0-9]+: 0f ae e8 lfence diff --git a/gas/testsuite/gas/i386/x86-64-opcode.d b/gas/testsuite/gas/i386/x86-64-opcode.d index ee6d0f5f4bd..1b8a9fa9014 100644 --- a/gas/testsuite/gas/i386/x86-64-opcode.d +++ b/gas/testsuite/gas/i386/x86-64-opcode.d @@ -335,9 +335,9 @@ Disassembly of section .text: [ ]*[a-f0-9]+: c0 f0 02 shl \$0x2,%al [ ]*[a-f0-9]+: c1 f0 01 shl \$0x1,%eax [ ]*[a-f0-9]+: 48 c1 f0 01 shl \$0x1,%rax -[ ]*[a-f0-9]+: d0 f0 shl %al -[ ]*[a-f0-9]+: d1 f0 shl %eax -[ ]*[a-f0-9]+: 48 d1 f0 shl %rax +[ ]*[a-f0-9]+: d0 f0 shl \$1,%al +[ ]*[a-f0-9]+: d1 f0 shl \$1,%eax +[ ]*[a-f0-9]+: 48 d1 f0 shl \$1,%rax [ ]*[a-f0-9]+: d2 f0 shl %cl,%al [ ]*[a-f0-9]+: d3 f0 shl %cl,%eax [ ]*[a-f0-9]+: 48 d3 f0 shl %cl,%rax diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 2e2043d467b..e432b61a6cd 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -12090,6 +12090,8 @@ OP_I (instr_info *ins, int bytemode, int sizeflag) case const_1_mode: if (ins->intel_syntax) oappend (ins, "1"); + else + oappend (ins, "$1"); return true; default: oappend (ins, INTERNAL_DISASSEMBLER_ERROR);