From patchwork Sun Mar 6 16:34:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marcin_Ko=C5=9Bcielnicki?= X-Patchwork-Id: 11223 Received: (qmail 46669 invoked by alias); 6 Mar 2016 16:40:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 46584 invoked by uid 89); 6 Mar 2016 16:40:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=3066, quantity, 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; Sun, 06 Mar 2016 16:40:13 +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 27C3741095 for ; Sun, 6 Mar 2016 17:35:58 +0100 (CET) Received: by hogfather.0x04.net (Postfix, from userid 1000) id 68511580092; Sun, 6 Mar 2016 17:35:00 +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 3/8] gdb/rs6000: Read backchain as unsigned. Date: Sun, 6 Mar 2016 17:34:52 +0100 Message-Id: <1457282097-7201-4-git-send-email-koriakin@0x04.net> In-Reply-To: <1457282097-7201-1-git-send-email-koriakin@0x04.net> References: <1457282097-7201-1-git-send-email-koriakin@0x04.net> MIME-Version: 1.0 X-IsSubscribed: yes Previously, backchain was read as a signed quantity, resulting in addresses like 0xfffffffffffeded0 instead of 0xfffeded0 returned by unwinder on 32-bit powerpc. While normally such addresses are masked off, this causes problems for tracepoints, since 0xfffffffffffeded0 is considered unavailable. Fixes a test failure in gdb.trace/entry-values.exp. gdb/ChangeLog: * corefile.c (safe_read_memory_unsigned_integer): New function. * gdbcore.h (safe_read_memory_unsigned_integer): New prototype. * rs6000-tdep.c (rs6000_frame_cache): Read backchain as unsigned. --- gdb/ChangeLog | 6 ++++++ gdb/corefile.c | 18 ++++++++++++++++++ gdb/gdbcore.h | 3 +++ gdb/rs6000-tdep.c | 6 +++--- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c2ef019..45c5276 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-03-06 Marcin Kościelnicki + + * corefile.c (safe_read_memory_unsigned_integer): New function. + * gdbcore.h (safe_read_memory_unsigned_integer): New prototype. + * rs6000-tdep.c (rs6000_frame_cache): Read backchain as unsigned. + 2016-03-05 Marcin Kościelnicki * rs6000-tdep.c (rs6000_gen_return_address): New function. diff --git a/gdb/corefile.c b/gdb/corefile.c index dbdbafc..5ad4d40 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -306,6 +306,24 @@ safe_read_memory_integer (CORE_ADDR memaddr, int len, return 1; } +/* Read memory at MEMADDR of length LEN and put the contents in + RETURN_VALUE. Return 0 if MEMADDR couldn't be read and non-zero + if successful. */ + +int +safe_read_memory_unsigned_integer (CORE_ADDR memaddr, int len, + enum bfd_endian byte_order, + ULONGEST *return_value) +{ + gdb_byte buf[sizeof (ULONGEST)]; + + if (target_read_memory (memaddr, buf, len)) + return 0; + + *return_value = extract_unsigned_integer (buf, len, byte_order); + return 1; +} + LONGEST read_memory_integer (CORE_ADDR memaddr, int len, enum bfd_endian byte_order) diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h index 5db80e5..8b101bc 100644 --- a/gdb/gdbcore.h +++ b/gdb/gdbcore.h @@ -76,6 +76,9 @@ extern int safe_read_memory_integer (CORE_ADDR memaddr, int len, extern ULONGEST read_memory_unsigned_integer (CORE_ADDR memaddr, int len, enum bfd_endian byte_order); +extern int safe_read_memory_unsigned_integer (CORE_ADDR memaddr, int len, + enum bfd_endian byte_order, + ULONGEST *return_value); /* Read an integer from debugged code memory, given address, number of bytes, and byte order for code. */ diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 565c620..2460eb5 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -3336,10 +3336,10 @@ rs6000_frame_cache (struct frame_info *this_frame, void **this_cache) if (!fdata.frameless) { /* Frameless really means stackless. */ - LONGEST backchain; + ULONGEST backchain; - if (safe_read_memory_integer (cache->base, wordsize, - byte_order, &backchain)) + if (safe_read_memory_unsigned_integer (cache->base, wordsize, + byte_order, &backchain)) cache->base = (CORE_ADDR) backchain; }