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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 191da48a5e1c1a4c4357f99038546941076f09a3..c33b1d4563bf93615c0ea5cb274daf56f36246e1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2021-01-11  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * arch/aarch64-insn.h (aarch64_debug_printf): New.
+       * arch/aarch64-insn.c: Use aarch64_debug_printf.
+       * aarch64-tdep.c: Use aarch64_debug_printf.
+
 2021-01-11  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * solib-aix.c (solib_aix_debug_printf): New, use throughout

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 77e6ad700fcdcd5f709aecb537584184dc06d059..5d1d979cd37de8e867a8459b15e6cbf41e36c222 100644 (file)
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -388,12 +388,10 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch,
            regs[rd] = regs[rm];
          else
            {
-             if (aarch64_debug)
-               {
-                 debug_printf ("aarch64: prologue analysis gave up "
-                               "addr=%s opcode=0x%x (orr x register)\n",
-                               core_addr_to_string_nz (start), insn);
-               }
+             aarch64_debug_printf ("prologue analysis gave up "
+                                   "addr=%s opcode=0x%x (orr x register)",
+                                   core_addr_to_string_nz (start), insn);
+
              break;
            }
        }
@@ -513,10 +511,9 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch,
            }
          else
            {
-             if (aarch64_debug)
-               debug_printf ("aarch64: prologue analysis gave up addr=%s"
-                             " opcode=0x%x (iclass)\n",
-                             core_addr_to_string_nz (start), insn);
+             aarch64_debug_printf ("prologue analysis gave up addr=%s"
+                                   " opcode=0x%x (iclass)",
+                                   core_addr_to_string_nz (start), insn);
              break;
            }
 
@@ -527,12 +524,10 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch,
        }
       else
        {
-         if (aarch64_debug)
-           {
-             debug_printf ("aarch64: prologue analysis gave up addr=%s"
-                           " opcode=0x%x\n",
-                           core_addr_to_string_nz (start), insn);
-           }
+         aarch64_debug_printf ("prologue analysis gave up addr=%s"
+                               " opcode=0x%x",
+                               core_addr_to_string_nz (start), insn);
+
          break;
        }
     }
@@ -1606,12 +1601,10 @@ pass_in_x (struct gdbarch *gdbarch, struct regcache *regcache,
          && (typecode == TYPE_CODE_STRUCT || typecode == TYPE_CODE_UNION))
        regval <<= ((X_REGISTER_SIZE - partial_len) * TARGET_CHAR_BIT);
 
-      if (aarch64_debug)
-       {
-         debug_printf ("arg %d in %s = 0x%s\n", info->argnum,
-                       gdbarch_register_name (gdbarch, regnum),
-                       phex (regval, X_REGISTER_SIZE));
-       }
+      aarch64_debug_printf ("arg %d in %s = 0x%s", info->argnum,
+                           gdbarch_register_name (gdbarch, regnum),
+                           phex (regval, X_REGISTER_SIZE));
+
       regcache_cooked_write_unsigned (regcache, regnum, regval);
       len -= partial_len;
       buf += partial_len;
@@ -1646,11 +1639,9 @@ pass_in_v (struct gdbarch *gdbarch,
       memcpy (reg, buf, len);
       regcache->cooked_write (regnum, reg);
 
-      if (aarch64_debug)
-       {
-         debug_printf ("arg %d in %s\n", info->argnum,
-                       gdbarch_register_name (gdbarch, regnum));
-       }
+      aarch64_debug_printf ("arg %d in %s", info->argnum,
+                           gdbarch_register_name (gdbarch, regnum));
+
       return 1;
     }
   info->nsrn = 8;
@@ -1680,11 +1671,8 @@ pass_on_stack (struct aarch64_call_info *info, struct type *type,
   if (align > 16)
     align = 16;
 
-  if (aarch64_debug)
-    {
-      debug_printf ("arg %d len=%d @ sp + %d\n", info->argnum, len,
-                   info->nsaa);
-    }
+  aarch64_debug_printf ("arg %d len=%d @ sp + %d\n", info->argnum, len,
+                       info->nsaa);
 
   item.len = len;
   item.data = buf;
@@ -1833,13 +1821,11 @@ aarch64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
   /* The struct_return pointer occupies X8.  */
   if (return_method != return_method_normal)
     {
-      if (aarch64_debug)
-       {
-         debug_printf ("struct return in %s = 0x%s\n",
-                       gdbarch_register_name (gdbarch,
-                                              AARCH64_STRUCT_RETURN_REGNUM),
-                       paddress (gdbarch, struct_addr));
-       }
+      aarch64_debug_printf ("struct return in %s = 0x%s",
+                           gdbarch_register_name
+                             (gdbarch, AARCH64_STRUCT_RETURN_REGNUM),
+                           paddress (gdbarch, struct_addr));
+
       regcache_cooked_write_unsigned (regcache, AARCH64_STRUCT_RETURN_REGNUM,
                                      struct_addr);
     }
@@ -2246,12 +2232,10 @@ aarch64_extract_return_value (struct type *type, struct regcache *regs,
          gdb_byte buf[register_size (gdbarch, regno)];
          gdb_assert (len <= sizeof (buf));
 
-         if (aarch64_debug)
-           {
-             debug_printf ("read HFA or HVA return value element %d from %s\n",
-                           i + 1,
-                           gdbarch_register_name (gdbarch, regno));
-           }
+         aarch64_debug_printf
+           ("read HFA or HVA return value element %d from %s",
+            i + 1, gdbarch_register_name (gdbarch, regno));
+
          regs->cooked_read (regno, buf);
 
          memcpy (valbuf, buf, len);
@@ -2358,12 +2342,9 @@ aarch64_store_return_value (struct type *type, struct regcache *regs,
          gdb_byte tmpbuf[register_size (gdbarch, regno)];
          gdb_assert (len <= sizeof (tmpbuf));
 
-         if (aarch64_debug)
-           {
-             debug_printf ("write HFA or HVA return value element %d to %s\n",
-                           i + 1,
-                           gdbarch_register_name (gdbarch, regno));
-           }
+         aarch64_debug_printf
+           ("write HFA or HVA return value element %d to %s",
+            i + 1, gdbarch_register_name (gdbarch, regno));
 
          memcpy (tmpbuf, valbuf,
                  len > V_REGISTER_SIZE ? V_REGISTER_SIZE : len);
@@ -2438,8 +2419,7 @@ aarch64_return_value (struct gdbarch *gdbarch, struct value *func_value,
     {
       if (aarch64_return_in_memory (gdbarch, valtype))
        {
-         if (aarch64_debug)
-           debug_printf ("return value in memory\n");
+         aarch64_debug_printf ("return value in memory");
          return RETURN_VALUE_STRUCT_CONVENTION;
        }
     }
@@ -2450,8 +2430,7 @@ aarch64_return_value (struct gdbarch *gdbarch, struct value *func_value,
   if (readbuf)
     aarch64_extract_return_value (valtype, regcache, readbuf);
 
-  if (aarch64_debug)
-    debug_printf ("return value in registers\n");
+  aarch64_debug_printf ("return value in registers");
 
   return RETURN_VALUE_REGISTER_CONVENTION;
 }

diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c
index 125288909137f491f0a3434e6cb930a052eb6674..6a5abf729bb29a6e90a8038ea489b147f98cf819 100644 (file)
--- 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 57aeb23feab17fe6a9955a15af71b3c41d5d49e5..1e8c5eac940ee017f4b6d2685bbcbaeed0617e3a 100644 (file)
--- 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.  */