2002-11-24 Andrew Cagney <ac131313@redhat.com>

	* frame.c (set_unwind_by_pc): Revert change below, use
	PC_IN_CALL_DUMMY.
	(get_prev_frame): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fad9fa93a9a6d3c3de32a4718242c93077978038..3f33d39f47a4193d9c06d7117c99a372588156f4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-24  Andrew Cagney  <ac131313@redhat.com>
+
+       * frame.c (set_unwind_by_pc): Revert change below, use
+       PC_IN_CALL_DUMMY.
+       (get_prev_frame): Ditto.
+
 2002-11-24  Andrew Cagney  <ac131313@redhat.com>
 
        * dummy-frame.c (pc_in_dummy_frame): New function.

diff --git a/gdb/frame.c b/gdb/frame.c
index e45dcf87db59c1e14008c0ac253b722455e7ae29..ba692c5b3e8d27b178d5ece02530454e6e345dc7 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -656,7 +656,11 @@ set_unwind_by_pc (CORE_ADDR pc, CORE_ADDR fp,
       *unwind_register = frame_saved_regs_register_unwind;
       *unwind_pc = frame_saved_regs_pc_unwind;
     }
-  else if (pc_in_dummy_frame (pc))
+  /* FIXME: cagney/2002-11-24: Can't yet directly call
+     pc_in_dummy_frame() as some architectures don't set
+     PC_IN_CALL_DUMMY() to generic_pc_in_call_dummy() (remember the
+     latter is implemented by simply calling pc_in_dummy_frame).  */
+  else if (PC_IN_CALL_DUMMY (pc, 0, 0))
     {
       *unwind_register = dummy_frame_register_unwind;
       *unwind_pc = dummy_frame_pc_unwind;
@@ -694,7 +698,11 @@ create_new_frame (CORE_ADDR addr, CORE_ADDR pc)
      has previously set it.  This is really somewhat bogus.  The
      initialization, as seen in create_new_frame(), should occur
      before the INIT function has been called.  */
-  if (USE_GENERIC_DUMMY_FRAMES && pc_in_dummy_frame (pc))
+  /* FIXME: cagney/2002-11-24: Can't yet directly call
+     pc_in_dummy_frame() as some architectures don't set
+     PC_IN_CALL_DUMMY() to generic_pc_in_call_dummy() (remember the
+     latter is implemented by simply calling pc_in_dummy_frame).  */
+  if (USE_GENERIC_DUMMY_FRAMES && PC_IN_CALL_DUMMY (pc, 0, 0))
     /* NOTE: cagney/2002-11-11: Does this even occure?  */
     type = DUMMY_FRAME;
   else
@@ -975,8 +983,11 @@ get_prev_frame (struct frame_info *next_frame)
      has previously set it.  This is really somewhat bogus.  The
      initialization, as seen in create_new_frame(), should occur
      before the INIT function has been called.  */
-  if (USE_GENERIC_DUMMY_FRAMES
-      && pc_in_dummy_frame (prev->pc))
+  /* FIXME: cagney/2002-11-24: Can't yet directly call
+     pc_in_dummy_frame() as some architectures don't set
+     PC_IN_CALL_DUMMY() to generic_pc_in_call_dummy() (remember the
+     latter is implemented by simply calling pc_in_dummy_frame).  */
+  if (USE_GENERIC_DUMMY_FRAMES && PC_IN_CALL_DUMMY (prev->pc, 0, 0))
     prev->type = DUMMY_FRAME;
   else
     {