diff options
| author | Jan Beulich <jbeulich@novell.com> | 2005-04-01 16:06:40 +0000 |
|---|---|---|
| committer | Jan Beulich <jbeulich@novell.com> | 2005-04-01 16:06:40 +0000 |
| commit | cd91460a54d0edf36faae621902f57a0c3395482 (patch) | |
| tree | 44cf715cac63a6890476ece74c44fa1bfe30b7dd | |
| parent | 69093260dc0959b45c1dcf04c1dfbfdeaf7cf947 (diff) | |
| download | gdb-cd91460a54d0edf36faae621902f57a0c3395482.tar.gz | |
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.
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/i386-dis.c | 24 |
2 files changed, 26 insertions, 4 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b1ea8751022..d289c15085d 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,11 @@ 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 easier future additions. diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index d48e6de46d7..d3acb84138f 100644 --- 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++; } |