opcodes/

2005-04-01  Jan Beulich  <jbeulich@novell.com>

	* i386-dis.c (PNI_Fixup): Neither mwait nor monitor have any
	visible operands in Intel mode. The first operand of monitor is
	%rax in 64-bit mode.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index b1ea8751022cea2b083b81c40b14c7137b333f41..d289c15085dcd9a629f2e79c601f3a0ebd413b39 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-01  Jan Beulich  <jbeulich@novell.com>
+
+       * i386-dis.c (PNI_Fixup): Neither mwait nor monitor have any
+       visible operands in Intel mode. The first operand of monitor is
+       %rax in 64-bit mode.
+
 2005-04-01  Jan Beulich  <jbeulich@novell.com>
 
        * i386-dis.c (INVLPG_Fixup): Decode rdtscp; change code to allow for

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index d48e6de46d7bb5315eb1ab5fea78a9a104494a6c..d3acb84138f5ead4509e4ddb2b3a1afe2416c6f1 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -4374,16 +4374,32 @@ PNI_Fixup (int extrachar ATTRIBUTE_UNUSED, int sizeflag)
        {
          /* mwait %eax,%ecx  */
          strcpy (p, "mwait");
+         if (!intel_syntax)
+           strcpy (op1out, names32[0]);
        }
       else
        {
          /* monitor %eax,%ecx,%edx"  */
          strcpy (p, "monitor");
-         strcpy (op3out, names32[2]);
+         if (!intel_syntax)
+           {
+             if (!mode_64bit)
+               strcpy (op1out, names32[0]);
+             else if (!(prefixes & PREFIX_ADDR))
+               strcpy (op1out, names64[0]);
+             else
+               {
+                 strcpy (op1out, names32[0]);
+                 used_prefixes |= PREFIX_ADDR;
+               }
+             strcpy (op3out, names32[2]);
+           }
+       }
+      if (!intel_syntax)
+       {
+         strcpy (op2out, names32[1]);
+         two_source_ops = 1;
        }
-      strcpy (op1out, names32[0]);
-      strcpy (op2out, names32[1]);
-      two_source_ops = 1;
 
       codep++;
     }