From patchwork Tue Feb 25 22:22:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 38314 Received: (qmail 60478 invoked by alias); 25 Feb 2020 22:22:50 -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 60381 invoked by uid 89); 25 Feb 2020 22:22:49 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.119) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Feb 2020 22:22:48 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 8A6C110212D for ; Tue, 25 Feb 2020 16:22:46 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 6ibGjivbOSl8q6ibGjNgsZ; Tue, 25 Feb 2020 16:22:46 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/GyLLTY8GCeIgsbRyqRcdS0v8BGWgMi7bIrTQ0SZx38=; b=Qoc8etoAwfUnxXufgnDD0K8Vcb lpxKOlXUvFqywMOWtEiRKkgZdOSoi4D6Ynp+0T62Pv/O9L9PLeiGjTEO9cr8RFjJKETIa00+bIIUD WFIbumv+ja/bgK82zoWGGK6NC; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:55644 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1j6ibG-000r0B-9e; Tue, 25 Feb 2020 15:22:46 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 2/6] Don't use sprintf_vma for CORE_ADDR Date: Tue, 25 Feb 2020 15:22:39 -0700 Message-Id: <20200225222243.8260-3-tom@tromey.com> In-Reply-To: <20200225222243.8260-1-tom@tromey.com> References: <20200225222243.8260-1-tom@tromey.com> A few spots in gdb use sprintf_vma to print a CORE_ADDR. This will fail on a 32-bit build once CORE_ADDR is always a 64-bit type. This patch replaces these calls with phex instead. 2020-02-25 Tom Tromey * remote.c (remote_target::download_tracepoint) (remote_target::enable_tracepoint) (remote_target::disable_tracepoint): Use phex, not sprintf_vma. * breakpoint.c (print_recreate_masked_watchpoint): Use phex, not sprintf_vma. --- gdb/ChangeLog | 8 ++++++++ gdb/breakpoint.c | 5 ++--- gdb/remote.c | 12 +++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 5a9352c26fe..e49025461ba 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10400,7 +10400,6 @@ static void print_recreate_masked_watchpoint (struct breakpoint *b, struct ui_file *fp) { struct watchpoint *w = (struct watchpoint *) b; - char tmp[40]; switch (b->type) { @@ -10418,8 +10417,8 @@ print_recreate_masked_watchpoint (struct breakpoint *b, struct ui_file *fp) _("Invalid hardware watchpoint type.")); } - sprintf_vma (tmp, w->hw_wp_mask); - fprintf_unfiltered (fp, " %s mask 0x%s", w->exp_string, tmp); + fprintf_unfiltered (fp, " %s mask 0x%s", w->exp_string, + phex (w->hw_wp_mask, sizeof (CORE_ADDR))); print_recreate_thread (b, fp); } diff --git a/gdb/remote.c b/gdb/remote.c index 4a70ab3fb0d..026cedcbbdc 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -12814,7 +12814,7 @@ remote_target::download_tracepoint (struct bp_location *loc) encode_actions_rsp (loc, &tdp_actions, &stepping_actions); tpaddr = loc->address; - sprintf_vma (addrbuf, tpaddr); + strcpy (addrbuf, phex (tpaddr, sizeof (CORE_ADDR))); ret = snprintf (buf.data (), buf.size (), "QTDP:%x:%s:%c:%lx:%x", b->number, addrbuf, /* address */ (b->enable_state == bp_enabled ? 'E' : 'D'), @@ -13076,11 +13076,10 @@ void remote_target::enable_tracepoint (struct bp_location *location) { struct remote_state *rs = get_remote_state (); - char addr_buf[40]; - sprintf_vma (addr_buf, location->address); xsnprintf (rs->buf.data (), get_remote_packet_size (), "QTEnable:%x:%s", - location->owner->number, addr_buf); + location->owner->number, + phex (location->address, sizeof (CORE_ADDR))); putpkt (rs->buf); remote_get_noisy_reply (); if (rs->buf[0] == '\0') @@ -13093,11 +13092,10 @@ void remote_target::disable_tracepoint (struct bp_location *location) { struct remote_state *rs = get_remote_state (); - char addr_buf[40]; - sprintf_vma (addr_buf, location->address); xsnprintf (rs->buf.data (), get_remote_packet_size (), "QTDisable:%x:%s", - location->owner->number, addr_buf); + location->owner->number, + phex (location->address, sizeof (CORE_ADDR))); putpkt (rs->buf); remote_get_noisy_reply (); if (rs->buf[0] == '\0')