[archer-jankratochvil-misc] Fix hw watchpoints regression oni386/x86_64/ia64

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

Upstream post:
http://sourceware.org/ml/gdb-patches/2008-12/msg00143.html

there is now a regression for watchpoints created before the inferior is
started.  With no active target the only target in the stack is `exec' which
has no `to_can_use_hw_breakpoint' in its vector.  Therefore only a software
watchpoint gets created.  Later the watchpoint type remains the same (software
one).

I find incorrect to determine the watchpoint type (sw/hw) the time it gets
created when no target is active.  GDB cannot know the hw watchpoints support
availability that time.

In some ideal case bp_watchpoint vs. bp_hardware_watchpoint should be
completely hidden from the user.  But as the watchpoint type is not absolutely
transparent I chose a more conservative way to just convert
bp_watchpoint<->bp_hardware_watchpoint appropriately when the relevant runtime
conditions may change.

The regression for ia64 got introduced starting with 6.7:
http://sourceware.org/ml/gdb-patches/2007-03/msg00290.html
http://sourceware.org/ml/gdb-cvs/2007-03/msg00114.html

The regression for i386/x86_64 got introduced only in post-6.8 CVS HEAD:
http://sourceware.org/ml/gdb-patches/2008-03/msg00000.html
http://sourceware.org/ml/gdb-cvs/2008-03/msg00002.html

No regressions on {x86_64,ia64}-unknown-linux-gnu.

2008-12-07  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.
	(insert_breakpoints): Call update_watchpoint even for `bp_watchpoint's.

2008-12-07  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.base/watchpoint-hw.exp, gdb.base/watchpoint-hw.c: New.
---
 gdb/breakpoint.c                         |   25 ++++++++++++++-
 gdb/testsuite/gdb.base/watchpoint-hw.c   |   27 ++++++++++++++++
 gdb/testsuite/gdb.base/watchpoint-hw.exp |   50 ++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 1 deletions(-)
 create mode 100644 gdb/testsuite/gdb.base/watchpoint-hw.c
 create mode 100644 gdb/testsuite/gdb.base/watchpoint-hw.exp

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index b6ad0c4..96674b2 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -892,6 +892,28 @@ update_watchpoint (struct breakpoint *b, int reparse)
 	  b->val_valid = 1;
 	}
 
+	/* 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)
+	  {
+	    int i, mem_cnt, target_resources_ok, other_type_used;
+
+	    i = hw_watchpoint_used_count (bp_hardware_watchpoint,
+					  &other_type_used);
+	    mem_cnt = can_use_hardware_watchpoint (val_chain);
+
+	    /* Hack around 'unused var' error for some targets here.  */
+	    (void) i;
+	    if (mem_cnt)
+	      target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT
+			 (bp_hardware_watchpoint, i + mem_cnt, other_type_used);
+	    if (!mem_cnt || target_resources_ok <= 0)
+	      b->type = bp_watchpoint;
+	    else
+	      b->type = bp_hardware_watchpoint;
+	  }
+
       /* Look at each value on the value chain.  */
       for (v = val_chain; v; v = next)
 	{
@@ -1204,8 +1226,9 @@ insert_breakpoints (void)
 {
   struct breakpoint *bpt;
 
+  /* Software watchpoint may get converted to hardware ones.  */
   ALL_BREAKPOINTS (bpt)
-    if (is_hardware_watchpoint (bpt))
+    if (is_hardware_watchpoint (bpt) || bpt->type == bp_watchpoint)
       update_watchpoint (bpt, 0 /* don't reparse. */);
 
   update_global_location_list (1);
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.c b/gdb/testsuite/gdb.base/watchpoint-hw.c
new file mode 100644
index 0000000..f6eea6f
--- /dev/null
+++ b/gdb/testsuite/gdb.base/watchpoint-hw.c
@@ -0,0 +1,27 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2008 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb@prep.ai.mit.edu  */
+
+int watchee;
+
+int
+main (void)
+{
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp
new file mode 100644
index 0000000..112943c
--- /dev/null
+++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp
@@ -0,0 +1,50 @@
+# Copyright 2008 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] && ![istarget "ia64-*-*"]
+    && ![istarget "s390*-*-*"]} then {
+    verbose "Skipping watchpoint-hw test."
+    return
+}
+
+set testfile watchpoint-hw
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    untested "Couldn't compile test program"
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+# Create the watchpoint before the inferior gets started.  Now the native CPU
+# target is still not active and its `to_can_use_hw_breakpoint' is not
+# installed, therefore only a software watchpoint gets created.
+
+gdb_test "watch watchee" "atchpoint 1: watchee"
+
+# `runto_main' or `runto main' would delete the watchpoint created above.
+
+if { [gdb_start_cmd] < 0 } {
+    untested start
+    return -1
+}
+gdb_test "" "main .* at .*" "start"
+
+# Check it is really a `hw'-watchpoint.
+gdb_test "info watchpoints" "1 *hw watchpoint .* watchee"
-- 
1.6.0.4