aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2011-12-05 14:16:50 +0000
committerPedro Alves <palves@redhat.com>2011-12-05 14:16:50 +0000
commit482950ed190564e45b1e19c686b322c33b47137f (patch)
tree6af33e4dc585abd6ce2302dad0fa65ad55791fb6
parent73017762b2a38355a291e6d3239ac60bb015edaf (diff)
downloadgdb-482950ed190564e45b1e19c686b322c33b47137f.zip
gdb-482950ed190564e45b1e19c686b322c33b47137f.tar.gz
gdb-482950ed190564e45b1e19c686b322c33b47137f.tar.bz2
2012-12-05 Pedro Alves <pedro@codesourcery.com>
* amd64-linux-nat.c (amd64_linux_dr_get): Remove FIXME comment. Reinstate perror_with_name call on ptrace error. Remove #if 0. * i386-linux-nat.c (i386_linux_dr_get): Likewise. * i386bsd-nat.c (i386bsd_dr_get_status): Likewise.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/amd64-linux-nat.c9
-rw-r--r--gdb/i386-linux-nat.c9
-rw-r--r--gdb/i386bsd-nat.c9
4 files changed, 7 insertions, 27 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 971a165..bcd401e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-05 Pedro Alves <pedro@codesourcery.com>
+
+ * amd64-linux-nat.c (amd64_linux_dr_get): Remove FIXME comment.
+ Reinstate perror_with_name call on ptrace error. Remove #if 0.
+ * i386-linux-nat.c (i386_linux_dr_get): Likewise.
+ * i386bsd-nat.c (i386bsd_dr_get_status): Likewise.
+
2011-12-05 Andrey Smirnov <andrew.smirnov@gmail.com>
* breakpoint.c (init_breakpoint_sal): Remove nested definitions of
diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index caf2e96..c673965 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -277,20 +277,11 @@ amd64_linux_dr_get (ptid_t ptid, int regnum)
if (tid == 0)
tid = PIDGET (ptid);
- /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the
- ptrace call fails breaks debugging remote targets. The correct
- way to fix this is to add the hardware breakpoint and watchpoint
- stuff to the target vector. For now, just return zero if the
- ptrace call fails. */
errno = 0;
value = ptrace (PTRACE_PEEKUSER, tid,
offsetof (struct user, u_debugreg[regnum]), 0);
if (errno != 0)
-#if 0
perror_with_name (_("Couldn't read debug register"));
-#else
- return 0;
-#endif
return value;
}
diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index 187c49d..7eb49ae 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -665,20 +665,11 @@ i386_linux_dr_get (ptid_t ptid, int regnum)
if (tid == 0)
tid = PIDGET (ptid);
- /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the
- ptrace call fails breaks debugging remote targets. The correct
- way to fix this is to add the hardware breakpoint and watchpoint
- stuff to the target vector. For now, just return zero if the
- ptrace call fails. */
errno = 0;
value = ptrace (PTRACE_PEEKUSER, tid,
offsetof (struct user, u_debugreg[regnum]), 0);
if (errno != 0)
-#if 0
perror_with_name (_("Couldn't read debug register"));
-#else
- return 0;
-#endif
return value;
}
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index d46eaa4..fcd772f 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -312,18 +312,9 @@ i386bsd_dr_get_status (void)
{
struct dbreg dbregs;
- /* FIXME: kettenis/2001-03-31: Calling perror_with_name if the
- ptrace call fails breaks debugging remote targets. The correct
- way to fix this is to add the hardware breakpoint and watchpoint
- stuff to the target vector. For now, just return zero if the
- ptrace call fails. */
if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
-#if 0
perror_with_name (_("Couldn't read debug registers"));
-#else
- return 0;
-#endif
return DBREG_DRX ((&dbregs), 6);
}