diff options
author | Simon Marchi <simon.marchi@efficios.com> | 2020-10-30 15:10:08 -0400 |
---|---|---|
committer | Simon Marchi <simon.marchi@efficios.com> | 2020-10-30 15:10:58 -0400 |
commit | 136821d9f6fdb7f457500d154166a1b4b41a0d1b (patch) | |
tree | 8204382983b0abf241cd990e5731ae9ac3225e83 /gdb/rs6000-tdep.c | |
parent | aa2045e7fa41ea80a876421bca89443f7a2df92f (diff) | |
download | fsf-binutils-gdb-136821d9f6fdb7f457500d154166a1b4b41a0d1b.zip fsf-binutils-gdb-136821d9f6fdb7f457500d154166a1b4b41a0d1b.tar.gz fsf-binutils-gdb-136821d9f6fdb7f457500d154166a1b4b41a0d1b.tar.bz2 |
gdb: introduce displaced_debug_printf
Move all debug prints of the "displaced" category to use a new
displaced_debug_printf macro, like what was done for infrun and others
earlier.
The debug output for one displaced step one amd64 looks like:
[displaced] displaced_step_prepare_throw: stepping process 3367044 now
[displaced] displaced_step_prepare_throw: saved 0x555555555042: 1e fa 31 ed 49 89 d1 5e 48 89 e2 48 83 e4 f0 50
[displaced] amd64_displaced_step_copy_insn: copy 0x555555555131->0x555555555042: b8 00 00 00 00 5d c3 0f 1f 84 00 00 00 00 00 f3
[displaced] displaced_step_prepare_throw: displaced pc to 0x555555555042
[displaced] resume_1: run 0x555555555042: b8 00 00 00
[displaced] displaced_step_restore: restored process 3367044 0x555555555042
[displaced] amd64_displaced_step_fixup: fixup (0x555555555131, 0x555555555042), insn = 0xb8 0x00 ...
[displaced] amd64_displaced_step_fixup: relocated %rip from 0x555555555047 to 0x555555555136
On test case needed to be updated because it relied on the specific
formatting of the message.
gdb/ChangeLog:
* infrun.h (displaced_debug_printf): New macro. Replace
displaced debug prints throughout to use it.
(displaced_debug_printf_1): New declaration.
(displaced_step_dump_bytes): Return string, remove ui_file
parameter, update all callers.
* infrun.c (displaced_debug_printf_1): New function.
(displaced_step_dump_bytes): Return string, remove ui_file
parameter
gdb/testsuite/ChangeLog:
* gdb.arch/amd64-disp-step-avx.exp: Update displaced step debug
expected output.
Change-Id: Ie78837f56431f6f98378790ba1e6051337bf6533
Diffstat (limited to 'gdb/rs6000-tdep.c')
-rw-r--r-- | gdb/rs6000-tdep.c | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 4b8c3ed..2d0efaf 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -874,25 +874,17 @@ ppc_displaced_step_copy_insn (struct gdbarch *gdbarch, /* Assume all atomic sequences start with a Load and Reserve instruction. */ if (IS_LOAD_AND_RESERVE_INSN (insn)) { - if (debug_displaced) - { - fprintf_unfiltered (gdb_stdlog, - "displaced: can't displaced step " - "atomic sequence at %s\n", + displaced_debug_printf ("can't displaced step atomic sequence at %s", paddress (gdbarch, from)); - } return NULL; } write_memory (to, buf, len); - if (debug_displaced) - { - fprintf_unfiltered (gdb_stdlog, "displaced: copy %s->%s: ", - paddress (gdbarch, from), paddress (gdbarch, to)); - displaced_step_dump_bytes (gdb_stdlog, buf, len); - } + displaced_debug_printf ("copy %s->%s: %s", + paddress (gdbarch, from), paddress (gdbarch, to), + displaced_step_dump_bytes (buf, len).c_str ());; /* This is a work around for a problem with g++ 4.8. */ return displaced_step_closure_up (closure.release ()); @@ -917,11 +909,8 @@ ppc_displaced_step_fixup (struct gdbarch *gdbarch, opcode = insn & BRANCH_MASK; - if (debug_displaced) - fprintf_unfiltered (gdb_stdlog, - "displaced: (ppc) fixup (%s, %s)\n", - paddress (gdbarch, from), paddress (gdbarch, to)); - + displaced_debug_printf ("(ppc) fixup (%s, %s)", + paddress (gdbarch, from), paddress (gdbarch, to)); /* Handle PC-relative branch instructions. */ if (opcode == B_INSN || opcode == BC_INSN || opcode == BXL_INSN) @@ -942,13 +931,11 @@ ppc_displaced_step_fixup (struct gdbarch *gdbarch, if (!(insn & 0x2)) { /* PC-relative addressing is being used in the branch. */ - if (debug_displaced) - fprintf_unfiltered - (gdb_stdlog, - "displaced: (ppc) branch instruction: %s\n" - "displaced: (ppc) adjusted PC from %s to %s\n", - paddress (gdbarch, insn), paddress (gdbarch, current_pc), - paddress (gdbarch, from + offset)); + displaced_debug_printf ("(ppc) branch instruction: %s", + paddress (gdbarch, insn)); + displaced_debug_printf ("(ppc) adjusted PC from %s to %s", + paddress (gdbarch, current_pc), + paddress (gdbarch, from + offset)); regcache_cooked_write_unsigned (regs, gdbarch_pc_regnum (gdbarch), @@ -975,10 +962,8 @@ ppc_displaced_step_fixup (struct gdbarch *gdbarch, regcache_cooked_write_unsigned (regs, gdbarch_tdep (gdbarch)->ppc_lr_regnum, from + PPC_INSN_SIZE); - if (debug_displaced) - fprintf_unfiltered (gdb_stdlog, - "displaced: (ppc) adjusted LR to %s\n", - paddress (gdbarch, from + PPC_INSN_SIZE)); + displaced_debug_printf ("(ppc) adjusted LR to %s", + paddress (gdbarch, from + PPC_INSN_SIZE)); } } |