From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 77156 invoked by alias); 25 Jul 2017 16:51:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 77134 invoked by uid 89); 25 Jul 2017 16:51:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=HX-Greylist:succeeded, HX-Greylist:SMTP, HX-Greylist:AUTH X-HELO: mail.baldwin.cx Received: from bigwig.baldwin.cx (HELO mail.baldwin.cx) (96.47.65.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Jul 2017 16:51:30 +0000 Received: from ralph.baldwin.cx.net (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id 5DAF110AF07; Tue, 25 Jul 2017 12:51:28 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org, coypu@sdf.org Subject: [PATCH v2 2/2] Enable support for x86 debug registers on NetBSD. Date: Tue, 25 Jul 2017 16:51:00 -0000 Message-Id: <20170725165051.9132-3-jhb@FreeBSD.org> In-Reply-To: <20170725165051.9132-1-jhb@FreeBSD.org> References: <20170725165051.9132-1-jhb@FreeBSD.org> X-IsSubscribed: yes X-SW-Source: 2017-07/txt/msg00370.txt.bz2 NetBSD recently added PT_GETDBREGS and PT_SETDBREGS ptrace operations that match the existing ones supported by x86-bsd-nat.c. NetBSD's headers do not provide the DBREG_DRX helper macro, so define a local version in x86-bsd-nat.c. In addition, add the x86-nat.o and x86-dregs.o object files to the native NetBSD x86 build targets. gdb/ChangeLog: * configure.nat: Add "x86-nat.o x86-dregs.o" for NetBSD/amd64 and NetBSD/i386. * x86-bsd-nat.c [!DBREG_DRX && __NetBSD__]: Define DBREG_DRX. --- gdb/ChangeLog | 6 ++++++ gdb/configure.nat | 8 ++++---- gdb/x86-bsd-nat.c | 9 +++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e06712d645..e24698ae30 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2017-07-25 John Baldwin + * configure.nat: Add "x86-nat.o x86-dregs.o" for NetBSD/amd64 and + NetBSD/i386. + * x86-bsd-nat.c [!DBREG_DRX && __NetBSD__]: Define DBREG_DRX. + +2017-07-25 John Baldwin + * bsd-kvm.o: Define _KMEMUSER. * configure.ac: Define _KMEMUSER when checking for "struct lwp". * configure: Regenerate. diff --git a/gdb/configure.nat b/gdb/configure.nat index b32c9aa849..b1dda30852 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -338,8 +338,8 @@ case ${gdb_host} in case ${gdb_host_cpu} in i386) # Host: NetBSD/amd64 - NATDEPFILES="${NATDEPFILES} nbsd-nat.o amd64-nat.o \ - x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o" + NATDEPFILES="${NATDEPFILES} nbsd-nat.o amd64-nat.o x86-nat.o \ + x86-dregs.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o" ;; sparc) # Host: NetBSD/sparc64 @@ -358,8 +358,8 @@ case ${gdb_host} in ;; i386) # Host: NetBSD/i386 ELF - NATDEPFILES="${NATDEPFILES} nbsd-nat.o x86-bsd-nat.o \ - i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o" + NATDEPFILES="${NATDEPFILES} nbsd-nat.o x86-nat.o x86-dregs.o \ + x86-bsd-nat.o i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o" LOADLIBES='-lkvm' ;; m68k) diff --git a/gdb/x86-bsd-nat.c b/gdb/x86-bsd-nat.c index 2ff661c179..1d37b2f05d 100644 --- a/gdb/x86-bsd-nat.c +++ b/gdb/x86-bsd-nat.c @@ -51,11 +51,16 @@ x86bsd_mourn_inferior (struct target_ops *ops) super_mourn_inferior (ops); } -/* Not all versions of FreeBSD/i386 that support the debug registers - have this macro. */ +/* Helper macro to access debug register X. FreeBSD/amd64 and modern + versions of FreeBSD/i386 provide this macro in system headers. Define + a local version for systems that do not provide it. */ #ifndef DBREG_DRX +#ifdef __NetBSD__ +#define DBREG_DRX(d, x) ((d)->dr[x]) +#else #define DBREG_DRX(d, x) ((&d->dr0)[x]) #endif +#endif static unsigned long x86bsd_dr_get (ptid_t ptid, int regnum) -- 2.13.3