[c++,02/12] ctf.c: Fix int/enum implicit cast
Commit Message
This patch was taken directly from Pedro's branch.
Right now, SET_INT32_FIELD is used to set enum fields. This works in C,
but not C++. Therefore, define the new SET_ENUM_FIELD, which casts the
value to the right enum type.
gdb/ChangeLog:
* ctf.c (SET_ENUM_FIELD): New macro.
(ctf_read_status): Use it.
(ctf_read_tp): Use it.
---
gdb/ctf.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Comments
Yao, are you OK with this? ( I obviously am :-) )
Thanks,
Pedro Alves
On 10/26/2015 03:46 AM, Simon Marchi wrote:
> This patch was taken directly from Pedro's branch.
>
> Right now, SET_INT32_FIELD is used to set enum fields. This works in C,
> but not C++. Therefore, define the new SET_ENUM_FIELD, which casts the
> value to the right enum type.
>
> gdb/ChangeLog:
>
> * ctf.c (SET_ENUM_FIELD): New macro.
> (ctf_read_status): Use it.
> (ctf_read_tp): Use it.
> ---
> gdb/ctf.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/gdb/ctf.c b/gdb/ctf.c
> index 6c1aede..cb0d707 100644
> --- a/gdb/ctf.c
> +++ b/gdb/ctf.c
> @@ -914,6 +914,12 @@ ctf_open_dir (const char *dirname)
> (SCOPE), \
> #FIELD))
>
> +#define SET_ENUM_FIELD(EVENT, SCOPE, VAR, TYPE, FIELD) \
> + (VAR)->FIELD = (TYPE) bt_ctf_get_int64 (bt_ctf_get_field ((EVENT), \
> + (SCOPE), \
> + #FIELD))
> +
> +
> /* EVENT is the "status" event and TS is filled in. */
>
> static void
> @@ -922,7 +928,7 @@ ctf_read_status (struct bt_ctf_event *event, struct trace_status *ts)
> const struct bt_definition *scope
> = bt_ctf_get_top_level_scope (event, BT_EVENT_FIELDS);
>
> - SET_INT32_FIELD (event, scope, ts, stop_reason);
> + SET_ENUM_FIELD (event, scope, ts, enum trace_stop_reason, stop_reason);
> SET_INT32_FIELD (event, scope, ts, stopping_tracepoint);
> SET_INT32_FIELD (event, scope, ts, traceframe_count);
> SET_INT32_FIELD (event, scope, ts, traceframes_created);
> @@ -1058,7 +1064,7 @@ ctf_read_tp (struct uploaded_tp **uploaded_tps)
> SET_INT32_FIELD (event, scope, utp, step);
> SET_INT32_FIELD (event, scope, utp, pass);
> SET_INT32_FIELD (event, scope, utp, hit_count);
> - SET_INT32_FIELD (event, scope, utp, type);
> + SET_ENUM_FIELD (event, scope, utp, enum bptype, type);
>
> /* Read 'cmd_strings'. */
> SET_ARRAY_FIELD (event, scope, utp, cmd_num, cmd_strings);
>
On 27/10/15 12:18, Pedro Alves wrote:
> Yao, are you OK with this? ( I obviously am:-) )
OK to me.
On 27 October 2015 at 10:01, Yao Qi <qiyaoltc@gmail.com> wrote:
> OK to me.
Thanks, pushed.
@@ -914,6 +914,12 @@ ctf_open_dir (const char *dirname)
(SCOPE), \
#FIELD))
+#define SET_ENUM_FIELD(EVENT, SCOPE, VAR, TYPE, FIELD) \
+ (VAR)->FIELD = (TYPE) bt_ctf_get_int64 (bt_ctf_get_field ((EVENT), \
+ (SCOPE), \
+ #FIELD))
+
+
/* EVENT is the "status" event and TS is filled in. */
static void
@@ -922,7 +928,7 @@ ctf_read_status (struct bt_ctf_event *event, struct trace_status *ts)
const struct bt_definition *scope
= bt_ctf_get_top_level_scope (event, BT_EVENT_FIELDS);
- SET_INT32_FIELD (event, scope, ts, stop_reason);
+ SET_ENUM_FIELD (event, scope, ts, enum trace_stop_reason, stop_reason);
SET_INT32_FIELD (event, scope, ts, stopping_tracepoint);
SET_INT32_FIELD (event, scope, ts, traceframe_count);
SET_INT32_FIELD (event, scope, ts, traceframes_created);
@@ -1058,7 +1064,7 @@ ctf_read_tp (struct uploaded_tp **uploaded_tps)
SET_INT32_FIELD (event, scope, utp, step);
SET_INT32_FIELD (event, scope, utp, pass);
SET_INT32_FIELD (event, scope, utp, hit_count);
- SET_INT32_FIELD (event, scope, utp, type);
+ SET_ENUM_FIELD (event, scope, utp, enum bptype, type);
/* Read 'cmd_strings'. */
SET_ARRAY_FIELD (event, scope, utp, cmd_num, cmd_strings);