From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@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 ; 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?= To: gdb-patches@sourceware.org Cc: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Subject: [PATCH] gdb.trace: Fix string collection for 64-bit platforms. Date: Thu, 21 Jan 2016 16:02:00 -0000 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 X-SW-Source: 2016-01/txt/msg00536.txt.bz2 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(-) 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) + ax_simple (ax, aop_ref32); + else + ax_simple (ax, aop_ref64); ax_const_l (ax, ax->trace_string); ax_simple (ax, aop_tracenz); } -- 2.7.0