Approved by fnasser@redhat.com:

	2002-01-21  Fred Fish  <fnf@redhat.com>
	* arm-tdep.c (thumb_skip_prologue): Quit scanning prologue
	when we have found all instructions we are looking for.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4fdc0eb439f8af53f97f7c613ba41a3a8638af53..62cdb39dcb5e88a3cb503a3b03215bdaccd7d53f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-21  Fred Fish  <fnf@redhat.com>
+
+       * arm-tdep.c (thumb_skip_prologue): Quit scanning prologue
+       when we have found all instructions we are looking for.
+
 2002-01-21  Richard Earnshaw  <rearnsha@arm.com>
 
        * arm-tdep.c (arm_register_name): New function.

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a7aa6263f7885bb5ef6f97b34c8b5bdb0e35eddc..15ae2d35283a4406ffe3db0af25b23e682a7d963 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -375,6 +375,10 @@ thumb_skip_prologue (CORE_ADDR pc, CORE_ADDR func_end)
        {
          findmask |= 2;  /* setting of r7 found */
        }
+      else if (findmask == (4+2+1))
+       {
+         break;        /* We have found one of each type of prologue instruction */
+       }
       else
        continue;       /* something in the prolog that we don't care about or some
                           instruction from outside the prolog scheduled here for optimization */