[4/7] gdbserver: btrace enums
Commit Message
On 10/28/2015 03:29 PM, Metzger, Markus T wrote:
>> -----Original Message-----
>> From: gdb-patches-owner@sourceware.org [mailto:gdb-patches-
>> owner@sourceware.org] On Behalf Of Pedro Alves
>> Sent: Wednesday, October 28, 2015 3:59 PM
>> To: gdb-patches@sourceware.org
>> Subject: [PATCH 4/7] gdbserver: btrace enums
>
> Hello Pedro,
Hi Markus,
>
>> ../../../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.
>
> At that time, you had to include server.h/defs.h before vec.h. So I couldn't
> include btrace-common.h (which includes vec.h and also server.h) into target.h,
> which was in turn included in server.h.
>
>
> The patch looks good to me.
Thanks. I updated the git log to point to your explanation here, and
pushed this in.
Thanks.
---
Subject: [PATCH] gdbserver: btrace enums
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,
^
The cyclic dependency the comment talks about is no longer relevant:
https://sourceware.org/ml/gdb-patches/2015-10/msg00643.html
gdb/gdbserver/ChangeLog:
2015-10-29 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/ChangeLog | 18 ++++++++++++++++++
gdb/gdbserver/linux-low.c | 2 +-
gdb/gdbserver/server.c | 3 ++-
gdb/gdbserver/target.h | 6 +++---
4 files changed, 24 insertions(+), 5 deletions(-)
@@ -16,6 +16,24 @@
* linux-x86-low.c (x86_regsets): Likewise.
* linux-xtensa-low.c (xtensa_regsets): Likewise.
+2015-10-29 Pedro Alves <palves@redhat.com>
+
+ * linux-low.h (NULL_REGSET): Define.
+ * linux-aarch64-low.c (aarch64_regsets): Use NULL_REGSET.
+ * linux-arm-low.c (arm_regsets): Likewise.
+ * linux-crisv32-low.c (cris_regsets): Likewise.
+ * linux-m68k-low.c (m68k_regsets): Likewise.
+ * linux-mips-low.c (mips_regsets): Likewise.
+ * linux-nios2-low.c (nios2_regsets): Likewise.
+ * linux-ppc-low.c (ppc_regsets): Likewise.
+ * linux-s390-low.c (s390_regsets): Likewise.
+ * linux-sh-low.c (sh_regsets): Likewise.
+ * linux-sparc-low.c (sparc_regsets): Likewise.
+ * linux-tic6x-low.c (tic6x_regsets): Likewise.
+ * linux-tile-low.c (tile_regsets): Likewise.
+ * linux-x86-low.c (x86_regsets): Likewise.
+ * linux-xtensa-low.c (xtensa_regsets): Likewise.
+
2015-10-26 Doug Evans <dje@google.com>
* linux-low.c (__SIGRTMIN): Move to nat/linux-nat.h.
@@ -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;
@@ -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;
@@ -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