[SCM] archer-jankratochvil-bpstat_what: Merge branch 'clearloc-print' into archer-jankratochvil-bpstat_what

[SCM] archer-jankratochvil-bpstat_what: Merge branch 'clearloc-print' into archer-jankratochvil-bpstat_what

[jkratoch]

The branch, archer-jankratochvil-bpstat_what has been updated
       via  098042cf1b9fdcc50686b42f2e38d23519f28bb9 (commit)
       via  d5118c0ffb672662856bf6548a850eef29c885ec (commit)
       via  84c3ff1f86fb27923194aac28e56db1282f2dac7 (commit)
      from  e13e1840ffb1e8dd5a7241d3ccda446ca3a4def0 (commit)

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

- Log -----------------------------------------------------------------
commit 098042cf1b9fdcc50686b42f2e38d23519f28bb9
Merge: e13e1840ffb1e8dd5a7241d3ccda446ca3a4def0 d5118c0ffb672662856bf6548a850eef29c885ec
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon May 17 21:52:04 2010 +0200

    Merge branch 'clearloc-print' into archer-jankratochvil-bpstat_what

commit d5118c0ffb672662856bf6548a850eef29c885ec
Merge: d1364d8b9c88f30f4e8ec216326a5d5c45e9b3c1 84c3ff1f86fb27923194aac28e56db1282f2dac7
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon May 17 21:51:53 2010 +0200

    Merge branch 'clearloc' into clearloc-print

commit 84c3ff1f86fb27923194aac28e56db1282f2dac7
Merge: 5450853fae06771f24f5e85ffae3f93b18b28552 6e71dce52b9c702afd2debee7e51846bfd703ffc
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon May 17 21:51:44 2010 +0200

    Merge remote branch 'origin/master' into clearloc
    
    Conflicts:
    	gdb/breakpoint.c

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

Summary of changes:

First 500 lines of diff:


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

[SCM] archer-jankratochvil-bpstat_what: Merge branch 'clearloc-print' into archer-jankratochvil-bpstat_what

[jkratoch]

The branch, archer-jankratochvil-bpstat_what has been updated
       via  f89cea1a0fd486bc7b99b5103aa8ed54d7b2d030 (commit)
       via  d1364d8b9c88f30f4e8ec216326a5d5c45e9b3c1 (commit)
       via  e2762521d664d6b7f0b1bce40445414f3c405c0a (commit)
      from  570079f364b45d5afdffa0dcb41858c5b302917e (commit)

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

- Log -----------------------------------------------------------------
commit f89cea1a0fd486bc7b99b5103aa8ed54d7b2d030
Merge: e2762521d664d6b7f0b1bce40445414f3c405c0a d1364d8b9c88f30f4e8ec216326a5d5c45e9b3c1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon May 3 19:21:02 2010 +0200

    Merge branch 'clearloc-print' into archer-jankratochvil-bpstat_what
    
    Conflicts:
    	gdb/breakpoint.c
    	gdb/breakpoint.h

commit d1364d8b9c88f30f4e8ec216326a5d5c45e9b3c1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon May 3 19:19:17 2010 +0200

    commit

commit e2762521d664d6b7f0b1bce40445414f3c405c0a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon May 3 18:20:20 2010 +0200

    simplify

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

Summary of changes:
 gdb/breakpoint.c |    6 ++----
 gdb/breakpoint.h |   10 +++++-----
 gdb/gdbthread.h  |    3 +--
 3 files changed, 8 insertions(+), 11 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index f647b70..adf7d8a 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3445,13 +3445,11 @@ bpstat_print (bpstat bs)
       enum print_stop_action val;
       
       val = print_bp_stop_message (bs);
-      if (val != PRINT_UNKNOWN && val < retval)
+      if (val < retval)
 	retval = val;
     }
 
-  /* We reached the end of the chain, or we got a null BS to start
-     with and nothing was printed. */
-  return PRINT_UNKNOWN;
+  return retval;
 }
 
 /* Evaluate the expression EXP and return 1 if value is zero.
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 55d86cb..c30c04e 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -575,16 +575,16 @@ enum stop_stack_kind
     STOP_STD_TERMINATE
   };
 
-/* The possible return values for print_bpstat, print_it_normal,
-   print_it_done, print_it_noop.  Keep them in decreasing order of contained
-   info.  Currently each next item must be a subset of the previous one.  */
+/* The possible return values for print_bpstat, print_it_normal, print_it_done,
+   print_it_noop.  bpstat_print depends on ther ordering where each item is an
+   information subset of the previous one.  */
 
 enum print_stop_action
   {
-    PRINT_UNKNOWN = -1,
     PRINT_SRC_AND_LOC,
     PRINT_SRC_ONLY,
-    PRINT_NOTHING
+    PRINT_NOTHING,
+    PRINT_UNKNOWN
   };
 
 /* Tell what to do about this bpstat.  */
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 783f563..cd24eaf 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -163,8 +163,7 @@ struct thread_info
 
   enum step_over_calls_kind step_over_calls;
 
-  /* Nonzero if stopped due to a step command.  In such case print the source
-     line but do not print its location.  */
+  /* Nonzero if stopped due to a step command.  */
   int stop_step;
 
   /* If stepping, nonzero means step count is > 1 so don't print frame


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