From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31356 invoked by alias); 10 May 2012 15:18:06 -0000 Received: (qmail 31221 invoked by uid 22791); 10 May 2012 15:18:04 -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 mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 10 May 2012 15:17:46 +0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 10 May 2012 08:16:25 -0700 X-ExtLoop1: 1 Received: from swsutil001.isw.intel.com ([10.237.237.11]) by AZSMGA002.ch.intel.com with ESMTP; 10 May 2012 08:16:23 -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 q4AFGMbq021823; Thu, 10 May 2012 16:16:22 +0100 Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id q4AFGMAP025538; Thu, 10 May 2012 17:16:22 +0200 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id q4AFGMrU025534; Thu, 10 May 2012 17:16:22 +0200 From: markus.t.metzger@intel.com To: gdb-patches@sourceware.org Cc: markus.t.metzger@gmail.com, Markus Metzger Subject: [PATCH 13/16] xml, btrace: define btrace xml document style Date: Thu, 10 May 2012 15:18:00 -0000 Message-Id: <1336662810-21937-14-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1336662810-21937-1-git-send-email-markus.t.metzger@intel.com> References: <1336662810-21937-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/msg00361.txt.bz2 From: Markus Metzger Define the xml document style for transferring branch trace data. Add a function to parse a btrace xml document into a vector of branch trace blocks. 2012-05-10 Markus Metzger gdb/features/ * btrace.dtd: New file gdb/ * Makefile.in (XMLFILES): Add btrace.dtd * btrace.h (parse_xml_btrace): New declaration * btrace.c (parse_xml_btrace): New function (parse_xml_btrace_block): New function (block_attributes): New struct (btrace_attributes): New struct (btrace_children): New struct (btrace_elements): New struct --- gdb/Makefile.in | 3 +- gdb/btrace.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ gdb/btrace.h | 3 ++ gdb/features/btrace.dtd | 12 +++++++ 4 files changed, 98 insertions(+), 1 deletions(-) create mode 100644 gdb/features/btrace.dtd diff --git a/gdb/Makefile.in b/gdb/Makefile.in index b3fdd4f..5c31ecd 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -489,7 +489,8 @@ RUNTESTFLAGS= XMLFILES = $(srcdir)/features/gdb-target.dtd $(srcdir)/features/xinclude.dtd \ $(srcdir)/features/library-list.dtd \ $(srcdir)/features/library-list-svr4.dtd $(srcdir)/features/osdata.dtd \ - $(srcdir)/features/threads.dtd $(srcdir)/features/traceframe-info.dtd + $(srcdir)/features/threads.dtd $(srcdir)/features/traceframe-info.dtd \ + $(srcdir)/features/btrace.dtd # This is ser-unix.o for any system which supports a v7/BSD/SYSV/POSIX # interface to the serial port. Hopefully if get ported to OS/2, VMS, diff --git a/gdb/btrace.c b/gdb/btrace.c index 2b57ca7..c2aef67 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -29,6 +29,7 @@ #include "cli/cli-utils.h" #include "arch-utils.h" #include "disasm.h" +#include "xml-support.h" #include #include @@ -798,6 +799,86 @@ cmd_btrace (char *args, int from_tty) do_btrace (trace, flags); } +#if defined(HAVE_LIBEXPAT) + +static void +check_xml_btrace_version (struct gdb_xml_parser *parser, + const struct gdb_xml_element *element, + void *user_data, VEC (gdb_xml_value_s) *attributes) +{ + const char *version = xml_find_attribute (attributes, "version")->value; + if (strcmp (version, "1.0") != 0) + gdb_xml_error (parser, _("Unsupported btrace version: \"%s\""), version); +} + +static void +parse_xml_btrace_block (struct gdb_xml_parser *parser, + const struct gdb_xml_element *element, + void *user_data, VEC (gdb_xml_value_s) *attributes) +{ + VEC (btrace_block_s) **btrace = user_data; + struct btrace_block *block = VEC_safe_push (btrace_block_s, *btrace, NULL); + ULONGEST *begin, *end; + + begin = xml_find_attribute (attributes, "begin")->value; + end = xml_find_attribute (attributes, "end")->value; + + block->begin = *begin; + block->end = *end; +} + +const struct gdb_xml_attribute block_attributes[] = { + { "begin", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, + { "end", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } +}; + +const struct gdb_xml_attribute btrace_attributes[] = { + { "version", GDB_XML_AF_NONE, NULL, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } +}; + +const struct gdb_xml_element btrace_children[] = { + { "block", block_attributes, NULL, + GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL, parse_xml_btrace_block, NULL }, + { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } +}; + +const struct gdb_xml_element btrace_elements[] = { + { "btrace", btrace_attributes, btrace_children, GDB_XML_EF_NONE, + check_xml_btrace_version, NULL }, + { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } +}; + +#endif /* defined(HAVE_LIBEXPAT) */ + +VEC (btrace_block_s) * +parse_xml_btrace (const char *buffer) +{ + VEC (btrace_block_s) *btrace = NULL; + struct cleanup *cleanup; + int errcode; + +#if defined(HAVE_LIBEXPAT) + cleanup = make_cleanup (xfree, btrace); + errcode = gdb_xml_parse_quick (_("btrace"), "btrace.dtd", btrace_elements, + buffer, &btrace); + if (errcode) + { + do_cleanups (cleanup); + errno = errcode; + return NULL; + } + + /* Keep parse results. */ + discard_cleanups (cleanup); +#else /* defined(HAVE_LIBEXPAT) */ + errno = ENOSYS; +#endif /* defined(HAVE_LIBEXPAT) */ + + return btrace; +} + void _initialize_btrace (void); void diff --git a/gdb/btrace.h b/gdb/btrace.h index 97f0f52..12e70b9 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -86,4 +86,7 @@ extern struct btrace_block *read_btrace (struct thread_info *, int); extern struct btrace_block *prev_btrace (struct thread_info *); extern struct btrace_block *next_btrace (struct thread_info *); +/* Parse a branch trace xml document into a block vector. */ +extern VEC (btrace_block_s) *parse_xml_btrace (const char*); + #endif /* BTRACE_H */ diff --git a/gdb/features/btrace.dtd b/gdb/features/btrace.dtd new file mode 100644 index 0000000..7e6bfd0 --- /dev/null +++ b/gdb/features/btrace.dtd @@ -0,0 +1,12 @@ + + + + + + + -- 1.7.1