2004-03-22 Andrew Cagney <cagney@redhat.com>

	* frame.h (generic_pop_current_frame): Delete declaration.
	(deprecate_pop_dummy_frame): Deprecate
	generic_pop_dummy_frame.
	* dummy-frame.c (deprecated_pop_dummy_frame): Update.
	(generic_pop_current_frame): Delete function.
	* mn10300-tdep.c (mn10300_pop_frame): Eliminate call to
	generic_pop_current_frame.
	* v850-tdep.c (v850_pop_frame): Update.
	* mcore-tdep.c (mcore_pop_frame): Update.
	* sh64-tdep.c (sh64_pop_frame): Update.
	* h8300-tdep.c (h8300_pop_frame): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8062186f06cd5b9b32e6dc39577e8bd8ef6876ff..8b55d42a23e951cbce452f65978b12011d7b92f3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-22  Andrew Cagney  <cagney@redhat.com>
+
+       * frame.h (generic_pop_current_frame): Delete declaration.
+       (deprecate_pop_dummy_frame): Deprecate
+       generic_pop_dummy_frame.
+       * dummy-frame.c (deprecated_pop_dummy_frame): Update.
+       (generic_pop_current_frame): Delete function.
+       * mn10300-tdep.c (mn10300_pop_frame): Eliminate call to
+       generic_pop_current_frame.
+       * v850-tdep.c (v850_pop_frame): Update.
+       * mcore-tdep.c (mcore_pop_frame): Update.
+       * sh64-tdep.c (sh64_pop_frame): Update.
+       * h8300-tdep.c (h8300_pop_frame): Update.
+
 2004-03-22  Andrew Cagney  <cagney@redhat.com>
 
        * frame.h (deprecated_pc_in_call_dummy): Rename

diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 66918b6d219586ffbfecd3fbeb15750cce3e21b6..2c5153ebe20d7e94e546eb4dccb3dd5e77022e95 100644 (file)
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -256,21 +256,6 @@ generic_save_call_dummy_addr (CORE_ADDR lo, CORE_ADDR hi)
   dummy_frame_stack->call_hi = hi;
 }
 
-/* Restore the machine state from either the saved dummy stack or a
-   real stack frame. */
-
-void
-generic_pop_current_frame (void (*popper) (struct frame_info * frame))
-{
-  struct frame_info *frame = get_current_frame ();
-  if (get_frame_type (frame) == DUMMY_FRAME)
-    /* NOTE: cagney/2002-22-23: Does this ever occure?  Surely a dummy
-       frame will have already been poped by the "infrun.c" code.  */
-    generic_pop_dummy_frame ();
-  else
-    (*popper) (frame);
-}
-
 /* Discard the innermost dummy frame from the dummy frame stack
    (passed in as a parameter).  */
 
@@ -284,7 +269,7 @@ discard_innermost_dummy (struct dummy_frame **stack)
 }
 
 void
-generic_pop_dummy_frame (void)
+deprecated_pop_dummy_frame (void)
 {
   struct dummy_frame *dummy_frame = dummy_frame_stack;
 

diff --git a/gdb/frame.h b/gdb/frame.h
index 8d7ff1a88b4e3234b273c2b4bbe4296e361dced8..927403a134984bba9de6709bab6eec74573ec4a9 100644 (file)
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -565,8 +565,7 @@ extern struct frame_info *block_innermost_frame (struct block *);
 extern CORE_ADDR deprecated_read_register_dummy (CORE_ADDR pc,
                                                 CORE_ADDR fp, int);
 extern void generic_push_dummy_frame (void);
-extern void generic_pop_current_frame (void (*)(struct frame_info *));
-extern void generic_pop_dummy_frame (void);
+extern void deprecated_pop_dummy_frame (void);
 
 extern int deprecated_pc_in_call_dummy (CORE_ADDR pc, CORE_ADDR sp,
                                        CORE_ADDR fp);

diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index d15c43582be52898a7c8835bbcd4207ba2e53d10..c6f55f887fdc509b7603800c25d1a9e857a3f627 100644 (file)
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -743,7 +743,7 @@ h8300_pop_frame (void)
                                   get_frame_base (frame),
                                   get_frame_base (frame)))
     {
-      generic_pop_dummy_frame ();
+      deprecated_pop_dummy_frame ();
     }
   else
     {

diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c
index 6e3df980fd4936064742d9f3174b3d755c7f44d9..321ba696094e6c07b13d1482285c5612992da5a0 100644 (file)
--- a/gdb/mcore-tdep.c
+++ b/gdb/mcore-tdep.c
@@ -752,7 +752,7 @@ mcore_pop_frame (void)
 
   if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (fi), get_frame_base (fi),
                                   get_frame_base (fi)))
-    generic_pop_dummy_frame ();
+    deprecated_pop_dummy_frame ();
   else
     {
       /* Write out the PC we saved. */

diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 21f506947edb5a6125d287d653101e9e088c6a1b..5e3a5f82bd3dc3a8016464540e014e0de21d5c6e 100644 (file)
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -749,10 +749,13 @@ mn10300_pop_frame_regular (struct frame_info *frame)
 static void
 mn10300_pop_frame (void)
 {
-  /* This function checks for and handles generic dummy frames, and
-     calls back to our function for ordinary frames.  */
-  generic_pop_current_frame (mn10300_pop_frame_regular);
-
+  struct frame_info *frame = get_current_frame ();
+  if (get_frame_type (frame) == DUMMY_FRAME)
+    /* NOTE: cagney/2002-22-23: Does this ever occure?  Surely a dummy
+       frame will have already been poped by the "infrun.c" code.  */
+    deprecated_pop_dummy_frame ();
+  else
+    mn10300_pop_frame_regular (frame);
   /* Throw away any cached frame information.  */
   flush_cached_frames ();
 }

diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index f0fba0dc63d707d4937f2a909630bbaacc9c2d59..1d7b313ab1c5ec70c2225cc8eb2be779c9f04267 100644 (file)
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -1373,7 +1373,7 @@ sh64_pop_frame (void)
   if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (frame),
                                   get_frame_base (frame),
                                   get_frame_base (frame)))
-    generic_pop_dummy_frame ();
+    deprecated_pop_dummy_frame ();
   else
     {
       fp = get_frame_base (frame);

diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index c4c5978eed289e7351383b9b140a6d4e30eb626b..948143cc2c07a0931f3dc2bf014732a441738523 100644 (file)
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -885,7 +885,7 @@ v850_pop_frame (void)
   if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (frame),
                                   get_frame_base (frame),
                                   get_frame_base (frame)))
-    generic_pop_dummy_frame ();
+    deprecated_pop_dummy_frame ();
   else
     {
       write_register (E_PC_REGNUM, DEPRECATED_FRAME_SAVED_PC (frame));

diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 33c8b4ef0c33047807254dda0f2527a420e71330..9e7b016f1c6fe3afe307ee48b90f0e72f5538448 100644 (file)
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -326,7 +326,7 @@ xstormy16_pop_frame (void)
   if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (fi), get_frame_base (fi),
                                   get_frame_base (fi)))
     {
-      generic_pop_dummy_frame ();
+      deprecated_pop_dummy_frame ();
     }
   else
     {