* [PATCH][gdb] Fix maint selftest -v print_one_insn
@ 2022-06-04 7:31 Tom de Vries
2022-06-06 13:42 ` Tom Tromey
0 siblings, 1 reply; 2+ messages in thread
From: Tom de Vries @ 2022-06-04 7:31 UTC (permalink / raw)
To: gdb-patches
Hi,
When running the print_one_insn selftests with -v, I get:
...
$ gdb -q -batch -ex "maint selftest -v print_one_insn"
Running selftest print_one_insn::A6.
.shor 0x783eRunning selftest print_one_insn::A7.
trap_s 0x1Running selftest print_one_insn::ARC600.
.shor 0x783eRunning selftest print_one_insn::ARC601.
Running selftest print_one_insn::ARC700.
trap_s 0x1Running selftest print_one_insn::ARCv2.
trap_s 0x1Running selftest print_one_insn::EM.
trap_s 0x1Running selftest print_one_insn::HS.
trap_s 0x1Running selftest print_one_insn::Loongarch32.
...
The insn is written to gdb_stdout, and there is code in the selftest to add a
newline after the insn, which writes to stream().
The stream() ui_file points into a string buffer, which the disassembler uses
before writing to gdb_stdout, so writing into it after the disassembler has
finished has no effect.
Fix this by using gdb_stdlog and debug_printf (which is what the unit test
infrastructure itself uses) instead, such that we have:
...
Running selftest print_one_insn::A6.
.shor 0x783e
Running selftest print_one_insn::A7.
trap_s 0x1
Running selftest print_one_insn::ARC600.
.shor 0x783e
Running selftest print_one_insn::ARC601.
Running selftest print_one_insn::ARC700.
trap_s 0x1
Running selftest print_one_insn::ARCv2.
trap_s 0x1
Running selftest print_one_insn::Loongarch32.
...
Note: I've also removed the printing of arch_name, which would give
us otherwise the redundant:
...
Running selftest print_one_insn::A6.
arc .shor 0x783e
Running selftest print_one_insn::A7.
arc trap_s 0x1
...
Tested on x86_64-linux.
Any comments?
Thanks,
- Tom
[gdb] Fix maint selftest -v print_one_insn
---
gdb/disasm-selftests.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/gdb/disasm-selftests.c b/gdb/disasm-selftests.c
index b3c5d997720..266745d01c7 100644
--- a/gdb/disasm-selftests.c
+++ b/gdb/disasm-selftests.c
@@ -171,7 +171,7 @@ print_one_insn_test (struct gdbarch *gdbarch)
const gdb_byte *insn,
size_t len)
: gdb_disassembler (gdbarch,
- (run_verbose () ? gdb_stdout : &null_stream),
+ (run_verbose () ? gdb_stdlog : &null_stream),
gdb_disassembler_test::read_memory),
m_insn (insn), m_len (len)
{
@@ -180,16 +180,10 @@ print_one_insn_test (struct gdbarch *gdbarch)
int
print_insn (CORE_ADDR memaddr)
{
- if (run_verbose ())
- {
- gdb_printf (stream (), "%s ",
- gdbarch_bfd_arch_info (arch ())->arch_name);
- }
-
int len = gdb_disassembler::print_insn (memaddr);
if (run_verbose ())
- gdb_printf (stream (), "\n");
+ debug_printf ("\n");
return len;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH][gdb] Fix maint selftest -v print_one_insn
2022-06-04 7:31 [PATCH][gdb] Fix maint selftest -v print_one_insn Tom de Vries
@ 2022-06-06 13:42 ` Tom Tromey
0 siblings, 0 replies; 2+ messages in thread
From: Tom Tromey @ 2022-06-06 13:42 UTC (permalink / raw)
To: Tom de Vries via Gdb-patches
>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:
Tom> Fix this by using gdb_stdlog and debug_printf (which is what the unit test
Tom> infrastructure itself uses) instead, such that we have:
Tom> ...
This looks good to me, thank you.
Tom
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-06 13:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-04 7:31 [PATCH][gdb] Fix maint selftest -v print_one_insn Tom de Vries
2022-06-06 13:42 ` Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).