Re: [RFA] patch for [Bug gdb/11253]

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

On Fri, 26 Feb 2010 04:25:58 +0100, Hui Zhu wrote:
> This patch is for bug 11253 http://sourceware.org/bugzilla/show_bug.cgi?id=11253

just extended it a bit but it remains the same.

No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.

since
        Re: [RFA] Fix hw watchpoints in process record.
        From: Pedro Alves <pedro at codesourcery dot com>
        http://sourceware.org/ml/gdb-patches/2009-11/msg00476.html
        http://sourceware.org/ml/gdb-cvs/2009-11/msg00187.html
        commit 1ab0b876af2e2410fa462e901623669f29d75c89

there are IMO missing the resets in record_open.


Thanks,
Jan


2010-02-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
	    Hui Zhu  <teawater@gmail.com>

	* record.c (record_open_1): Check tmp_to_stopped_by_watchpoint and
	tmp_to_stopped_data_address.
	(record_open): Reset tmp_to_stopped_by_watchpoint and
	tmp_to_stopped_data_address.
	* target.c (init_dummy_target): Add to_stopped_by_watchpoint and
	to_stopped_data_address.

--- a/gdb/record.c
+++ b/gdb/record.c
@@ -867,6 +867,10 @@ record_open_1 (char *name, int from_tty)
     error (_("Could not find 'to_insert_breakpoint' method on the target stack."));
   if (!tmp_to_remove_breakpoint)
     error (_("Could not find 'to_remove_breakpoint' method on the target stack."));
+  if (!tmp_to_stopped_by_watchpoint)
+    error (_("Could not find 'to_stopped_by_watchpoint' method on the target stack."));
+  if (!tmp_to_stopped_data_address)
+    error (_("Could not find 'to_stopped_data_address' method on the target stack."));
 
   push_target (&record_ops);
 }
@@ -897,6 +901,8 @@ record_open (char *name, int from_tty)
   tmp_to_xfer_partial = NULL;
   tmp_to_insert_breakpoint = NULL;
   tmp_to_remove_breakpoint = NULL;
+  tmp_to_stopped_by_watchpoint = NULL;
+  tmp_to_stopped_data_address = NULL;
 
   /* Set the beneath function pointers.  */
   for (t = current_target.beneath; t != NULL; t = t->beneath)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -2838,6 +2838,9 @@ init_dummy_target (void)
   dummy_target.to_has_stack = (int (*) (struct target_ops *)) return_zero;
   dummy_target.to_has_registers = (int (*) (struct target_ops *)) return_zero;
   dummy_target.to_has_execution = (int (*) (struct target_ops *)) return_zero;
+  dummy_target.to_stopped_by_watchpoint = return_zero;
+  dummy_target.to_stopped_data_address =
+    (int (*) (struct target_ops *, CORE_ADDR *)) return_zero;
   dummy_target.to_magic = OPS_MAGIC;
 }