Don't let a branch unit nop terminate the prologue scan.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2685dd2..f36ef5a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-31  Kevin Buettner  <kevinb@redhat.com>
+
+       * ia64-tdep.c (examine_prologue): Don't let a branch unit nop
+       terminate the prologue scan.
+
 2001-08-30  Jim Blandy  <jimb@redhat.com>
 
        * symfile.c (sections_overlap): New function.

diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 2a01809..9bbf317 100644 (file)
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -860,10 +860,11 @@ examine_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct frame_info *frame)
       if (next_pc == 0)
        break;
 
-      if (it == B || ((instr & 0x3fLL) != 0LL))
+      if ((it == B && ((instr & 0x1e1f800003f) != 0x04000000000))
+          || ((instr & 0x3fLL) != 0LL))
        {
-         /* Exit loop upon hitting a branch instruction or a predicated
-            instruction. */
+         /* Exit loop upon hitting a non-nop branch instruction 
+            or a predicated instruction. */
          break;
        }
       else if (it == I && ((instr & 0x1eff8000000LL) == 0x00188000000LL))