This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 4/7] gdbserver: btrace enums
- From: Pedro Alves <palves at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 28 Oct 2015 14:59:19 +0000
- Subject: [PATCH 4/7] gdbserver: btrace enums
- Authentication-results: sourceware.org; auth=none
- References: <1446044362-8655-1-git-send-email-palves at redhat dot com>
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 <palves@redhat.com>
* 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) <read_btrace>: 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
--
1.9.3