[SCM] archer-jankratochvil-misc: Fix hw watchpoints regression on i386/x86_64/ia64 #2

[SCM] archer-jankratochvil-misc: Fix hw watchpoints regression on i386/x86_64/ia64 #2

[jkratoch]

The branch, archer-jankratochvil-misc has been updated
       via  b9c6d07717aab673d892179f2b51512b265b7b22 (commit)
       via  a9125cfc4809b122b779c49fc6f7dc13e7a393a0 (commit)
      from  8f69ba9b545cb75561b2345520a623786e57e103 (commit)

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

- Log -----------------------------------------------------------------
commit b9c6d07717aab673d892179f2b51512b265b7b22
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Dec 8 09:40:18 2008 +0100

    Fix hw watchpoints regression on i386/x86_64/ia64 #2
    
    Upstream post:
    http://sourceware.org/ml/gdb-patches/2008-12/msg00146.html
    
    a more lightweight version, the watchpoints type conversion does not need to
    be done from insert_breakpoints().
    
    Still the check for more than 4 hw watchpoints is unimplemented/broken due to
    i386_can_use_hw_breakpoint() just returns 1 unconditionally - it will need an
    arch interface change.
    
    No regressions for this change on x86_64-unknown-linux-gnu.
    
    2008-12-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
    
    	Fix hw watchpoints created before the inferior was started.
    	* breakpoint.c (update_watchpoint): Convert the bp_watchpoint and
    	bp_hardware_watchpoint types according to the current runtime state.
    
    2008-12-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
    
    	* gdb.base/watchpoint-hw.exp, gdb.base/watchpoint-hw.c: New.

commit a9125cfc4809b122b779c49fc6f7dc13e7a393a0
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Dec 8 09:38:32 2008 +0100

    Revert "Fix hw watchpoints regression on i386/x86_64/ia64"
    
    This reverts commit 8f69ba9b545cb75561b2345520a623786e57e103.
    
    It gets replaced by an updated variant:
      http://sourceware.org/ml/gdb-patches/2008-12/msg00146.html

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

Summary of changes:
 gdb/breakpoint.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 96674b2..e831eaf 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -894,8 +894,9 @@ update_watchpoint (struct breakpoint *b, int reparse)
 
 	/* Change the type of breakpoint between hardware assisted or an
 	   ordinary watchpoint depending on the hardware support and free
-	   hardware slots.  */
-	if (b->type == bp_watchpoint || b->type == bp_hardware_watchpoint)
+	   hardware slots.  REPARSE is set when the inferior is started.  */
+	if ((b->type == bp_watchpoint || b->type == bp_hardware_watchpoint)
+	    && reparse)
 	  {
 	    int i, mem_cnt, target_resources_ok, other_type_used;
 
@@ -1226,9 +1227,8 @@ insert_breakpoints (void)
 {
   struct breakpoint *bpt;
 
-  /* Software watchpoint may get converted to hardware ones.  */
   ALL_BREAKPOINTS (bpt)
-    if (is_hardware_watchpoint (bpt) || bpt->type == bp_watchpoint)
+    if (is_hardware_watchpoint (bpt))
       update_watchpoint (bpt, 0 /* don't reparse. */);
 
   update_global_location_list (1);


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