From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 88157 invoked by alias); 21 Jan 2016 16:14:17 -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 88146 invoked by uid 89); 21 Jan 2016 16:14:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=UD:collection.exp, collectionexp, collection.exp, our 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; Thu, 21 Jan 2016 16:14:15 +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 B6730C076627; Thu, 21 Jan 2016 16:14:14 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0LGED19029200; Thu, 21 Jan 2016 11:14:13 -0500 Message-ID: <56A103D5.2090505@redhat.com> Date: Thu, 21 Jan 2016 16:14: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: =?UTF-8?B?TWFyY2luIEtvxZtjaWVsbmlja2k=?= , gdb-patches@sourceware.org Subject: Re: [PATCH] gdb.trace: Fix string collection for 64-bit platforms. References: <1453392126-2242-1-git-send-email-koriakin@0x04.net> In-Reply-To: <1453392126-2242-1-git-send-email-koriakin@0x04.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2016-01/txt/msg00538.txt.bz2 On 01/21/2016 04:02 PM, Marcin Kościelnicki wrote: > String collection always used ref32 to fetch the string pointer. Make it > use ref64 when pointeer size is 64-bit. "pointer". > > This appeared to work on x86_64 since it's a little-endian platform, and > malloc (used in gdb.trace/collection.exp) returns addresses in low 4GB. > Noticed and tested on s390x-ibm-linux-gnu, also tested on > i686-unknown-linux-gnu and x86_64-unknown-linux-gnu. > > gdb/ChangeLog: > > * ax-gdb.c (gen_traced_pop): Use aop_ref64 when appropriate for > string collection. > --- > OK to push? > > gdb/ChangeLog | 5 +++++ > gdb/ax-gdb.c | 5 ++++- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/gdb/ChangeLog b/gdb/ChangeLog > index 45d8ef9..3f4d152 100644 > --- a/gdb/ChangeLog > +++ b/gdb/ChangeLog > @@ -1,3 +1,8 @@ > +2016-01-21 Marcin Kościelnicki > + > + * ax-gdb.c (gen_traced_pop): Use aop_ref64 when appropriate for > + string collection. > + > 2016-01-21 Andrew Burgess > > * disasm.c (maybe_add_dis_line_entry): Rename to... > diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c > index dd6eee6..d17cb04 100644 > --- a/gdb/ax-gdb.c > +++ b/gdb/ax-gdb.c > @@ -410,7 +410,10 @@ gen_traced_pop (struct gdbarch *gdbarch, > > if (string_trace) > { > - ax_simple (ax, aop_ref32); > + if (TYPE_LENGTH(value->type) == 4) Missing space before parens. > + ax_simple (ax, aop_ref32); > + else > + ax_simple (ax, aop_ref64); > + if (TYPE_LENGTH(value->type) == 4) > + ax_simple (ax, aop_ref32); > + else > + ax_simple (ax, aop_ref64); Missing space before parens. I was going to say to check for == 8 instead so that we don't pessimize the 8/16 bits cases, but sounds better even to factor out the switch in gen_fetch, so that the ref8/ref16 are covered as well: switch (TYPE_LENGTH (type)) { case 8 / TARGET_CHAR_BIT: ax_simple (ax, aop_ref8); break; case 16 / TARGET_CHAR_BIT: ax_simple (ax, aop_ref16); break; case 32 / TARGET_CHAR_BIT: ax_simple (ax, aop_ref32); break; case 64 / TARGET_CHAR_BIT: ax_simple (ax, aop_ref64); break; /* Either our caller shouldn't have asked us to dereference that pointer (other code's fault), or we're not implementing something we should be (this code's fault). In any case, it's a bug the user shouldn't see. */ default: internal_error (__FILE__, __LINE__, WDYT? Thanks, Pedro Alves