Message ID | 1453392126-2242-1-git-send-email-koriakin@0x04.net |
---|---|
State | New, archived |
Headers |
Received: (qmail 54574 invoked by alias); 21 Jan 2016 16:02:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 54545 invoked by uid 89); 21 Jan 2016 16:02:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=collectionexp, collection.exp, UD:collection.exp, HContent-Transfer-Encoding:8bit X-HELO: xyzzy.0x04.net Received: from xyzzy.0x04.net (HELO xyzzy.0x04.net) (109.74.193.254) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 21 Jan 2016 16:02:10 +0000 Received: from hogfather.0x04.net (89-65-66-135.dynamic.chello.pl [89.65.66.135]) by xyzzy.0x04.net (Postfix) with ESMTPS id 4B7703FE60 for <gdb-patches@sourceware.org>; Thu, 21 Jan 2016 17:02:51 +0100 (CET) Received: by hogfather.0x04.net (Postfix, from userid 1000) id B2A085800AC; Thu, 21 Jan 2016 17:02:07 +0100 (CET) From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin@0x04.net> To: gdb-patches@sourceware.org Cc: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin@0x04.net> Subject: [PATCH] gdb.trace: Fix string collection for 64-bit platforms. Date: Thu, 21 Jan 2016 17:02:06 +0100 Message-Id: <1453392126-2242-1-git-send-email-koriakin@0x04.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes |
Commit Message
Marcin Kościelnicki
Jan. 21, 2016, 4:02 p.m. UTC
String collection always used ref32 to fetch the string pointer. Make it use ref64 when pointeer size is 64-bit. 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(-)
Comments
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 <koriakin@0x04.net> > + > + * ax-gdb.c (gen_traced_pop): Use aop_ref64 when appropriate for > + string collection. > + > 2016-01-21 Andrew Burgess <andrew.burgess@embecosm.com> > > * 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
On 21/01/16 17:14, Pedro Alves wrote: > 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 <koriakin@0x04.net> >> + >> + * ax-gdb.c (gen_traced_pop): Use aop_ref64 when appropriate for >> + string collection. >> + >> 2016-01-21 Andrew Burgess <andrew.burgess@embecosm.com> >> >> * 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 > Fair enough, ref16 may actually be useful on some tiny platforms, and it certainly won't hurt to throw in ref8 as well. I'll do that.
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 <koriakin@0x04.net> + + * ax-gdb.c (gen_traced_pop): Use aop_ref64 when appropriate for + string collection. + 2016-01-21 Andrew Burgess <andrew.burgess@embecosm.com> * 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) + ax_simple (ax, aop_ref32); + else + ax_simple (ax, aop_ref64); ax_const_l (ax, ax->trace_string); ax_simple (ax, aop_tracenz); }