From patchwork Tue Feb 27 22:20:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Baldwin X-Patchwork-Id: 86487 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EBD85385840B for ; Tue, 27 Feb 2024 22:21:36 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2607:f138:0:13::2]) by sourceware.org (Postfix) with ESMTPS id A92543858D37 for ; Tue, 27 Feb 2024 22:21:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A92543858D37 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=FreeBSD.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A92543858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f138:0:13::2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709072465; cv=none; b=WwX7Xd+afWZb+yY8wuIl9SPZ9qeEylTX05UyajMLUHjgx6yqinl6kCV5Jb8kzgSn2u9rhflVrrFrrhygA0QUJXfpVTDKjm1hMLHej1loUHZz+9727y1QZrHB8FqBcUUja6DJd5XLTHHWj2a5lvtNtNEWtW4wlR7h56HLC2bIjNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709072465; c=relaxed/simple; bh=VoQVTHyVU2nm/UEMYReixhjckupFnWocEciELhjHuDY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=VR/bH3Kfemppq3hvJj+n50xpAIsmlOn3A7ai/3Arz64bpqAggRtBq7GS++tVGh0WkKGW1ySscCgbEcwN1w//A+sGX0eaDnGd3KIzo5BSd7oiZCuUImd0ggiTwx2/oFDGaa9X/kD9YNc5a7jLS6ZLTGNQe74fYmAutnYhKs2Nd7s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from ralph.baldwin.net (c-76-133-152-3.hsd1.ca.comcast.net [76.133.152.3]) by mail.baldwin.cx (Postfix) with ESMTPSA id C10B81A84BF2 for ; Tue, 27 Feb 2024 17:20:59 -0500 (EST) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH] aarch64: Use aarch64_debug_printf in a few more places Date: Tue, 27 Feb 2024 14:20:41 -0800 Message-ID: <20240227222043.10218-1-jhb@FreeBSD.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Tue, 27 Feb 2024 17:21:00 -0500 (EST) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KHOP_HELO_FCRDNS, SPF_HELO_PASS, SPF_SOFTFAIL, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org No functional change --- gdb/arch/aarch64-insn.c | 51 +++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c index 10818757cd4..3e40a51c443 100644 --- a/gdb/arch/aarch64-insn.c +++ b/gdb/arch/aarch64-insn.c @@ -98,13 +98,10 @@ aarch64_decode_b (CORE_ADDR addr, uint32_t insn, int *is_bl, *is_bl = (insn >> 31) & 0x1; *offset = sbits (insn, 0, 25) * 4; - if (aarch64_debug) - { - debug_printf ("decode: 0x%s 0x%x %s 0x%s\n", - core_addr_to_string_nz (addr), insn, - *is_bl ? "bl" : "b", - core_addr_to_string_nz (addr + *offset)); - } + aarch64_debug_printf ("decode: 0x%s 0x%x %s 0x%s\n", + core_addr_to_string_nz (addr), insn, + *is_bl ? "bl" : "b", + core_addr_to_string_nz (addr + *offset)); return 1; } @@ -131,12 +128,9 @@ aarch64_decode_bcond (CORE_ADDR addr, uint32_t insn, unsigned *cond, *cond = (insn >> 0) & 0xf; *offset = sbits (insn, 5, 23) * 4; - if (aarch64_debug) - { - debug_printf ("decode: 0x%s 0x%x b<%u> 0x%s\n", - core_addr_to_string_nz (addr), insn, *cond, - core_addr_to_string_nz (addr + *offset)); - } + aarch64_debug_printf ("decode: 0x%s 0x%x b<%u> 0x%s\n", + core_addr_to_string_nz (addr), insn, *cond, + core_addr_to_string_nz (addr + *offset)); return 1; } return 0; @@ -166,13 +160,10 @@ aarch64_decode_cb (CORE_ADDR addr, uint32_t insn, int *is64, int *is_cbnz, *is_cbnz = (insn >> 24) & 0x1; *offset = sbits (insn, 5, 23) * 4; - if (aarch64_debug) - { - debug_printf ("decode: 0x%s 0x%x %s 0x%s\n", - core_addr_to_string_nz (addr), insn, - *is_cbnz ? "cbnz" : "cbz", - core_addr_to_string_nz (addr + *offset)); - } + aarch64_debug_printf ("decode: 0x%s 0x%x %s 0x%s\n", + core_addr_to_string_nz (addr), insn, + *is_cbnz ? "cbnz" : "cbz", + core_addr_to_string_nz (addr + *offset)); return 1; } return 0; @@ -202,13 +193,10 @@ aarch64_decode_tb (CORE_ADDR addr, uint32_t insn, int *is_tbnz, *bit = ((insn >> (31 - 4)) & 0x20) | ((insn >> 19) & 0x1f); *imm = sbits (insn, 5, 18) * 4; - if (aarch64_debug) - { - debug_printf ("decode: 0x%s 0x%x %s x%u, #%u, 0x%s\n", - core_addr_to_string_nz (addr), insn, - *is_tbnz ? "tbnz" : "tbz", *rt, *bit, - core_addr_to_string_nz (addr + *imm)); - } + aarch64_debug_printf ("decode: 0x%s 0x%x %s x%u, #%u, 0x%s\n", + core_addr_to_string_nz (addr), insn, + *is_tbnz ? "tbnz" : "tbz", *rt, *bit, + core_addr_to_string_nz (addr + *imm)); return 1; } return 0; @@ -247,11 +235,10 @@ aarch64_decode_ldr_literal (CORE_ADDR addr, uint32_t insn, int *is_w, *rt = (insn >> 0) & 0x1f; *offset = sbits (insn, 5, 23) * 4; - if (aarch64_debug) - debug_printf ("decode: %s 0x%x %s %s%u, #?\n", - core_addr_to_string_nz (addr), insn, - *is_w ? "ldrsw" : "ldr", - *is64 ? "x" : "w", *rt); + aarch64_debug_printf ("decode: %s 0x%x %s %s%u, #?\n", + core_addr_to_string_nz (addr), insn, + *is_w ? "ldrsw" : "ldr", + *is64 ? "x" : "w", *rt); return 1; }