From 972daa01e2ee0a5c41e1dd45a71ad398c9266af8 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Sun, 24 Jun 2012 07:28:10 +0000 Subject: [PATCH] gdb: * corefile.c (write_memory_with_notification): New. * gdbcore.h: Declare write_memory_with_notification. * ada-lang.c (ada_value_assign): Replace 'write_memory' and 'observer_notify_memory_changed' with 'write_memory_with_notification'. * valops.c (value_assign): Likewise. * python/py-inferior.c (infpy_write_memory): Call 'write_memory_with_notification'. --- gdb/ChangeLog | 10 ++++++++++ gdb/ada-lang.c | 3 +-- gdb/corefile.c | 11 +++++++++++ gdb/gdbcore.h | 6 ++++++ gdb/python/py-inferior.c | 2 +- gdb/valops.c | 4 +--- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8b0c16dcb2..817c074e12 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2012-06-24 Yao Qi + + * corefile.c (write_memory_with_notification): New. + * gdbcore.h: Declare write_memory_with_notification. + * ada-lang.c (ada_value_assign): Replace 'write_memory' and + 'observer_notify_memory_changed' with 'write_memory_with_notification'. + * valops.c (value_assign): Likewise. + * python/py-inferior.c (infpy_write_memory): Call + 'write_memory_with_notification'. + 2012-06-24 Jan Kratochvil * cc-with-index.sh: Use also -ex "set auto-load no". diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 6f65472064..7afcef8d4a 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2534,8 +2534,7 @@ ada_value_assign (struct value *toval, struct value *fromval) else move_bits (buffer, value_bitpos (toval), value_contents (fromval), 0, bits, 0); - write_memory (to_addr, buffer, len); - observer_notify_memory_changed (to_addr, len, buffer); + write_memory_with_notification (to_addr, buffer, len); val = value_copy (toval); memcpy (value_contents_raw (val), value_contents (fromval), diff --git a/gdb/corefile.c b/gdb/corefile.c index 611cd62f2b..ac8eff55a6 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -34,6 +34,7 @@ #include "gdb_stat.h" #include "completer.h" #include "exceptions.h" +#include "observer.h" /* Local function declarations. */ @@ -361,6 +362,16 @@ write_memory (CORE_ADDR memaddr, memory_error (status, memaddr); } +/* Same as write_memory, but notify 'memory_changed' observers. */ + +void +write_memory_with_notification (CORE_ADDR memaddr, const bfd_byte *myaddr, + ssize_t len) +{ + write_memory (memaddr, myaddr, len); + observer_notify_memory_changed (memaddr, len, myaddr); +} + /* Store VALUE at ADDR in the inferior as a LEN-byte unsigned integer. */ void diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h index 1081f3f362..d6c9de20e3 100644 --- a/gdb/gdbcore.h +++ b/gdb/gdbcore.h @@ -86,6 +86,12 @@ CORE_ADDR read_memory_typed_address (CORE_ADDR addr, struct type *type); extern void write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, ssize_t len); +/* Same as write_memory, but notify 'memory_changed' observers. */ + +extern void write_memory_with_notification (CORE_ADDR memaddr, + const bfd_byte *myaddr, + ssize_t len); + /* Store VALUE at ADDR in the inferior as a LEN-byte unsigned integer. */ extern void write_memory_unsigned_integer (CORE_ADDR addr, int len, enum bfd_endian byte_order, diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index efbf14b061..2b229beeda 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -493,7 +493,7 @@ infpy_write_memory (PyObject *self, PyObject *args, PyObject *kw) error = 1; break; } - write_memory (addr, buffer, length); + write_memory_with_notification (addr, buffer, length); } GDB_PY_HANDLE_EXCEPTION (except); diff --git a/gdb/valops.c b/gdb/valops.c index 5002272301..97d889b2bc 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1299,9 +1299,7 @@ value_assign (struct value *toval, struct value *fromval) dest_buffer = value_contents (fromval); } - write_memory (changed_addr, dest_buffer, changed_len); - observer_notify_memory_changed (changed_addr, changed_len, - dest_buffer); + write_memory_with_notification (changed_addr, dest_buffer, changed_len); } break; -- 2.34.1