[SCM] archer-jankratochvil-bpstat_what: minor fixups

[SCM] archer-jankratochvil-bpstat_what: minor fixups

[jkratoch]

The branch, archer-jankratochvil-bpstat_what has been updated
       via  2bc825d3924008e3517dbefef64c0db752aeeae0 (commit)
      from  68980f4de7dae26acc99176c31ae4621426749d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 2bc825d3924008e3517dbefef64c0db752aeeae0
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue May 18 10:05:05 2010 +0200

    minor fixups

-----------------------------------------------------------------------

Summary of changes:
 gdb/breakpoint.c |    6 +-----
 gdb/breakpoint.h |    4 +++-
 gdb/infrun.c     |   17 +++++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ef06259..37829d3 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4234,7 +4234,7 @@ bpstat_what_merge (struct bpstat_what a, struct bpstat_what b)
 
 /* Prepare WHAT final decision for infrun.  */
 
-static void
+void
 bpstat_what_finalize (struct bpstat_what *what)
 {
   if (what->print_frame == pf_default)
@@ -4449,10 +4449,6 @@ bpstat_what (bpstat bs)
       target_terminal_inferior ();
     }
 
-  bpstat_what_debug (retval, _("summary"), 1);
-
-  bpstat_what_finalize (&retval);
-
   return retval;
 }
 
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 25adeaf..3779a6a 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -637,7 +637,9 @@ enum print_stop_action
 
 /* Tell what to do about this list of bpstats.  */
 struct bpstat_what bpstat_what (bpstat);
-\f
+
+void bpstat_what_finalize (struct bpstat_what *what);
+
 /* Find the bpstat associated with a breakpoint.  NULL otherwise. */
 bpstat bpstat_find_breakpoint (bpstat, struct breakpoint *);
 
diff --git a/gdb/infrun.c b/gdb/infrun.c
index fa22006..6e30157 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2884,6 +2884,19 @@ bpstat_what_debug (struct bpstat_what what, const char *event,
     fprintf_unfiltered (gdb_stdlog,
 			_("infrun: %s: stepping_over_breakpoint %s\n"), event,
 			what.stepping_over_breakpoint ? "yes" : "no");
+
+  if (print_defaults || what.bp_longjmp)
+    fprintf_unfiltered (gdb_stdlog, _("infrun: %s: bp_longjmp %s\n"), event,
+			what.bp_longjmp ? "yes" : "no");
+
+  if (print_defaults || what.bp_longjmp_resume)
+    fprintf_unfiltered (gdb_stdlog, _("infrun: %s: bp_longjmp_resume %s\n"),
+			event, what.bp_longjmp_resume ? "yes" : "no");
+
+  if (print_defaults || what.bp_step_resume_on_stop)
+    fprintf_unfiltered (gdb_stdlog,
+			_("infrun: %s: bp_step_resume_on_stop %s\n"), event,
+			what.bp_step_resume_on_stop ? "yes" : "no");
 }
 
 /* Given an execution control state that has been freshly filled in
@@ -4066,6 +4079,10 @@ process_event_stop_test:
 	  }
       }
 
+    bpstat_what_debug (what, _("summary"), 1);
+
+    bpstat_what_finalize (&what);
+
     stop_print_frame = what.print_frame == pf_yes;
 
     ecs->event_thread->stop_step = what.stop_step == ss_print_no;


hooks/post-receive
--
Repository for Project Archer.