From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 75406 invoked by alias); 27 Oct 2016 06:29:34 -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 75301 invoked by uid 89); 27 Oct 2016 06:29:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=cancelled X-HELO: mga09.intel.com Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 27 Oct 2016 06:29:24 +0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP; 26 Oct 2016 23:29:21 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga004.jf.intel.com with ESMTP; 26 Oct 2016 23:29:20 -0700 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u9R6TJrT013780; Thu, 27 Oct 2016 07:29:19 +0100 Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id u9R6TJ0K003338; Thu, 27 Oct 2016 08:29:19 +0200 Received: (from twiederh@localhost) by ulvlx001.iul.intel.com with œ id u9R6TJQn003335; Thu, 27 Oct 2016 08:29:19 +0200 From: Tim Wiederhake To: gdb-patches@sourceware.org Cc: palves@redhat.com, markus.t.metzger@intel.com Subject: [PATCH 2/7] btrace: Export btrace_decode_error function. Date: Thu, 27 Oct 2016 06:29:00 -0000 Message-Id: <1477549711-2603-3-git-send-email-tim.wiederhake@intel.com> In-Reply-To: <1477549711-2603-1-git-send-email-tim.wiederhake@intel.com> References: <1477549711-2603-1-git-send-email-tim.wiederhake@intel.com> X-IsSubscribed: yes X-SW-Source: 2016-10/txt/msg00734.txt.bz2 2016-10-26 Tim Wiederhake gdb/ChangeLog: * record-btrace.c (btrace_ui_out_decode_error): Move most of it ... * btrace.c (btrace_decode_error): ... here. New function. * btrace.h (btrace_decode_error): New export. --- gdb/btrace.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ gdb/btrace.h | 5 +++++ gdb/record-btrace.c | 59 ++++------------------------------------------------- 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/gdb/btrace.c b/gdb/btrace.c index 16ce2ef..0d1ba39 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -1278,6 +1278,55 @@ btrace_maint_clear (struct btrace_thread_info *btinfo) /* See btrace.h. */ +const char * +btrace_decode_error (enum btrace_format format, int errcode) +{ + switch (format) + { + case BTRACE_FORMAT_BTS: + switch (errcode) + { + case BDE_BTS_OVERFLOW: + return _("instruction overflow"); + + case BDE_BTS_INSN_SIZE: + return _("unknown instruction"); + + default: + break; + } + break; + +#if defined (HAVE_LIBIPT) + case BTRACE_FORMAT_PT: + switch (errcode) + { + case BDE_PT_USER_QUIT: + return _("trace decode cancelled"); + + case BDE_PT_DISABLED: + return _("disabled"); + + case BDE_PT_OVERFLOW: + return _("overflow"); + + default: + if (errcode < 0) + return pt_errstr (pt_errcode (errcode)); + break; + } + break; +#endif /* defined (HAVE_LIBIPT) */ + + default: + break; + } + + return _("unknown"); +} + +/* See btrace.h. */ + void btrace_fetch (struct thread_info *tp) { diff --git a/gdb/btrace.h b/gdb/btrace.h index 114242d..d0497b4 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -384,6 +384,11 @@ extern void btrace_disable (struct thread_info *); target_teardown_btrace instead of target_disable_btrace. */ extern void btrace_teardown (struct thread_info *); +/* Return a human readable error string for the given ERRCODE in FORMAT. + The pointer will never be NULL and must not be freed. */ + +extern const char *btrace_decode_error (enum btrace_format format, int errcode); + /* Fetch the branch trace for a single thread. */ extern void btrace_fetch (struct thread_info *); diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 84ce3ea..e57678b 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -464,63 +464,12 @@ static void btrace_ui_out_decode_error (struct ui_out *uiout, int errcode, enum btrace_format format) { - const char *errstr; - int is_error; - - errstr = _("unknown"); - is_error = 1; - - switch (format) - { - default: - break; - - case BTRACE_FORMAT_BTS: - switch (errcode) - { - default: - break; - - case BDE_BTS_OVERFLOW: - errstr = _("instruction overflow"); - break; - - case BDE_BTS_INSN_SIZE: - errstr = _("unknown instruction"); - break; - } - break; - -#if defined (HAVE_LIBIPT) - case BTRACE_FORMAT_PT: - switch (errcode) - { - case BDE_PT_USER_QUIT: - is_error = 0; - errstr = _("trace decode cancelled"); - break; - - case BDE_PT_DISABLED: - is_error = 0; - errstr = _("disabled"); - break; - - case BDE_PT_OVERFLOW: - is_error = 0; - errstr = _("overflow"); - break; - - default: - if (errcode < 0) - errstr = pt_errstr (pt_errcode (errcode)); - break; - } - break; -#endif /* defined (HAVE_LIBIPT) */ - } + const char *errstr = btrace_decode_error (format, errcode); ui_out_text (uiout, _("[")); - if (is_error) + + /* ERRCODE > 0 indicates notifications on BTRACE_FORMAT_PT. */ + if (!(format == BTRACE_FORMAT_PT && errcode > 0)) { ui_out_text (uiout, _("decode error (")); ui_out_field_int (uiout, "errcode", errcode); -- 2.7.4