[patch] Fix hw watchpoints regression on i386/x86_64/ia64

[patch] Fix hw watchpoints regression on i386/x86_64/ia64

[Jan Kratochvil]

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

Hi,

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.


Regards,
Jan

[-- Attachment #2: gdb-watchpoint-hw.patch --]
[-- Type: text/plain, Size: 4875 bytes --]

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	7 Dec 2008 15:59:51 -0000	1.364
+++ gdb/breakpoint.c	7 Dec 2008 21:20:54 -0000
@@ -892,6 +892,28 @@ update_watchpoint (struct breakpoint *b,
 	  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);
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/watchpoint-hw.c	7 Dec 2008 21:20:56 -0000
@@ -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;
+}
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/watchpoint-hw.exp	7 Dec 2008 21:20:56 -0000
@@ -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"

Re: [patch] Fix hw watchpoints regression on i386/x86_64/ia64

[Jan Kratochvil]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

Hi,

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.


Regards,
Jan

[-- Attachment #2: gdb-watchpoint-hw2.patch --]
[-- Type: text/plain, Size: 4494 bytes --]

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.

--- gdb/breakpoint.c	7 Dec 2008 15:59:51 -0000	1.364
+++ gdb/breakpoint.c	8 Dec 2008 08:33:28 -0000
@@ -892,6 +892,29 @@ update_watchpoint (struct breakpoint *b,
 	  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.  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;
+
+	    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)
 	{
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/watchpoint-hw.c	8 Dec 2008 08:33:29 -0000
@@ -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;
+}
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/watchpoint-hw.exp	8 Dec 2008 08:33:29 -0000
@@ -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"

Re: [patch] Fix hw watchpoints regression on i386/x86_64/ia64

[Ulrich Weigand]

Jan Kratochvil wrote:

> 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.

This seems reasonable to me.  One minor issue:

> +	    /* Hack around 'unused var' error for some targets here.  */
> +	    (void) i;

Is this really necessary?  The other callers of
TARGET_CAN_USE_HARDWARE_WATCHPOINT don't do that either ...

> +if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] && ![istarget "ia64-*-*"]
> +    && ![istarget "s390*-*-*"]} then {
> +    verbose "Skipping watchpoint-hw test."
> +    return
> +}

This test case should respect [target_info exists gdb,no_hardware_watchpoints].

Bye,
Ulrich

-- 
  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE
  Ulrich.Weigand@de.ibm.com

Re: [patch] Fix hw watchpoints regression on i386/x86_64/ia64

[Jan Kratochvil]

On Wed, 17 Dec 2008 21:12:13 +0100, Ulrich Weigand wrote:
> > +	    /* Hack around 'unused var' error for some targets here.  */
> > +	    (void) i;
> 
> Is this really necessary?  The other callers of
> TARGET_CAN_USE_HARDWARE_WATCHPOINT don't do that either ...

It was a copy-paste from existing do_enable_breakpoint() (line 7799).
But it got now removed according to your advice as:
(1) The original code uses `i' and `mem_cnt' initialization in the declaration
    while my code initializes them explicitely which suppresses the `unused
    variable' GCC warning on gcc-4.3.
(2) GDB already uses explicit `-Wno-unused' by default and it already has
    unused variables scattered around which is a scope of different patches.


> > +if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] && ![istarget "ia64-*-*"]
> > +    && ![istarget "s390*-*-*"]} then {
> > +    verbose "Skipping watchpoint-hw test."
> > +    return
> > +}
> 
> This test case should respect [target_info exists gdb,no_hardware_watchpoints].
                       ^<-also
as according to my test on ppc64 RHEL-4 gdb-6.3+kernel (both not supporting
ppc hw watchpoints) dejagnu-1.4.4 did not have `no_hardware_watchpoints' set.


Committed: http://sourceware.org/ml/gdb-cvs/2008-12/msg00098.html


Thanks,
Jan


gdb/
2008-12-21  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.

gdb/testsuite/
2008-12-21  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.base/watchpoint-hw.exp, gdb.base/watchpoint-hw.c: New.

--- src/gdb/breakpoint.c	2008/12/08 13:27:38	1.365
+++ src/gdb/breakpoint.c	2008/12/21 15:01:31	1.366
@@ -891,6 +891,27 @@
 	  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.  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;
+
+	    i = hw_watchpoint_used_count (bp_hardware_watchpoint,
+					  &other_type_used);
+	    mem_cnt = can_use_hardware_watchpoint (val_chain);
+
+	    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)
 	{
--- src/gdb/testsuite/gdb.base/watchpoint-hw.c
+++ src/gdb/testsuite/gdb.base/watchpoint-hw.c	2008-12-21 15:02:14.633223000 +0000
@@ -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;
+}
--- src/gdb/testsuite/gdb.base/watchpoint-hw.exp
+++ src/gdb/testsuite/gdb.base/watchpoint-hw.exp	2008-12-21 15:02:15.747687000 +0000
@@ -0,0 +1,52 @@
+# 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/>.
+
+# Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.
+if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
+     && ![istarget "ia64-*-*"] && ![istarget "s390*-*-*"])
+    || [target_info exists gdb,no_hardware_watchpoints]} 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"

Re: [patch] Fix hw watchpoints regression on i386/x86_64/ia64

[Daniel Jacobowitz]

On Sun, Dec 21, 2008 at 04:10:46PM +0100, Jan Kratochvil wrote:
> > This test case should respect [target_info exists gdb,no_hardware_watchpoints].
>                        ^<-also
> as according to my test on ppc64 RHEL-4 gdb-6.3+kernel (both not supporting
> ppc hw watchpoints) dejagnu-1.4.4 did not have `no_hardware_watchpoints' set.

I suggest you use a custom board file which does set it.

-- 
Daniel Jacobowitz
CodeSourcery

Re: [patch] Fix hw watchpoints regression on i386/x86_64/ia64

[Andreas Schwab]

Jan Kratochvil <jan.kratochvil@redhat.com> writes:

> +   Please email any bugs, comments, and/or additions to this file to:
> +   bug-gdb@prep.ai.mit.edu  */

Please remove this paragraph.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

[ob] Remove bug-gdb@prep.ai.mit.edu (PR 8648) [Re: [patch] Fix hw watchpoints regression on i386/x86_64/ia64]

[Jan Kratochvil]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

On Sun, 21 Dec 2008 17:15:30 +0100, Andreas Schwab wrote:
> Jan Kratochvil <jan.kratochvil@redhat.com> writes:
> 
> > +   Please email any bugs, comments, and/or additions to this file to:
> > +   bug-gdb@prep.ai.mit.edu  */
> 
> Please remove this paragraph.

Thanks for the notice, going to commit this patch as obvious.

Assuming PR GDB/# just now should use the new BZ numbers as there is
fortunately no ambiguity due to the shift by 7105.


Regards,
Jan

[-- Attachment #2: gdb-email.patch --]
[-- Type: text/plain, Size: 5431 bytes --]

gdb/testsuite/
2008-12-21  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Fix for PR gdb/8648.
	* gdb.arch/ppc-fp.exp, gdb.arch/vsx-regs.exp, gdb.base/watchpoint-hw.c,
	gdb.gdbtk/browser.test, gdb.gdbtk/console.test, gdb.gdbtk/srcwin.test,
	gdb.gdbtk/srcwin2.test, gdb.gdbtk/srcwin3.test, gdb.gdbtk/windows.test,
	gdb.threads/tls2.c: Remove reference to bug-gdb@prep.ai.mit.edu .

--- gdb/testsuite/gdb.arch/ppc-fp.exp	5 Sep 2008 19:00:41 -0000	1.1
+++ gdb/testsuite/gdb.arch/ppc-fp.exp	21 Dec 2008 16:52:07 -0000
@@ -13,9 +13,6 @@
 # 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
-#
 
 # Tests for Powerpc floating point register setting and fetching
 
--- gdb/testsuite/gdb.arch/vsx-regs.exp	5 Sep 2008 19:12:11 -0000	1.2
+++ gdb/testsuite/gdb.arch/vsx-regs.exp	21 Dec 2008 16:52:07 -0000
@@ -13,9 +13,6 @@
 # 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
-#
 
 # Tests for Powerpc AltiVec register setting and fetching
 
--- gdb/testsuite/gdb.base/watchpoint-hw.c	21 Dec 2008 15:01:32 -0000	1.1
+++ gdb/testsuite/gdb.base/watchpoint-hw.c	21 Dec 2008 16:52:09 -0000
@@ -13,10 +13,7 @@
    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  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 int watchee;
 
--- gdb/testsuite/gdb.gdbtk/browser.test	7 May 2001 20:39:32 -0000	1.2
+++ gdb/testsuite/gdb.gdbtk/browser.test	21 Dec 2008 16:52:09 -0000
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
 # This file was written by Keith Seitz (keiths@cygnus.com)
 
 # Read in the standard defs file
--- gdb/testsuite/gdb.gdbtk/console.test	18 Jan 2002 17:28:53 -0000	1.3
+++ gdb/testsuite/gdb.gdbtk/console.test	21 Dec 2008 16:52:09 -0000
@@ -14,9 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
 # This file was written by Keith Seitz (keiths@cygnus.com)
 
 # Read in the standard defs file
--- gdb/testsuite/gdb.gdbtk/srcwin.test	27 Feb 2003 22:18:44 -0000	1.6
+++ gdb/testsuite/gdb.gdbtk/srcwin.test	21 Dec 2008 16:52:09 -0000
@@ -14,9 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
 # This file was written by Martin Hunt (hunt@cygnus.com)
 
 # Read in the standard defs file
--- gdb/testsuite/gdb.gdbtk/srcwin2.test	27 Feb 2003 22:18:44 -0000	1.4
+++ gdb/testsuite/gdb.gdbtk/srcwin2.test	21 Dec 2008 16:52:09 -0000
@@ -14,9 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
 # This file was written by Martin Hunt (hunt@cygnus.com)
 
 
--- gdb/testsuite/gdb.gdbtk/srcwin3.test	27 Feb 2003 22:18:44 -0000	1.4
+++ gdb/testsuite/gdb.gdbtk/srcwin3.test	21 Dec 2008 16:52:09 -0000
@@ -14,9 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
 # This file was written by Martin Hunt (hunt@cygnus.com)
 
 ###########################################################
--- gdb/testsuite/gdb.gdbtk/windows.test	27 Feb 2003 22:21:33 -0000	1.2
+++ gdb/testsuite/gdb.gdbtk/windows.test	21 Dec 2008 16:52:09 -0000
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
 # This file was written by Keith Seitz (keiths@cygnus.com)
 
 # Read in the standard defs file
--- gdb/testsuite/gdb.threads/tls2.c	2 Dec 2008 14:51:01 -0000	1.1
+++ gdb/testsuite/gdb.threads/tls2.c	21 Dec 2008 16:52:10 -0000
@@ -13,10 +13,7 @@
    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  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 extern __thread int a_thread_local;
 __thread int file2_thread_local;

Re: [patch] Fix hw watchpoints regression on i386/x86_64/ia64

[Jan Kratochvil]

On Sun, 21 Dec 2008 16:36:46 +0100, Daniel Jacobowitz wrote:
> On Sun, Dec 21, 2008 at 04:10:46PM +0100, Jan Kratochvil wrote:
> > > This test case should respect [target_info exists gdb,no_hardware_watchpoints].
> >                        ^<-also
> > as according to my test on ppc64 RHEL-4 gdb-6.3+kernel (both not supporting
> > ppc hw watchpoints) dejagnu-1.4.4 did not have `no_hardware_watchpoints' set.
> 
> I suggest you use a custom board file which does set it.

Sorry I did commit it this way.  Should I commit this one?


Regards,
Jan


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

	* gdb.base/watchpoint-hw.exp: Remove the limitation on specific arches.

--- gdb/testsuite/gdb.base/watchpoint-hw.exp	21 Dec 2008 15:01:32 -0000	1.1
+++ gdb/testsuite/gdb.base/watchpoint-hw.exp	21 Dec 2008 18:59:55 -0000
@@ -13,10 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.
-if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
-     && ![istarget "ia64-*-*"] && ![istarget "s390*-*-*"])
-    || [target_info exists gdb,no_hardware_watchpoints]} then {
+if {[target_info exists gdb,no_hardware_watchpoints]} then {
     verbose "Skipping watchpoint-hw test."
     return
 }