diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/mi/mi-main.c | 6 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/pr11022.c | 32 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/pr11022.exp | 67 |
5 files changed, 113 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4a60c08..2562683 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2012-09-28 Yao Qi <yao@codesourcery.com> + * mi/mi-main.c (mi_cmd_data_write_memory): Call + write_memory_with_notification instead of write_memory. + (mi_cmd_data_write_memory_bytes): Call write_memory_with_notification + instead of target_write_memory. + +2012-09-28 Yao Qi <yao@codesourcery.com> + * mi/mi-main.c (mi_cmd_data_write_memory_bytes): Emit error when the length of content is not an even number. diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index f73d4f8..9fa1eaa 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1648,7 +1648,7 @@ mi_cmd_data_write_memory (char *command, char **argv, int argc) old_chain = make_cleanup (xfree, buffer); store_signed_integer (buffer, word_size, byte_order, value); /* Write it down to memory. */ - write_memory (addr, buffer, word_size); + write_memory_with_notification (addr, buffer, word_size); /* Free the buffer. */ do_cleanups (old_chain); } @@ -1688,9 +1688,7 @@ mi_cmd_data_write_memory_bytes (char *command, char **argv, int argc) data[i] = (gdb_byte) x; } - r = target_write_memory (addr, data, len); - if (r != 0) - error (_("Could not write memory")); + write_memory_with_notification (addr, data, len); do_cleanups (back_to); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a68f69d..d196a35 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-09-28 Yao Qi <yao@codesourcery.com> + + * gdb.mi/pr11022.exp: New. + * gdb.mi/pr11022.c: New. Copied from gdb.base/. + 2012-09-27 Tom Tromey <tromey@redhat.com> * gdb.cp/derivation.exp: Add regression test. diff --git a/gdb/testsuite/gdb.mi/pr11022.c b/gdb/testsuite/gdb.mi/pr11022.c new file mode 100644 index 0000000..ef6746d --- /dev/null +++ b/gdb/testsuite/gdb.mi/pr11022.c @@ -0,0 +1,32 @@ +/* This test is part of GDB, the GNU debugger. + + Copyright 2009-2012 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/>. + */ + +int x; + +int +main () +{ + int i, j; + + for (i = 0; i < 500; ++i) { + j = 0; /* break here */ + x = 42; + j = i; /* expect HW watchpoint stop */ + } + return 0; +} diff --git a/gdb/testsuite/gdb.mi/pr11022.exp b/gdb/testsuite/gdb.mi/pr11022.exp new file mode 100644 index 0000000..157a9e3 --- /dev/null +++ b/gdb/testsuite/gdb.mi/pr11022.exp @@ -0,0 +1,67 @@ +# Copyright 2009-2012 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 {[skip_hw_watchpoint_tests]} { + return 0 +} + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +standard_testfile .c + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { + untested pr11022.exp + return +} + +proc test_memory_changed_observer { mi_command } { with_test_prefix "${mi_command}" { + global srcfile + + if [mi_gdb_start] { + return + } + mi_run_to_main + + set line_number [gdb_get_line_number "break here"] + mi_gdb_test "-break-insert ${srcfile}:${line_number}" \ + {\^done,bkpt=.number="2",type="breakpoint".*\}} \ + "set breakpoint" + + mi_gdb_test "watch x" ".*" "set watchpoint" + + mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*" ".*" \ + { "" "disp=\"keep\"" } "breakpoint hit" + + mi_execute_to "exec-continue" "watchpoint-trigger" "main" "" ".*" ".*" \ + { "" "wpt=\{number=\"3\",exp=\"x\"\},value=\{old=\"0\",new=\"42\"\}" } \ + "watchpoint hit" + + mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*" ".*" \ + { "" "disp=\"keep\"" } "breakpoint hit 2" + + mi_gdb_test "-${mi_command}" {\^done} "set x" + + mi_execute_to "exec-continue" "watchpoint-trigger" "main" "" ".*" ".*" \ + { "" "wpt=\{number=\"3\",exp=\"x\"\},value=\{old=\"1\",new=\"42\"\}" } \ + "watchpoint hit 2" + + mi_gdb_exit +}} + +test_memory_changed_observer "data-write-memory-bytes &x \"01\"" +# We want to trigger a target memory write here, so the word size (4 or 8) +# is not that important. +test_memory_changed_observer "data-write-memory &x x 4 \"01\"" |