This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[commit] eliminate generic_pop_current_frame


FYI,

Only the mn10300 was using generic_pop_current_frame so I inlined the call. That left generic_pop_dummy_frame but that interface was made redundant by the new frame unwind mechanism -> deprecate it so this is clear.

committed,
Andrew
Index: ChangeLog
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.

Index: dummy-frame.c
===================================================================
RCS file: /cvs/src/src/gdb/dummy-frame.c,v
retrieving revision 1.28
diff -u -r1.28 dummy-frame.c
--- dummy-frame.c	22 Mar 2004 15:36:44 -0000	1.28
+++ dummy-frame.c	22 Mar 2004 16:56:54 -0000
@@ -256,21 +256,6 @@
   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 @@
 }
 
 void
-generic_pop_dummy_frame (void)
+deprecated_pop_dummy_frame (void)
 {
   struct dummy_frame *dummy_frame = dummy_frame_stack;
 
Index: frame.h
===================================================================
RCS file: /cvs/src/src/gdb/frame.h,v
retrieving revision 1.120
diff -u -r1.120 frame.h
--- frame.h	22 Mar 2004 15:36:46 -0000	1.120
+++ frame.h	22 Mar 2004 16:56:54 -0000
@@ -565,8 +565,7 @@
 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);
Index: h8300-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/h8300-tdep.c,v
retrieving revision 1.92
diff -u -r1.92 h8300-tdep.c
--- h8300-tdep.c	16 Feb 2004 21:49:21 -0000	1.92
+++ h8300-tdep.c	22 Mar 2004 16:56:54 -0000
@@ -743,7 +743,7 @@
 				   get_frame_base (frame),
 				   get_frame_base (frame)))
     {
-      generic_pop_dummy_frame ();
+      deprecated_pop_dummy_frame ();
     }
   else
     {
Index: mcore-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mcore-tdep.c,v
retrieving revision 1.85
diff -u -r1.85 mcore-tdep.c
--- mcore-tdep.c	14 Feb 2004 15:46:33 -0000	1.85
+++ mcore-tdep.c	22 Mar 2004 16:56:55 -0000
@@ -752,7 +752,7 @@
 
   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. */
Index: mn10300-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mn10300-tdep.c,v
retrieving revision 1.102
diff -u -r1.102 mn10300-tdep.c
--- mn10300-tdep.c	22 Mar 2004 01:43:32 -0000	1.102
+++ mn10300-tdep.c	22 Mar 2004 16:56:55 -0000
@@ -749,10 +749,13 @@
 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 ();
 }
Index: sh64-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sh64-tdep.c,v
retrieving revision 1.23
diff -u -r1.23 sh64-tdep.c
--- sh64-tdep.c	16 Feb 2004 21:49:22 -0000	1.23
+++ sh64-tdep.c	22 Mar 2004 16:56:56 -0000
@@ -1373,7 +1373,7 @@
   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);
Index: v850-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/v850-tdep.c,v
retrieving revision 1.82
diff -u -r1.82 v850-tdep.c
--- v850-tdep.c	14 Feb 2004 15:46:33 -0000	1.82
+++ v850-tdep.c	22 Mar 2004 16:56:56 -0000
@@ -885,7 +885,7 @@
   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));
Index: xstormy16-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v
retrieving revision 1.73
diff -u -r1.73 xstormy16-tdep.c
--- xstormy16-tdep.c	14 Feb 2004 15:46:33 -0000	1.73
+++ xstormy16-tdep.c	22 Mar 2004 16:56:57 -0000
@@ -326,7 +326,7 @@
   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
     {

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]