This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA] Add watchpoint hit address function to procfs.c
- From: "Pierre Muller" <pierre dot muller at ics-cnrs dot unistra dot fr>
- To: "'Pedro Alves'" <pedro at codesourcery dot com>
- Cc: "'Joel Brobecker'" <brobecker at adacore dot com>, <gdb-patches at sourceware dot org>
- Date: Tue, 11 May 2010 00:18:32 +0200
- Subject: [RFA] Add watchpoint hit address function to procfs.c
- References: <006601cae54b$368452f0$a38cf8d0$@muller@ics-cnrs.unistra.fr> <201005102027.10080.pedro@codesourcery.com> <001801caf088$4d8a7ae0$e89f70a0$@muller@ics-cnrs.unistra.fr> <201005102249.20383.pedro@codesourcery.com>
Just to be sure,
here is the final version of the patch.
I did not change the issue of si_addr reporting zero,
but we need to remember this possibility if any target
reports new failures after that patch.
Is this OK to commit?
Pierre
2010-05-11 Pierre Muller <muller@ics.u-strasbg.fr>
* procfs.c (proc_watchpoint_address): New function.
(procfs_stopped_by_watchpoint): Remove useless check after
find_procinfo_or_die call.
(procfs_stopped_data_address): New function.
(procfs_use_watchpoints): Register new watchpoint related
function.
Index: procfs.c
===================================================================
RCS file: /cvs/src/src/gdb/procfs.c,v
retrieving revision 1.131
diff -u -p -r1.131 procfs.c
--- procfs.c 20 Apr 2010 22:36:35 -0000 1.131
+++ procfs.c 10 May 2010 22:09:19 -0000
@@ -1313,6 +1313,34 @@ proc_what (procinfo *pi)
#endif
}
+/*
+ * Function: proc_watchpoint_address
+ *
+ * This function is only called when PI is stopped by a watchpoint.
+ * Assuming OS supports it, write to *ADDR the data address which
+ * triggered it and return 1.
+ * Return 0 if it is not possible to know the address.
+ */
+
+static int
+proc_watchpoint_address (procinfo *pi, CORE_ADDR *addr)
+{
+ if (!pi->status_valid)
+ if (!proc_get_status (pi))
+ return 0;
+
+#ifdef NEW_PROC_API
+ *addr = (CORE_ADDR) gdbarch_pointer_to_address (target_gdbarch,
+ builtin_type (target_gdbarch)->builtin_data_ptr,
+ (gdb_byte *) &pi->prstatus.pr_lwp.pr_info.si_addr);
+#else
+ *addr = (CORE_ADDR) gdbarch_pointer_to_address (target_gdbarch,
+ builtin_type (target_gdbarch)->builtin_data_ptr,
+ (gdb_byte *) &pi->prstatus.pr_info.si_addr);
+#endif
+ return 1;
+}
+
#ifndef PIOCSSPCACT /* The following is not supported on OSF. */
/*
* Function: proc_nsysarg
@@ -5541,9 +5569,6 @@ procfs_stopped_by_watchpoint (void)
pi = find_procinfo_or_die (PIDGET (inferior_ptid), 0);
- if (!pi) /* If no process, then not stopped by watchpoint! */
- return 0;
-
if (proc_flags (pi) & (PR_STOPPED | PR_ISTOP))
{
if (proc_why (pi) == PR_FAULTED)
@@ -5561,6 +5586,26 @@ procfs_stopped_by_watchpoint (void)
return 0;
}
+/*
+ * Function procfs_stopped_data_address
+ *
+ * Returns 1 if we the OS knows the position of the triggered
+ * watchpoint. Sets *ADDR to that address.
+ * Returns 0 if OS cannot report that address.
+ * This function is only called if procfs_stopped_by_watchpoint
+ * returned 1, thus no further checks are done.
+ * The function also assumes that ADDR is not NULL.
+ */
+
+static int
+procfs_stopped_data_address (struct target_ops *targ, CORE_ADDR *addr)
+{
+ procinfo *pi;
+
+ pi = find_procinfo_or_die (PIDGET (inferior_ptid), 0);
+ return proc_watchpoint_address (pi, addr);
+}
+
static int
procfs_insert_watchpoint (CORE_ADDR addr, int len, int type)
{
@@ -5607,6 +5652,7 @@ procfs_use_watchpoints (struct target_op
t->to_remove_watchpoint = procfs_remove_watchpoint;
t->to_region_ok_for_hw_watchpoint = procfs_region_ok_for_hw_watchpoint;
t->to_can_use_hw_breakpoint = procfs_can_use_hw_breakpoint;
+ t->to_stopped_data_address = procfs_stopped_data_address;
}
/*