From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6429 invoked by alias); 23 May 2012 11:25:20 -0000 Received: (qmail 5764 invoked by uid 22791); 23 May 2012 11:25:06 -0000 X-SWARE-Spam-Status: No, hits=-7.8 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 23 May 2012 11:24:50 +0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 23 May 2012 04:24:23 -0700 X-ExtLoop1: 1 Received: from swsutil001.isw.intel.com ([10.237.237.11]) by AZSMGA002.ch.intel.com with ESMTP; 23 May 2012 04:24:22 -0700 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 q4NBOKrA020839; Wed, 23 May 2012 12:24:21 +0100 Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id q4NBOKDk020512; Wed, 23 May 2012 13:24:20 +0200 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id q4NBOKfr020508; Wed, 23 May 2012 13:24:20 +0200 From: markus.t.metzger@intel.com To: kettenis@gnu.org Cc: gdb-patches@sourceware.org, markus.t.metzger@gmail.com, Markus Metzger Subject: [PATCH 16/16] gdbserver, linux, btrace: add btrace support for linux-low Date: Wed, 23 May 2012 11:25:00 -0000 Message-Id: <1337772151-20265-17-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1337772151-20265-1-git-send-email-markus.t.metzger@intel.com> References: <1337772151-20265-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: 2012-05/txt/msg00873.txt.bz2 From: Markus Metzger Implement btrace target ops in target linux-low using the common linux-btrace functions. Add linux-btrace.o to all targets that link linux-low.o. I'd rather not link it to targets that do not support branch tracing, but this would require changing the way target ops are defined for gdbserver. 2012-05-23 Markus Metzger gdb/gdbserver/ * linux-low: Include linux-btrace.h (linux_low_enable_btrace): New function (linux_low_print_btrace_record): New function (linux_low_read_btrace): New function (linux_target_ops): Add btrace ops * configure.srv: Add linux-btrace.o --- gdb/gdbserver/configure.srv | 34 +++++++++++++++++----------------- gdb/gdbserver/linux-low.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 17 deletions(-) diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index e6ae157..7f33dd1 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -47,7 +47,7 @@ case "${target}" in srv_regobj="${srv_regobj} arm-with-vfpv3.o" srv_regobj="${srv_regobj} arm-with-neon.o" srv_tgtobj="linux-low.o linux-osdata.o linux-arm-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_xmlfiles="arm-with-iwmmxt.xml" srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv2.xml" srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv3.xml" @@ -70,19 +70,19 @@ case "${target}" in ;; bfin-*-*linux*) srv_regobj=reg-bfin.o srv_tgtobj="linux-low.o linux-osdata.o linux-bfin-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes srv_linux_thread_db=yes ;; crisv32-*-linux*) srv_regobj=reg-crisv32.o srv_tgtobj="linux-low.o linux-osdata.o linux-crisv32-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_regsets=yes srv_linux_thread_db=yes ;; cris-*-linux*) srv_regobj=reg-cris.o srv_tgtobj="linux-low.o linux-osdata.o linux-cris-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes srv_linux_thread_db=yes ;; @@ -97,7 +97,7 @@ case "${target}" in srv_xmlfiles="${srv_xmlfiles} $srv_amd64_linux_xmlfiles" fi srv_tgtobj="linux-low.o linux-osdata.o linux-x86-low.o i386-low.o i387-fp.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes @@ -129,12 +129,12 @@ case "${target}" in ;; ia64-*-linux*) srv_regobj=reg-ia64.o srv_tgtobj="linux-low.o linux-osdata.o linux-ia64-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes ;; m32r*-*-linux*) srv_regobj=reg-m32r.o srv_tgtobj="linux-low.o linux-osdata.o linux-m32r-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes srv_linux_thread_db=yes ;; @@ -144,7 +144,7 @@ case "${target}" in srv_regobj=reg-m68k.o fi srv_tgtobj="linux-low.o linux-osdata.o linux-m68k-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes @@ -155,7 +155,7 @@ case "${target}" in srv_regobj=reg-m68k.o fi srv_tgtobj="linux-low.o linux-osdata.o linux-m68k-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes @@ -165,7 +165,7 @@ case "${target}" in srv_regobj="${srv_regobj} mips64-linux.o" srv_regobj="${srv_regobj} mips64-dsp-linux.o" srv_tgtobj="linux-low.o linux-osdata.o linux-mips-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_xmlfiles="mips-linux.xml" srv_xmlfiles="${srv_xmlfiles} mips-dsp-linux.xml" srv_xmlfiles="${srv_xmlfiles} mips-cpu.xml" @@ -198,7 +198,7 @@ case "${target}" in srv_regobj="${srv_regobj} powerpc-isa205-altivec64l.o" srv_regobj="${srv_regobj} powerpc-isa205-vsx64l.o" srv_tgtobj="linux-low.o linux-osdata.o linux-ppc-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_xmlfiles="rs6000/powerpc-32l.xml" srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-altivec32l.xml" srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-cell32l.xml" @@ -241,7 +241,7 @@ case "${target}" in srv_regobj="${srv_regobj} s390x-linux64v1.o" srv_regobj="${srv_regobj} s390x-linux64v2.o" srv_tgtobj="linux-low.o linux-osdata.o linux-s390-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_xmlfiles="s390-linux32.xml" srv_xmlfiles="${srv_xmlfiles} s390-linux32v1.xml" srv_xmlfiles="${srv_xmlfiles} s390-linux32v2.xml" @@ -262,14 +262,14 @@ case "${target}" in ;; sh*-*-linux*) srv_regobj=reg-sh.o srv_tgtobj="linux-low.o linux-osdata.o linux-sh-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes ;; sparc*-*-linux*) srv_regobj=reg-sparc64.o srv_tgtobj="linux-low.o linux-osdata.o linux-sparc-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_regsets=yes srv_linux_thread_db=yes ;; @@ -286,14 +286,14 @@ case "${target}" in srv_xmlfiles="${srv_xmlfiles} tic6x-gp.xml" srv_xmlfiles="${srv_xmlfiles} tic6x-c6xp.xml" srv_tgtobj="linux-low.o linux-osdata.o linux-tic6x-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_regsets=yes srv_linux_usrregs=yes srv_linux_thread_db=yes ;; x86_64-*-linux*) srv_regobj="$srv_amd64_linux_regobj $srv_i386_linux_regobj" srv_tgtobj="linux-low.o linux-osdata.o linux-x86-low.o i386-low.o i387-fp.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_xmlfiles="$srv_i386_linux_xmlfiles $srv_amd64_linux_xmlfiles" srv_linux_usrregs=yes # This is for i386 progs. srv_linux_regsets=yes @@ -308,7 +308,7 @@ case "${target}" in xtensa*-*-linux*) srv_regobj=reg-xtensa.o srv_tgtobj="linux-low.o linux-osdata.o linux-xtensa-low.o linux-procfs.o" - srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o linux-btrace.o" srv_linux_regsets=yes ;; *) echo "Error: target not supported by gdbserver." diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 5fe19fd..f041a56 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -20,6 +20,7 @@ #include "linux-low.h" #include "linux-osdata.h" #include "agent.h" +#include "linux-btrace.h" #include #include @@ -5777,6 +5778,42 @@ linux_qxfer_libraries_svr4 (const char *annex, unsigned char *readbuf, return len; } +static int +linux_low_print_btrace_record (struct linux_btrace_block *raw, void *arg) +{ + struct buffer *buffer = arg; + + if (!raw) + return EINVAL; + + if (!buffer) + return EINVAL; + + buffer_xml_printf (buffer, "\n", + paddress (raw->begin), paddress (raw->end)); + + return 0; +} + +static int +linux_low_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer) +{ + int errcode; + + if (!tinfo || !buffer) + return EINVAL; + + if (!tinfo->ptr_bits) + tinfo->ptr_bits = register_size (0) * 8; + + buffer_grow_str (buffer, "\n"); + buffer_grow_str (buffer, "\n"); + errcode = linux_read_btrace (tinfo, linux_low_print_btrace_record, buffer); + buffer_grow_str (buffer, "\n"); + + return errcode; +} + static struct target_ops linux_target_ops = { linux_create_inferior, linux_attach, @@ -5841,6 +5878,11 @@ static struct target_ops linux_target_ops = { linux_get_min_fast_tracepoint_insn_len, linux_qxfer_libraries_svr4, linux_supports_agent, + linux_supports_btrace, + linux_enable_btrace, + linux_disable_btrace, + linux_btrace_has_changed, + linux_low_read_btrace, }; static void -- 1.7.1