Jason Molenda <jmolenda@apple.com>

* i386-tdep.c (i386_match_insn): Match complete instruction
pattern.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b200e701170a66d9ceb0e327b562869ea7d143ed..eb827f7c05318f6ed5ff48f433f088faf6a731d0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-18  Mark Kettenis  <kettenis@gnu.org>
+           Jason Molenda  <jmolenda@apple.com>
+
+       * i386-tdep.c (i386_match_insn): Match complete instruction
+       pattern.
+
 2005-07-18  Mark Kettenis  <kettenis@gnu.org>
 
        * i386-tdep.c (i386_reg_struct_return_p): Handle structures with a

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 7c047870b3dded89e522ec830a4355caac40c4e8..3fd82a69cebd04668632f79f1ec76ec245d9ac35 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -499,7 +499,8 @@ i386_match_insn (CORE_ADDR pc, struct i386_insn *skip_insns)
     {
       if ((op & insn->mask[0]) == insn->insn[0])
        {
-         unsigned char buf[I386_MAX_INSN_LEN - 1];
+         gdb_byte buf[I386_MAX_INSN_LEN - 1];
+         int insn_matched = 1;
          size_t i;
 
          gdb_assert (insn->len > 1);
@@ -509,10 +510,11 @@ i386_match_insn (CORE_ADDR pc, struct i386_insn *skip_insns)
          for (i = 1; i < insn->len; i++)
            {
              if ((buf[i - 1] & insn->mask[i]) != insn->insn[i])
-               break;
-
-             return insn;
+               insn_matched = 0;
            }
+
+         if (insn_matched)
+           return insn;
        }
     }