gas/testsuite/

2005-07-18  H.J. Lu  <hongjiu.lu@intel.com>

	* gas/i386/i386.exp: Add suffix.

	* gas/i386/suffix.d: New file.
	* gas/i386/suffix.s: Likewise.

opcodes/

2005-07-18  H.J. Lu  <hongjiu.lu@intel.com>

	* i386-dis.c (PNI_Fixup): Update comment.
	(VMX_Fixup): Properly handle the suffix check.

6 files changed, 44 insertions, 3 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fffbdf9..6added2 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/i386.exp: Add suffix.
+
+	* gas/i386/suffix.d: New file.
+	* gas/i386/suffix.s: Likewise.
+
 2005-07-18  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* gas/hppa/basic/fp_comp.s: Add level 1.1 directive.
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 8cafb0a..6e0340d 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -61,6 +61,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "prescott"
     run_dump_test "sib"
     run_dump_test "vmx"
+    run_dump_test "suffix"
 
     if {![istarget "*-*-aix*"]
 	&& (![is_elf_format] || [istarget "*-*-linux*"]
diff --git a/gas/testsuite/gas/i386/suffix.d b/gas/testsuite/gas/i386/suffix.d
new file mode 100644
index 0000000..fa57bb7
--- /dev/null
+++ b/gas/testsuite/gas/i386/suffix.d
@@ -0,0 +1,15 @@
+#objdump: -dw -Msuffix
+#name: i386 suffix
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <foo>:
+   0:	0f 01 c8 [ 	]*monitor %eax,%ecx,%edx
+   3:	0f 01 c9 [ 	]*mwait  %eax,%ecx
+   6:	0f 01 c1 [ 	]*vmcall 
+   9:	0f 01 c2 [ 	]*vmlaunch 
+   c:	0f 01 c3 [ 	]*vmresume 
+   f:	0f 01 c4 [ 	]*vmxoff 
+	...
diff --git a/gas/testsuite/gas/i386/suffix.s b/gas/testsuite/gas/i386/suffix.s
new file mode 100644
index 0000000..2ce1c3d
--- /dev/null
+++ b/gas/testsuite/gas/i386/suffix.s
@@ -0,0 +1,13 @@
+# Disassembling with -Msuffix.
+
+	.text
+foo:
+	monitor
+	mwait
+
+	vmcall
+	vmlaunch
+	vmresume
+	vmxoff
+
+	.p2align	4,0
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index b9c82c7..4bfb679 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (PNI_Fixup): Update comment.
+	(VMX_Fixup): Properly handle the suffix check.
+
 2005-07-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* hppa-dis.c (print_insn_hppa): Add space after 'w' in wide-mode
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 692562d..ae16759 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -4419,7 +4419,7 @@ PNI_Fixup (int extrachar ATTRIBUTE_UNUSED, int sizeflag)
       /* Override "sidt".  */
       char *p = obuf + strlen (obuf) - 4;
 
-      /* We might have a suffix.  */
+      /* We might have a suffix when disassembling with -Msuffix.  */
       if (*p == 'i')
 	--p;
 
@@ -4617,8 +4617,8 @@ VMX_Fixup (int extrachar ATTRIBUTE_UNUSED, int sizeflag)
       /* Override "sgdt".  */
       char *p = obuf + strlen (obuf) - 4;
 
-      /* We might have a suffix.  */
-      if (*p == 'i')
+      /* We might have a suffix when disassembling with -Msuffix.  */
+      if (*p == 'g')
 	--p;
 
       switch (rm)