From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <binutils-return-56268-listarch-binutils=sources.redhat.com@sourceware.org>
Received: (qmail 1627 invoked by alias); 28 Aug 2008 10:29:08 -0000
Received: (qmail 1614 invoked by uid 22791); 28 Aug 2008 10:29:07 -0000
X-Spam-Check-By: sourceware.org
Received: from vpn.id2.novell.com (HELO vpn.id2.novell.com) (195.33.99.129)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 28 Aug 2008 10:28:33 +0000
Received: from EMEA1-MTA by vpn.id2.novell.com 	with Novell_GroupWise; Thu, 28 Aug 2008 11:28:30 +0100
Message-Id: <48B69A39.76E4.0078.0@novell.com>
X-Mailer: Novell GroupWise Internet Agent 8.0.0 Beta
Date: Sat, 30 Aug 2008 18:11:00 -0000
From: "Jan Beulich" <jbeulich@novell.com>
To: <binutils@sourceware.org>
Subject: [PATCH] x86: add suffixes to cmovXX disassembly
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
X-IsSubscribed: yes
Mailing-List: contact binutils-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <binutils.sourceware.org>
List-Subscribe: <mailto:binutils-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/binutils/>
List-Post: <mailto:binutils@sourceware.org>
List-Help: <mailto:binutils-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: binutils-owner@sourceware.org
X-SW-Source: 2008-08/txt/msg00283.txt.bz2

Built and tested on i686-pc-linux-gnu.

gas/testsuite/
2008-08-28  Jan Beulich  <jbeulich@novell.com>

	* gas/i386/gas/i386/opcode-suffix.d: Add suffixes to cmovXX.

opcodes/
2008-08-28  Jan Beulich  <jbeulich@novell.com>

	* i386-dis.c (dis386_twobyte): Adjust cmovXX mnemonics.

--- 2008-08-27/gas/testsuite/gas/i386/opcode-suffix.d	2007-05-02 11:04:08.0=
00000000 +0200
+++ 2008-08-27/gas/testsuite/gas/i386/opcode-suffix.d	2008-08-28 12:06:31.0=
00000000 +0200
@@ -266,22 +266,22 @@ Disassembly of section .text:
  *[0-9a-f]+:	0f 31[ 	]+rdtsc[ 	]+
  *[0-9a-f]+:	0f 32[ 	]+rdmsr[ 	]+
  *[0-9a-f]+:	0f 33[ 	]+rdpmc[ 	]+
- *[0-9a-f]+:	0f 40 90 90 90 90 90[ 	]+cmovo[ 	]+-0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 41 90 90 90 90 90[ 	]+cmovno -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 42 90 90 90 90 90[ 	]+cmovb[ 	]+-0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 43 90 90 90 90 90[ 	]+cmovae -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 44 90 90 90 90 90[ 	]+cmove[ 	]+-0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 45 90 90 90 90 90[ 	]+cmovne -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 46 90 90 90 90 90[ 	]+cmovbe -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 47 90 90 90 90 90[ 	]+cmova[ 	]+-0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 48 90 90 90 90 90[ 	]+cmovs[ 	]+-0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 49 90 90 90 90 90[ 	]+cmovns -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 4a 90 90 90 90 90[ 	]+cmovp[ 	]+-0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 4b 90 90 90 90 90[ 	]+cmovnp -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 4c 90 90 90 90 90[ 	]+cmovl[ 	]+-0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 4d 90 90 90 90 90[ 	]+cmovge -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 4e 90 90 90 90 90[ 	]+cmovle -0x6f6f6f70\(%eax\),%edx
- *[0-9a-f]+:	0f 4f 90 90 90 90 90[ 	]+cmovg[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 40 90 90 90 90 90[ 	]+cmovol[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 41 90 90 90 90 90[ 	]+cmovnol -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 42 90 90 90 90 90[ 	]+cmovbl[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 43 90 90 90 90 90[ 	]+cmovael -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 44 90 90 90 90 90[ 	]+cmovel[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 45 90 90 90 90 90[ 	]+cmovnel -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 46 90 90 90 90 90[ 	]+cmovbel -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 47 90 90 90 90 90[ 	]+cmoval[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 48 90 90 90 90 90[ 	]+cmovsl[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 49 90 90 90 90 90[ 	]+cmovnsl -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 4a 90 90 90 90 90[ 	]+cmovpl[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 4b 90 90 90 90 90[ 	]+cmovnpl -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 4c 90 90 90 90 90[ 	]+cmovll[ 	]+-0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 4d 90 90 90 90 90[ 	]+cmovgel -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 4e 90 90 90 90 90[ 	]+cmovlel -0x6f6f6f70\(%eax\),%edx
+ *[0-9a-f]+:	0f 4f 90 90 90 90 90[ 	]+cmovgl[ 	]+-0x6f6f6f70\(%eax\),%edx
  *[0-9a-f]+:	0f 60 90 90 90 90 90[ 	]+punpcklbw -0x6f6f6f70\(%eax\),%mm2
  *[0-9a-f]+:	0f 61 90 90 90 90 90[ 	]+punpcklwd -0x6f6f6f70\(%eax\),%mm2
  *[0-9a-f]+:	0f 62 90 90 90 90 90[ 	]+punpckldq -0x6f6f6f70\(%eax\),%mm2
@@ -535,22 +535,22 @@ Disassembly of section .text:
  *[0-9a-f]+:	66 ff 90 90 90 90 90[ 	]+callw[ 	]+\*-0x6f6f6f70\(%eax\)
  *[0-9a-f]+:	66 0f 02 90 90 90 90 90[ 	]+larw[ 	]+-0x6f6f6f70\(%eax\),%dx
  *[0-9a-f]+:	66 0f 03 90 90 90 90 90[ 	]+lslw[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 40 90 90 90 90 90[ 	]+cmovo[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 41 90 90 90 90 90[ 	]+cmovno -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 42 90 90 90 90 90[ 	]+cmovb[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 43 90 90 90 90 90[ 	]+cmovae -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 44 90 90 90 90 90[ 	]+cmove[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 45 90 90 90 90 90[ 	]+cmovne -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 46 90 90 90 90 90[ 	]+cmovbe -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 47 90 90 90 90 90[ 	]+cmova[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 48 90 90 90 90 90[ 	]+cmovs[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 49 90 90 90 90 90[ 	]+cmovns -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 4a 90 90 90 90 90[ 	]+cmovp[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 4b 90 90 90 90 90[ 	]+cmovnp -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 4c 90 90 90 90 90[ 	]+cmovl[ 	]+-0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 4d 90 90 90 90 90[ 	]+cmovge -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 4e 90 90 90 90 90[ 	]+cmovle -0x6f6f6f70\(%eax\),%dx
- *[0-9a-f]+:	66 0f 4f 90 90 90 90 90[ 	]+cmovg[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 40 90 90 90 90 90[ 	]+cmovow[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 41 90 90 90 90 90[ 	]+cmovnow -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 42 90 90 90 90 90[ 	]+cmovbw[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 43 90 90 90 90 90[ 	]+cmovaew -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 44 90 90 90 90 90[ 	]+cmovew[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 45 90 90 90 90 90[ 	]+cmovnew -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 46 90 90 90 90 90[ 	]+cmovbew -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 47 90 90 90 90 90[ 	]+cmovaw[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 48 90 90 90 90 90[ 	]+cmovsw[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 49 90 90 90 90 90[ 	]+cmovnsw -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 4a 90 90 90 90 90[ 	]+cmovpw[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 4b 90 90 90 90 90[ 	]+cmovnpw -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 4c 90 90 90 90 90[ 	]+cmovlw[ 	]+-0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 4d 90 90 90 90 90[ 	]+cmovgew -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 4e 90 90 90 90 90[ 	]+cmovlew -0x6f6f6f70\(%eax\),%dx
+ *[0-9a-f]+:	66 0f 4f 90 90 90 90 90[ 	]+cmovgw[ 	]+-0x6f6f6f70\(%eax\),%dx
  *[0-9a-f]+:	66 0f a0[ 	]+pushw[ 	]+%fs
  *[0-9a-f]+:	66 0f a1[ 	]+popw[ 	]+%fs
  *[0-9a-f]+:	66 0f a3 90 90 90 90 90[ 	]+btw[ 	]+%dx,-0x6f6f6f70\(%eax\)
--- 2008-08-27/opcodes/i386-dis.c	2008-08-27 15:34:09.000000000 +0200
+++ 2008-08-27/opcodes/i386-dis.c	2008-08-28 12:06:31.000000000 +0200
@@ -1666,23 +1666,23 @@ static const struct dis386 dis386_twobyt
   { "(bad)",		{ XX } },
   { "(bad)",		{ XX } },
   /* 40 */
-  { "cmovo",		{ Gv, Ev } },
-  { "cmovno",		{ Gv, Ev } },
-  { "cmovb",		{ Gv, Ev } },
-  { "cmovae",		{ Gv, Ev } },
-  { "cmove",		{ Gv, Ev } },
-  { "cmovne",		{ Gv, Ev } },
-  { "cmovbe",		{ Gv, Ev } },
-  { "cmova",		{ Gv, Ev } },
+  { "cmovoS",		{ Gv, Ev } },
+  { "cmovnoS",		{ Gv, Ev } },
+  { "cmovbS",		{ Gv, Ev } },
+  { "cmovaeS",		{ Gv, Ev } },
+  { "cmoveS",		{ Gv, Ev } },
+  { "cmovneS",		{ Gv, Ev } },
+  { "cmovbeS",		{ Gv, Ev } },
+  { "cmovaS",		{ Gv, Ev } },
   /* 48 */
-  { "cmovs",		{ Gv, Ev } },
-  { "cmovns",		{ Gv, Ev } },
-  { "cmovp",		{ Gv, Ev } },
-  { "cmovnp",		{ Gv, Ev } },
-  { "cmovl",		{ Gv, Ev } },
-  { "cmovge",		{ Gv, Ev } },
-  { "cmovle",		{ Gv, Ev } },
-  { "cmovg",		{ Gv, Ev } },
+  { "cmovsS",		{ Gv, Ev } },
+  { "cmovnsS",		{ Gv, Ev } },
+  { "cmovpS",		{ Gv, Ev } },
+  { "cmovnpS",		{ Gv, Ev } },
+  { "cmovlS",		{ Gv, Ev } },
+  { "cmovgeS",		{ Gv, Ev } },
+  { "cmovleS",		{ Gv, Ev } },
+  { "cmovgS",		{ Gv, Ev } },
   /* 50 */
   { MOD_TABLE (MOD_0F51) },
   { PREFIX_TABLE (PREFIX_0F51) },