2006-11-09 H.J. Lu <hongjiu.lu@intel.com>

	* i386-dis.c (print_insn): Check PREFIX_REPNZ before
	PREFIX_DATA when prefix user table is used.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 6499aea2cbf0ebd9d86629eefb4334512f391119..727170ee7c118a7bd0c5b33ecd7da724a77901a4 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * i386-dis.c (print_insn): Check PREFIX_REPNZ before
+       PREFIX_DATA when prefix user table is used.
+
 2006-11-09  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-dis.c (twobyte_uses_SSE_prefix): Renamed to ...

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 0da2446f15ebaa1e61f92704ddf964e78470495f..caac903ca2fcbc00fcd880e2786b72749e95c866 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -3139,14 +3139,16 @@ print_insn (bfd_vma pc, disassemble_info *info)
                index = 1;
              else
                {
-                 used_prefixes |= (prefixes & PREFIX_DATA);
-                 if (prefixes & PREFIX_DATA)
-                   index = 2;
+                 /* We should check PREFIX_REPNZ and PREFIX_REPZ
+                    before PREFIX_DATA.  */
+                 used_prefixes |= (prefixes & PREFIX_REPNZ);
+                 if (prefixes & PREFIX_REPNZ)
+                   index = 3;
                  else
                    {
-                     used_prefixes |= (prefixes & PREFIX_REPNZ);
-                     if (prefixes & PREFIX_REPNZ)
-                       index = 3;
+                     used_prefixes |= (prefixes & PREFIX_DATA);
+                     if (prefixes & PREFIX_DATA)
+                       index = 2;
                    }
                }
              dp = &prefix_user_table[dp->bytemode2][index];