From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8282 invoked by alias); 27 Oct 2015 12:18:11 -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 8272 invoked by uid 89); 27 Oct 2015 12:18:10 -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; Tue, 27 Oct 2015 12:18:09 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E54CB96EB; Tue, 27 Oct 2015 12:18:07 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9RCI6Hv030873; Tue, 27 Oct 2015 08:18:06 -0400 Message-ID: <562F6B7E.8090604@redhat.com> Date: Tue, 27 Oct 2015 15:17:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Simon Marchi , gdb-patches@sourceware.org, Yao Qi Subject: Re: [PATCH c++ 02/12] ctf.c: Fix int/enum implicit cast References: <1445831204-16588-1-git-send-email-simon.marchi@polymtl.ca> <1445831204-16588-2-git-send-email-simon.marchi@polymtl.ca> In-Reply-To: <1445831204-16588-2-git-send-email-simon.marchi@polymtl.ca> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2015-10/txt/msg00617.txt.bz2 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); >