From c6185dce03deb07b4c824d04969ab88abaf63460 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 11 Jan 2021 16:52:42 -0500 Subject: gdb: convert aarch64 to new-style debug macros I haven't tried this on an actual aarch64 machine, but I am able to exercise it like this: (gdb) set debug aarch64 (gdb) maintenance selftest aa Running selftest aarch64-analyze-prologue. [aarch64] aarch64_analyze_prologue: prologue analysis gave up addr=0x14 opcode=0xf94013e0 Running selftest aarch64-process-record. Ran 2 unit tests, 0 failed gdb/ChangeLog: * arch/aarch64-insn.h (aarch64_debug_printf): New. * arch/aarch64-insn.c: Use aarch64_debug_printf. * aarch64-tdep.c: Use aarch64_debug_printf. Change-Id: Ifdb40e2816ab8e55a9aabb066d1833d9b5a46094 --- gdb/arch/aarch64-insn.c | 9 +++------ gdb/arch/aarch64-insn.h | 5 +++++ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'gdb/arch') diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c index 1252889..6a5abf7 100644 --- a/gdb/arch/aarch64-insn.c +++ b/gdb/arch/aarch64-insn.c @@ -69,12 +69,9 @@ aarch64_decode_adr (CORE_ADDR addr, uint32_t insn, int *is_adrp, else *offset = (immhi | immlo); - if (aarch64_debug) - { - debug_printf ("decode: 0x%s 0x%x %s x%u, #?\n", - core_addr_to_string_nz (addr), insn, - *is_adrp ? "adrp" : "adr", *rd); - } + aarch64_debug_printf ("decode: 0x%s 0x%x %s x%u, #?", + core_addr_to_string_nz (addr), insn, + *is_adrp ? "adrp" : "adr", *rd); return 1; } return 0; diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h index 57aeb23..1e8c5ea 100644 --- a/gdb/arch/aarch64-insn.h +++ b/gdb/arch/aarch64-insn.h @@ -21,6 +21,11 @@ extern bool aarch64_debug; +/* Print an "aarch64" debug statement. */ + +#define aarch64_debug_printf(fmt, ...) \ + debug_prefixed_printf_cond (aarch64_debug, "aarch64", fmt, ##__VA_ARGS__) + /* Support routines for instruction parsing. */ /* Create a mask of X bits. */ -- cgit v1.1