* breakpoint.c, breakpoint.h (breakpoint_init_inferior): New function

	that clears the `inserted' flag for all breakpoints and deletes
	any breakpoints which should go away between runs of programs.
	* inflow.c (generic_mourn_inferior), infrun.c (init_wait_for_inferior),
	remote-es.c (es1800_load), comments in exec.c and corelow.c:
	Use it instead of mark_breakpoints_out.
	* breakpoint.c (mark_breakpoints_out):  Update comment, tm-rs6000.h
	uses it in a completely different context.
	* breakpoint.c (breakpoint_re_set_one):  Add bp_call_dummy case.

1 files changed, 3 insertions, 10 deletions

diff --git a/gdb/inflow.c b/gdb/inflow.c
index fddfe84..b484466 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -469,7 +469,7 @@ generic_mourn_inferior ()
 {
   inferior_pid = 0;
   attach_flag = 0;
-  mark_breakpoints_out ();
+  breakpoint_init_inferior ();
   registers_changed ();
 
 #ifdef CLEAR_DEFERRED_STORES
@@ -478,15 +478,8 @@ generic_mourn_inferior ()
 #endif
 
   reopen_exec_file ();
-  flush_cached_frames ();
-  if (target_has_stack) {
-    set_current_frame ( create_new_frame (read_register (FP_REGNUM),
-					  read_pc ()));
-    select_frame (get_current_frame (), 0);
-  } else {
-    set_current_frame (0);
-    select_frame ((FRAME) 0, -1);
-  }
+  reinit_frame_cache ();
+
   /* It is confusing to the user for ignore counts to stick around
      from previous runs of the inferior.  So clear them.  */
   breakpoint_clear_ignore_counts ();