+2012-02-09 Valery Khromov <valery.khromov@gmail.com>
+
+ PR gdb/12953
+ * Makefile.in (HFILES_NO_SRCDIR): Add amd64bsd-nat.h.
+ * amd64bsd-nat.c: Add support for debug registers (adapted from
+ i386bsd-nat.c).
+ [HAVE_PT_GETDBREGS] (amd64bsd_dr_get, amd64bsd_dr_set)
+ (amd64bsd_dr_set_control, amd64bsd_dr_set_addr)
+ (amd64bsd_dr_get_addr, amd64bsd_dr_get_status)
+ (amd64bsd_dr_get_control): New functions.
+ * amd64bsd-nat.h: New file (adapted from i386bsd-nat.h).
+ * amd64fbsd-nat.c: Include "amd64bsd-nat.h", "i386-nat.h".
+ [HAVE_PT_GETDBREGS] (_initialize_amd64fbsd_nat): Add hardware
+ watchpoints initialization.
+ * config/i386/fbsd64.mh (NATDEPFILES): Add i386-nat.o.
+
2012-02-09 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb-gdb.py (StructMainTypePrettyPrinter) <struct_field_img>: Print
common/linux-ptrace.h \
proc-utils.h arm-tdep.h ax-gdb.h ppcnbsd-tdep.h \
cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h \
-exec.h m32r-tdep.h osabi.h gdbcore.h solib-som.h \
+exec.h m32r-tdep.h osabi.h gdbcore.h solib-som.h amd64bsd-nat.h \
i386bsd-nat.h xml-support.h xml-tdesc.h alphabsd-tdep.h gdb_obstack.h \
ia64-tdep.h ada-lang.h varobj.h frv-tdep.h nto-tdep.h serial.h \
c-lang.h d-lang.h frame.h event-loop.h block.h cli/cli-setshow.h \
t->to_store_registers = amd64bsd_store_inferior_registers;
return t;
}
+\f
+
+/* Support for debug registers. */
+
+#ifdef HAVE_PT_GETDBREGS
+
+static unsigned long
+amd64bsd_dr_get (ptid_t ptid, int regnum)
+{
+ struct dbreg dbregs;
+
+ if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
+ (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
+ perror_with_name (_("Couldn't read debug registers"));
+
+ return DBREG_DRX ((&dbregs), regnum);
+}
+
+static void
+amd64bsd_dr_set (int regnum, unsigned long value)
+{
+ struct dbreg dbregs;
+
+ if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
+ (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
+ perror_with_name (_("Couldn't get debug registers"));
+
+ /* For some mysterious reason, some of the reserved bits in the
+ debug control register get set. Mask these off, otherwise the
+ ptrace call below will fail. */
+ DBREG_DRX ((&dbregs), 7) &= ~(0xffffffff0000fc00);
+
+ DBREG_DRX ((&dbregs), regnum) = value;
+
+ if (ptrace (PT_SETDBREGS, PIDGET (inferior_ptid),
+ (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
+ perror_with_name (_("Couldn't write debug registers"));
+}
+
+void
+amd64bsd_dr_set_control (unsigned long control)
+{
+ amd64bsd_dr_set (7, control);
+}
+
+void
+amd64bsd_dr_set_addr (int regnum, CORE_ADDR addr)
+{
+ gdb_assert (regnum >= 0 && regnum <= 4);
+
+ amd64bsd_dr_set (regnum, addr);
+}
+
+CORE_ADDR
+amd64bsd_dr_get_addr (int regnum)
+{
+ return amd64bsd_dr_get (inferior_ptid, regnum);
+}
+
+unsigned long
+amd64bsd_dr_get_status (void)
+{
+ return amd64bsd_dr_get (inferior_ptid, 6);
+}
+
+unsigned long
+amd64bsd_dr_get_control (void)
+{
+ return amd64bsd_dr_get (inferior_ptid, 7);
+}
+
+#endif /* PT_GETDBREGS */
--- /dev/null
+/* Native-dependent code for AMD64 BSD's.
+
+ Copyright (C) 2011-2012 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef AMD64BSD_NAT_H
+#define AMD64BSD_NAT_H
+
+/* Low level amd64 debug register functions. */
+
+extern void amd64bsd_dr_set_control (unsigned long control);
+
+extern void amd64bsd_dr_set_addr (int regnum, CORE_ADDR addr);
+
+extern CORE_ADDR amd64bsd_dr_get_addr (int regnum);
+
+extern unsigned long amd64bsd_dr_get_status (void);
+
+extern unsigned long amd64bsd_dr_get_control (void);
+
+#endif /* amd64bsd-nat.h */
#include "fbsd-nat.h"
#include "amd64-tdep.h"
#include "amd64-nat.h"
+#include "amd64bsd-nat.h"
+#include "i386-nat.h"
\f
/* Offset in `struct reg' where MEMBER is stored. */
/* Add some extra features to the common *BSD/i386 target. */
t = amd64bsd_target ();
+
+#ifdef HAVE_PT_GETDBREGS
+
+ i386_use_watchpoints (t);
+
+ i386_dr_low.set_control = amd64bsd_dr_set_control;
+ i386_dr_low.set_addr = amd64bsd_dr_set_addr;
+ i386_dr_low.get_addr = amd64bsd_dr_get_addr;
+ i386_dr_low.get_status = amd64bsd_dr_get_status;
+ i386_dr_low.get_control = amd64bsd_dr_get_control;
+ i386_set_debug_register_length (8);
+
+#endif /* HAVE_PT_GETDBREGS */
+
t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
t->to_find_memory_regions = fbsd_find_memory_regions;
t->to_make_corefile_notes = fbsd_make_corefile_notes;
# Host: FreeBSD/amd64
NATDEPFILES= fork-child.o inf-ptrace.o \
fbsd-nat.o amd64-nat.o amd64bsd-nat.o amd64fbsd-nat.o \
- bsd-kvm.o
+ bsd-kvm.o i386-nat.o
LOADLIBES= -lkvm
projects / binutils-gdb.git / commitdiff