From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21463 invoked by alias); 8 Mar 2013 09:17:27 -0000 Received: (qmail 21377 invoked by uid 22791); 8 Mar 2013 09:17:24 -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,TW_BJ 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; Fri, 08 Mar 2013 09:16:21 +0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 08 Mar 2013 01:16:18 -0800 X-ExtLoop1: 1 Received: from swsutil001.isw.intel.com ([10.237.237.11]) by fmsmga002.fm.intel.com with ESMTP; 08 Mar 2013 01:16:16 -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 r289GDxN022872; Fri, 8 Mar 2013 09:16:13 GMT Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id r289GB22002031; Fri, 8 Mar 2013 10:16:11 +0100 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id r289GBin002027; Fri, 8 Mar 2013 10:16:11 +0100 From: Markus Metzger To: jan.kratochvil@redhat.com Cc: gdb-patches@sourceware.org, markus.t.metzger@gmail.com Subject: [patch v10 04/21] xml, btrace: define btrace xml document style Date: Fri, 08 Mar 2013 09:17:00 -0000 Message-Id: <1362734168-1725-5-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1362734168-1725-1-git-send-email-markus.t.metzger@intel.com> References: <1362734168-1725-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/msg00330.txt.bz2 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. Approved by Jan Kratochvil. 2013-03-08 Markus Metzger * features/btrace.dtd: New file. * Makefile.in (XMLFILES): Add btrace.dtd. * btrace.h (parse_xml_btrace): New declaration. * btrace.c: Include xml-support.h. (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 | 94 +++++++++++++++++++++++++++++++++++++++++++++++ gdb/btrace.h | 3 + gdb/features/btrace.dtd | 12 ++++++ 4 files changed, 111 insertions(+), 1 deletions(-) create mode 100644 gdb/features/btrace.dtd diff --git a/gdb/Makefile.in b/gdb/Makefile.in index de48caa..e11e3d1 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -497,7 +497,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 cb9ebe8..75ede3a 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -29,6 +29,7 @@ #include "disasm.h" #include "source.h" #include "filenames.h" +#include "xml-support.h" /* Print a record debug message. Use do ... while (0) to avoid ambiguities when used in if statements. */ @@ -428,3 +429,96 @@ btrace_free_objfile (struct objfile *objfile) ALL_THREADS (tp) btrace_clear (tp); } + +#if defined (HAVE_LIBEXPAT) + +/* Check the btrace document version. */ + +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); +} + +/* Parse a btrace "block" xml record. */ + +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; + struct btrace_block *block; + ULONGEST *begin, *end; + + btrace = user_data; + block = VEC_safe_push (btrace_block_s, *btrace, NULL); + + begin = xml_find_attribute (attributes, "begin")->value; + end = xml_find_attribute (attributes, "end")->value; + + block->begin = *begin; + block->end = *end; +} + +static 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 } +}; + +static const struct gdb_xml_attribute btrace_attributes[] = { + { "version", GDB_XML_AF_NONE, NULL, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } +}; + +static 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 } +}; + +static 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) */ + +/* See btrace.h. */ + +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 (VEC_cleanup (btrace_block_s), &btrace); + errcode = gdb_xml_parse_quick (_("btrace"), "btrace.dtd", btrace_elements, + buffer, &btrace); + if (errcode != 0) + { + do_cleanups (cleanup); + return NULL; + } + + /* Keep parse results. */ + discard_cleanups (cleanup); + +#else /* !defined (HAVE_LIBEXPAT) */ + + error (_("Cannot process branch trace. XML parsing is not supported.")); + +#endif /* !defined (HAVE_LIBEXPAT) */ + + return btrace; +} diff --git a/gdb/btrace.h b/gdb/btrace.h index 7159313..35fb13a 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -131,4 +131,7 @@ extern void btrace_clear (struct thread_info *); /* Clear the branch trace for all threads when an object file goes away. */ extern void btrace_free_objfile (struct objfile *); +/* 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..6fe0cd6 --- /dev/null +++ b/gdb/features/btrace.dtd @@ -0,0 +1,12 @@ + + + + + + + -- 1.7.1