From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 003523858D1E for ; Tue, 20 Jun 2023 17:36:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 003523858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 6838C10047415 for ; Tue, 20 Jun 2023 17:36:39 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id BfHTq7Xr9LmMcBfHTq4gBu; Tue, 20 Jun 2023 17:36:39 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=GtGHRm5C c=1 sm=1 tr=0 ts=6491e3a7 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=of4jigFt-DYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=QE-MJ3eluisAw8UXgwYA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=TiHgDrfWXbZeFsTVmadQFGmFsqtTgfnrqQ/LTU8e/E4=; b=fJdq+YgLoLMdNdavjUyl4Xsf4A 2xcNUV053T2ZuNUvjl6HsBUQWhUV+d/YVgN6EAP9gLYwXwKXCVkFmALwQhGyd5IOeBMCpvorA0QBs bQWH9NV7m9zMNlaPCybYuwdmc; Received: from 75-166-136-83.hlrn.qwest.net ([75.166.136.83]:54256 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qBfHT-001PQG-87 for gdb-patches@sourceware.org; Tue, 20 Jun 2023 11:36:39 -0600 From: Tom Tromey Date: Tue, 20 Jun 2023 11:36:37 -0600 Subject: [PATCH v2 1/8] Remove mem2hex MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230619-ax-new-v2-1-47638d750dd7@tromey.com> References: <20230619-ax-new-v2-0-47638d750dd7@tromey.com> In-Reply-To: <20230619-ax-new-v2-0-47638d750dd7@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.136.83 X-Source-L: No X-Exim-ID: 1qBfHT-001PQG-87 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-136-83.hlrn.qwest.net ([192.168.0.21]) [75.166.136.83]:54256 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: tracepoint.c has a 'mem2hex' function that is functionally equivalent to bin2hex. This patch removes the redundancy. --- gdb/tracepoint.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index f297cea5b43..0af7404aef1 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -69,7 +69,7 @@ the worst case of maximum length for each of the pieces of a continuation packet. - NOTE: expressions get mem2hex'ed otherwise this would be twice as + NOTE: expressions get bin2hex'ed otherwise this would be twice as large. (400 - 31)/2 == 184 */ #define MAX_AGENT_EXPR_LEN 184 @@ -156,7 +156,6 @@ static std::string trace_stop_notes; /* support routines */ struct collection_list; -static char *mem2hex (gdb_byte *, char *, int); static counted_command_line all_tracepoint_actions (struct breakpoint *); @@ -1226,7 +1225,7 @@ collection_list::stringify () end += 10; /* 'X' + 8 hex digits + ',' */ count += 10; - end = mem2hex (m_aexprs[i]->buf, end, m_aexprs[i]->len); + end += 2 * bin2hex (m_aexprs[i]->buf, end, m_aexprs[i]->len); count += 2 * m_aexprs[i]->len; } @@ -2888,31 +2887,6 @@ set_trace_stop_notes (const char *args, int from_tty, warning (_("Target does not support trace notes, stop note ignored")); } -/* Convert the memory pointed to by mem into hex, placing result in buf. - * Return a pointer to the last char put in buf (null) - * "stolen" from sparc-stub.c - */ - -static const char hexchars[] = "0123456789abcdef"; - -static char * -mem2hex (gdb_byte *mem, char *buf, int count) -{ - gdb_byte ch; - - while (count-- > 0) - { - ch = *mem++; - - *buf++ = hexchars[ch >> 4]; - *buf++ = hexchars[ch & 0xf]; - } - - *buf = 0; - - return buf; -} - int get_traceframe_number (void) { -- 2.39.2