From c7437ca6e4ecefbaa0a0ebef0e68f09f8f19c449 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 4 Mar 2010 15:37:26 +0000 Subject: [PATCH] gdb/ * breakpoint.c (update_watchpoint): Create a sentinel location if the software watchpoint isn't watching any memory. (breakpoint_address_bits): Skip dummy software watchpoint locations. gdb/testsuite/ * gdb.base/watch-non-mem.c, gdb.base/watch-non-mem.exp: New. --- gdb/ChangeLog | 6 ++++ gdb/breakpoint.c | 22 ++++++++++++- gdb/testsuite/ChangeLog | 4 +++ gdb/testsuite/gdb.base/watch-non-mem.c | 27 ++++++++++++++++ gdb/testsuite/gdb.base/watch-non-mem.exp | 40 ++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.base/watch-non-mem.c create mode 100644 gdb/testsuite/gdb.base/watch-non-mem.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1cd63d8cd7b..128cc9afede 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2010-03-04 Pedro Alves + + * breakpoint.c (update_watchpoint): Create a sentinel location if + the software watchpoint isn't watching any memory. + (breakpoint_address_bits): Skip dummy software watchpoint locations. + 2010-03-04 Pedro Alves * utils.c (fputs_maybe_filtered): Check if there's already a top diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index bd3330ff399..03db2415e2c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1237,6 +1237,19 @@ update_watchpoint (struct breakpoint *b, int reparse) value_free (v); } + /* If a software watchpoint is not watching any memory, then the + above left it without any location set up. But, + bpstat_stop_status requires a location to be able to report + stops, so make sure there's at least a dummy one. */ + if (b->type == bp_watchpoint && b->loc == NULL) + { + b->loc = allocate_bp_location (b); + b->loc->pspace = frame_pspace; + b->loc->address = -1; + b->loc->length = -1; + b->loc->watchpoint_type = -1; + } + /* We just regenerated the list of breakpoint locations. The new location does not have its condition field set to anything and therefore, we must always reparse the cond_string, independently @@ -4516,7 +4529,14 @@ breakpoint_address_bits (struct breakpoint *b) for (loc = b->loc; loc; loc = loc->next) { - int addr_bit = gdbarch_addr_bit (loc->gdbarch); + int addr_bit; + + /* Software watchpoints that aren't watching memory don't have + an address to print. */ + if (b->type == bp_watchpoint && loc->watchpoint_type == -1) + continue; + + addr_bit = gdbarch_addr_bit (loc->gdbarch); if (addr_bit > print_address_bits) print_address_bits = addr_bit; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1cc2d2fd78f..196791ac897 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2010-03-04 Pedro Alves + + * gdb.base/watch-non-mem.c, gdb.base/watch-non-mem.exp: New. + 2010-03-03 Doug Evans * lib/gdb.exp (gdb_compile_pthreads): Handle case where diff --git a/gdb/testsuite/gdb.base/watch-non-mem.c b/gdb/testsuite/gdb.base/watch-non-mem.c new file mode 100644 index 00000000000..8474657eff4 --- /dev/null +++ b/gdb/testsuite/gdb.base/watch-non-mem.c @@ -0,0 +1,27 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2010 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 . */ + +int global = 0; + +int main() +{ + global++; + global++; + global++; + + return 0; +} diff --git a/gdb/testsuite/gdb.base/watch-non-mem.exp b/gdb/testsuite/gdb.base/watch-non-mem.exp new file mode 100644 index 00000000000..b5026107fb8 --- /dev/null +++ b/gdb/testsuite/gdb.base/watch-non-mem.exp @@ -0,0 +1,40 @@ +# Copyright 2010 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 . + +# +# Tests watchpoints that watch expressions that don't involve memory. +# + +set testfile "watch-non-mem" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { + untested ${testfile}.exp + return -1 +} + +if ![runto_main] then { + fail "Can't run to main" + return +} + +gdb_test "watch \$pc" \ + "Watchpoint .*: .pc" \ + "set write watchpoint on \$pc" + +gdb_test "continue" \ + "Watchpoint 2: .pc.*Old value = .*New value = .*" \ + "watchpoint on \$pc works" -- 2.30.2