2004-12-07 Randolph Chung <tausq@debian.org>

	* frame.c (get_prev_frame): Don't terminate unwinding at main if we
	are unwinding through a dummy frame.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 248197e6905f2d480a9290ab3e350fd4b2873772..d422af496e3d20f94bc690dc10478180e7c96e34 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Randolph Chung  <tausq@debian.org>
+
+       * frame.c (get_prev_frame): Don't terminate unwinding at main if we
+       are unwinding through a dummy frame.
+
 2004-12-07  Randolph Chung  <tausq@debian.org>
 
        * hppa-tdep.h (gdbarch_tdep): Add unwind_adjust_stub method.

diff --git a/gdb/frame.c b/gdb/frame.c
index 25b32f49154b426c80c1a09bfc3253084f17a2b5..b22973059991b56224bd8878f7d1efad08433d77 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1199,7 +1199,18 @@ get_prev_frame (struct frame_info *this_frame)
      get_current_frame().  */
   gdb_assert (this_frame != NULL);
 
+  /* tausq/2004-12-07: Dummy frames are skipped because it doesn't make much
+     sense to stop unwinding at a dummy frame.  One place where a dummy
+     frame may have an address "inside_main_func" is on HPUX.  On HPUX, the
+     pcsqh register (space register for the instruction at the head of the
+     instruction queue) cannot be written directly; the only way to set it
+     is to branch to code that is in the target space.  In order to implement
+     frame dummies on HPUX, the called function is made to jump back to where 
+     the inferior was when the user function was called.  If gdb was inside 
+     the main function when we created the dummy frame, the dummy frame will 
+     point inside the main function.  */
   if (this_frame->level >= 0
+      && get_frame_type (this_frame) != DUMMY_FRAME
       && !backtrace_past_main
       && inside_main_func (this_frame))
     /* Don't unwind past main().  Note, this is done _before_ the