From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id EB5633983064 for ; Fri, 12 Jun 2020 21:53:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EB5633983064 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id C4595117F50; Fri, 12 Jun 2020 17:53:58 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KwhqIm3qyk8u; Fri, 12 Jun 2020 17:53:58 -0400 (EDT) Received: from murgatroyd.Home (174-16-104-48.hlrn.qwest.net [174.16.104.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 82582117F39; Fri, 12 Jun 2020 17:53:58 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/4] Remove a use of target_read_string Date: Fri, 12 Jun 2020 15:53:55 -0600 Message-Id: <20200612215356.22145-4-tromey@adacore.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200612215356.22145-1-tromey@adacore.com> References: <20200612215356.22145-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2020 21:54:00 -0000 linux-tdep.c:dump_mapping_p uses target_read_string, but in a way that does not really make sense. It's better to use target_read_memory here. gdb/ChangeLog 2020-06-02 Tom Tromey * linux-tdep.c (dump_mapping_p): Use target_read_memory. --- gdb/ChangeLog | 4 ++++ gdb/linux-tdep.c | 12 +++--------- gdb/target.c | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 0f9559355f1..2dcdc630769 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -701,22 +701,16 @@ dump_mapping_p (filter_flags filterflags, const struct smaps_vmflags *v, if (!dump_p && private_p && offset == 0 && (filterflags & COREFILTER_ELF_HEADERS) != 0) { - /* Let's check if we have an ELF header. */ - gdb::unique_xmalloc_ptr header; - int errcode; - /* Useful define specifying the size of the ELF magical header. */ #ifndef SELFMAG #define SELFMAG 4 #endif - /* Read the first SELFMAG bytes and check if it is ELFMAG. */ - if (target_read_string (addr, &header, SELFMAG, &errcode) == SELFMAG - && errcode == 0) + /* Let's check if we have an ELF header. */ + gdb_byte h[SELFMAG]; + if (target_read_memory (addr, h, SELFMAG) == 0) { - const char *h = header.get (); - /* The EI_MAG* and ELFMAG* constants come from . */ if (h[EI_MAG0] == ELFMAG0 && h[EI_MAG1] == ELFMAG1 diff --git a/gdb/target.c b/gdb/target.c index 14c494688e0..897b8fdd32b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -50,6 +50,7 @@ #include "terminal.h" #include #include "target-connection.h" +#include "valprint.h" static void generic_tls_error (void) ATTRIBUTE_NORETURN; -- 2.21.3