From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13132 invoked by alias); 4 Mar 2013 17:07:45 -0000 Received: (qmail 12907 invoked by uid 22791); 4 Mar 2013 17:07:30 -0000 X-SWARE-Spam-Status: No, hits=-7.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 04 Mar 2013 17:06:20 +0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 04 Mar 2013 09:06:18 -0800 X-ExtLoop1: 1 Received: from swsutil001.isw.intel.com ([10.237.237.11]) by fmsmga002.fm.intel.com with ESMTP; 04 Mar 2013 09:06:17 -0800 Received: from ulslx001.iul.intel.com (ulslx001.iul.intel.com [172.28.207.63]) by swsutil001.isw.intel.com (8.13.6/8.13.6/MailSET/Hub) with ESMTP id r24H6Bg5004048; Mon, 4 Mar 2013 17:06:12 GMT Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id r24H6BRk020026; Mon, 4 Mar 2013 18:06:11 +0100 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id r24H6BTu020022; Mon, 4 Mar 2013 18:06:11 +0100 From: Markus Metzger To: jan.kratochvil@redhat.com Cc: gdb-patches@sourceware.org, markus.t.metzger@gmail.com Subject: [patch v9 03/23] linux, i386, amd64: enable btrace for 32bit and 64bit linux native Date: Mon, 04 Mar 2013 17:07:00 -0000 Message-Id: <1362416770-19750-4-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1362416770-19750-1-git-send-email-markus.t.metzger@intel.com> References: <1362416770-19750-1-git-send-email-markus.t.metzger@intel.com> X-IsSubscribed: yes 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 X-SW-Source: 2013-03/txt/msg00099.txt.bz2 Install the btrace target ops for i386-linux-nat and amd64-linux-nat. 2013-03-04 Markus Metzger * amd64-linux-nat.c: Include btrace.h and linux-btrace.h. (amd64_linux_enable_btrace): New. (amd64_linux_disable_btrace): New. (_initialize_amd64_linux_nat): Initialize btrace ops. * i386-linux.nat.c: Include btrace.h and linux-btrace.h. (i386_linux_enable_btrace): New. (i386_linux_disable_btrace): New. (_initialize_i386_linux_nat): Initialize btrace ops. * config/i386/linux.mh: Add linux-btrace.o. * config/i386/linux64.mh: Add linux-btrace.o. --- gdb/amd64-linux-nat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ gdb/config/i386/linux.mh | 3 ++- gdb/config/i386/linux64.mh | 2 +- gdb/i386-linux-nat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 2 deletions(-) diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index 3d1983b..c82edda 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -25,6 +25,8 @@ #include "regset.h" #include "linux-nat.h" #include "amd64-linux-tdep.h" +#include "linux-btrace.h" +#include "btrace.h" #include "gdb_assert.h" #include "gdb_string.h" @@ -1119,6 +1121,39 @@ amd64_linux_read_description (struct target_ops *ops) } } +/* Enable branch tracing. */ + +static struct btrace_target_info * +amd64_linux_enable_btrace (ptid_t ptid) +{ + struct btrace_target_info *tinfo; + struct gdbarch *gdbarch; + + errno = 0; + tinfo = linux_enable_btrace (ptid); + + if (tinfo == NULL) + error (_("Could not enable branch tracing for %s: %s."), + target_pid_to_str (ptid), safe_strerror (errno)); + + /* Fill in the size of a pointer in bits. */ + gdbarch = target_thread_architecture (ptid); + tinfo->ptr_bits = gdbarch_ptr_bit (gdbarch); + + return tinfo; +} + +/* Disable branch tracing. */ + +static void +amd64_linux_disable_btrace (struct btrace_target_info *tinfo) +{ + int errcode = linux_disable_btrace (tinfo); + + if (errcode != 0) + error (_("Could not disable branch tracing: %s."), safe_strerror (errcode)); +} + /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_amd64_linux_nat (void); @@ -1157,6 +1192,13 @@ _initialize_amd64_linux_nat (void) t->to_read_description = amd64_linux_read_description; + /* Add btrace methods. */ + t->to_supports_btrace = linux_supports_btrace; + t->to_enable_btrace = amd64_linux_enable_btrace; + t->to_disable_btrace = amd64_linux_disable_btrace; + t->to_btrace_has_changed = linux_btrace_has_changed; + t->to_read_btrace = linux_read_btrace; + /* Register the target. */ linux_nat_add_target (t); linux_nat_set_new_thread (t, amd64_linux_new_thread); diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh index 8316d87..7c64e83 100644 --- a/gdb/config/i386/linux.mh +++ b/gdb/config/i386/linux.mh @@ -4,7 +4,8 @@ NAT_FILE= config/nm-linux.h NATDEPFILES= inf-ptrace.o fork-child.o \ i386-nat.o i386-linux-nat.o \ proc-service.o linux-thread-db.o \ - linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o + linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \ + linux-btrace.o NAT_CDEPS = $(srcdir)/proc-service.list # The dynamically loaded libthread_db needs access to symbols in the diff --git a/gdb/config/i386/linux64.mh b/gdb/config/i386/linux64.mh index d2b95fd..8d782c1 100644 --- a/gdb/config/i386/linux64.mh +++ b/gdb/config/i386/linux64.mh @@ -3,7 +3,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \ i386-nat.o amd64-nat.o amd64-linux-nat.o \ linux-nat.o linux-osdata.o \ proc-service.o linux-thread-db.o linux-fork.o \ - linux-procfs.o linux-ptrace.o + linux-procfs.o linux-ptrace.o linux-btrace.o NAT_FILE= config/nm-linux.h NAT_CDEPS = $(srcdir)/proc-service.list diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 11b510d..d439133 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -25,6 +25,8 @@ #include "regset.h" #include "target.h" #include "linux-nat.h" +#include "linux-btrace.h" +#include "btrace.h" #include "gdb_assert.h" #include "gdb_string.h" @@ -1046,6 +1048,39 @@ i386_linux_read_description (struct target_ops *ops) return tdesc_i386_linux; } +/* Enable branch tracing. */ + +static struct btrace_target_info * +i386_linux_enable_btrace (ptid_t ptid) +{ + struct btrace_target_info *tinfo; + struct gdbarch *gdbarch; + + errno = 0; + tinfo = linux_enable_btrace (ptid); + + if (tinfo == NULL) + error (_("Could not enable branch tracing for %s: %s."), + target_pid_to_str (ptid), safe_strerror (errno)); + + /* Fill in the size of a pointer in bits. */ + gdbarch = target_thread_architecture (ptid); + tinfo->ptr_bits = gdbarch_ptr_bit (gdbarch); + + return tinfo; +} + +/* Disable branch tracing. */ + +static void +i386_linux_disable_btrace (struct btrace_target_info *tinfo) +{ + int errcode = linux_disable_btrace (tinfo); + + if (errcode != 0) + error (_("Could not disable branch tracing: %s."), safe_strerror (errcode)); +} + /* -Wmissing-prototypes */ extern initialize_file_ftype _initialize_i386_linux_nat; @@ -1079,6 +1114,13 @@ _initialize_i386_linux_nat (void) t->to_read_description = i386_linux_read_description; + /* Add btrace methods. */ + t->to_supports_btrace = linux_supports_btrace; + t->to_enable_btrace = i386_linux_enable_btrace; + t->to_disable_btrace = i386_linux_disable_btrace; + t->to_btrace_has_changed = linux_btrace_has_changed; + t->to_read_btrace = linux_read_btrace; + /* Register the target. */ linux_nat_add_target (t); linux_nat_set_new_thread (t, i386_linux_new_thread); -- 1.7.1