2002-07-09 Pierre Muller <muller@ics.u-strasbg.fr>

	Merge from main branch.

	2002-07-04  Pierre Muller  <muller@ics.u-strasbg.fr>

	* i386-nat.c (child_post_startup_inferior): New function
	calling i386_cleanup_dregs if
	I386_USE_GENERIC_WATCHPOINTS is defined.
	* config/i386/nm-i386.h: define CHILD_POST_STARTUP_INFERIOR
	conditional to acknowledge that i386-nat.c has its
	own child_post_startup_inferior function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d5294f3a6112234547cbba176e35937b682325d3..8952db40c16098c3de9f9f309deabb96c5e5c647 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2002-07-09  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+       Merge from mainline:
+
+       2002-07-04  Pierre Muller  <muller@ics.u-strasbg.fr>
+       * i386-nat.c (child_post_startup_inferior): New function
+       calling i386_cleanup_dregs if
+       I386_USE_GENERIC_WATCHPOINTS is defined.
+       * config/i386/nm-i386.h: define CHILD_POST_STARTUP_INFERIOR
+       conditional to acknowledge that i386-nat.c has its
+       own child_post_startup_inferior function.
+
 2002-07-03  Michal Ludvig  <mludvig@suse.cz>
 
        Merge from mainline:

diff --git a/gdb/config/i386/nm-i386.h b/gdb/config/i386/nm-i386.h
index 500bf7b59423b3601918e33078691a217741a3d4..eed05a476fa3bb1effa2fc9a98ab43c5db1a6665 100644 (file)
--- a/gdb/config/i386/nm-i386.h
+++ b/gdb/config/i386/nm-i386.h
@@ -115,6 +115,10 @@ extern int  i386_remove_hw_breakpoint (CORE_ADDR addr, void *shadow);
 
 #define DECR_PC_AFTER_HW_BREAK 0
 
+/* child_post_startup_inferior used to
+   reset all debug registers by calling i386_cleanup_dregs ().  */ 
+#define CHILD_POST_STARTUP_INFERIOR
+
 #endif /* I386_USE_GENERIC_WATCHPOINTS */
 
 #endif /* NM_I386_H */

diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
index adf220bba730d05cd2b37ad9f9de03ebe56a3ab7..53a81a463eb1d2bd7cf1f84dfa4bbfdc3034ec56 100644 (file)
--- a/gdb/i386-nat.c
+++ b/gdb/i386-nat.c
@@ -230,6 +230,14 @@ i386_cleanup_dregs (void)
   dr_status_mirror  = 0;
 }
 
+/* Reset all debug registers at each new startup
+   to avoid missing watchpoints after restart.  */
+void
+child_post_startup_inferior (ptid_t ptid)
+{
+  i386_cleanup_dregs ();
+}
+
 /* Print the values of the mirrored debug registers.
    This is called when maint_show_dr is non-zero.  To set that
    up, type "maint show-debug-regs" at GDB's prompt.  */