From patchwork Wed Oct 28 14:59:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 9420 Received: (qmail 57437 invoked by alias); 28 Oct 2015 14:59:37 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 57354 invoked by uid 89); 28 Oct 2015 14:59:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 28 Oct 2015 14:59:30 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 025E046264 for ; Wed, 28 Oct 2015 14:59:28 +0000 (UTC) Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9SExMoY026712 for ; Wed, 28 Oct 2015 10:59:28 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 4/7] gdbserver: btrace enums Date: Wed, 28 Oct 2015 14:59:19 +0000 Message-Id: <1446044362-8655-5-git-send-email-palves@redhat.com> In-Reply-To: <1446044362-8655-1-git-send-email-palves@redhat.com> References: <1446044362-8655-1-git-send-email-palves@redhat.com> MIME-Version: 1.0 Fixes: ../../../src/gdb/gdbserver/linux-low.c: In function ‘int linux_low_read_btrace(btrace_target_info*, buffer*, int)’: ../../../src/gdb/gdbserver/linux-low.c:6827:48: error: invalid conversion from ‘int’ to ‘btrace_read_type’ [-fpermissive] err = linux_read_btrace (&btrace, tinfo, type); ^ In file included from ../../../src/gdb/gdbserver/linux-low.c:98:0: ../../../src/gdb/gdbserver/../nat/linux-btrace.h:116:26: error: initializing argument 3 of ‘btrace_error linux_read_btrace(btrace_data*, btrace_target_info*, btrace_read_type)’ [-fpermissive] extern enum btrace_error linux_read_btrace (struct btrace_data *btrace, ^ I didn't spot the cyclic dependency the comment talks about. gdb/ChangeLog: 2015-10-28 Pedro Alves * linux-low.c (linux_low_read_btrace): Change type of 'type' parameter. * server.c (handle_qxfer_btrace): Change type of 'type' local. * target.h (struct target_ops) : Change type of 'type' parameter. Update comment. --- gdb/gdbserver/linux-low.c | 2 +- gdb/gdbserver/server.c | 3 ++- gdb/gdbserver/target.h | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index e778c4c..41ab510 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -6815,7 +6815,7 @@ linux_low_encode_raw (struct buffer *buffer, const gdb_byte *data, static int linux_low_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer, - int type) + enum btrace_read_type type) { struct btrace_data btrace; struct btrace_block *block; diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index ad6626e..024399d 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -1608,7 +1608,8 @@ handle_qxfer_btrace (const char *annex, { static struct buffer cache; struct thread_info *thread; - int type, result; + enum btrace_read_type type; + int result; if (the_target->read_btrace == NULL || writebuf != NULL) return -2; diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h index a14c6ff..769c876 100644 --- a/gdb/gdbserver/target.h +++ b/gdb/gdbserver/target.h @@ -399,11 +399,11 @@ struct target_ops Returns zero on success, non-zero otherwise. */ int (*disable_btrace) (struct btrace_target_info *tinfo); - /* Read branch trace data into buffer. We use an int to specify the type - to break a cyclic dependency. + /* Read branch trace data into buffer. Return 0 on success; print an error message into BUFFER and return -1, otherwise. */ - int (*read_btrace) (struct btrace_target_info *, struct buffer *, int type); + int (*read_btrace) (struct btrace_target_info *, struct buffer *, + enum btrace_read_type type); /* Read the branch trace configuration into BUFFER. Return 0 on success; print an error message into BUFFER and return -1