From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 29B8B3850860; Mon, 6 Jun 2022 17:27:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29B8B3850860 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb] Fix maint selftest -v print_one_insn X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 772f4c2e98100e2bc3277bb7a214b8751c1cf968 X-Git-Newrev: faec7017f0302e33a3d2be107e83a3ef21a4813e Message-Id: <20220606172752.29B8B3850860@sourceware.org> Date: Mon, 6 Jun 2022 17:27:52 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2022 17:27:52 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dfaec7017f030= 2e33a3d2be107e83a3ef21a4813e commit faec7017f0302e33a3d2be107e83a3ef21a4813e Author: Tom de Vries Date: Mon Jun 6 19:27:46 2022 +0200 [gdb] Fix maint selftest -v print_one_insn =20 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. ... =20 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(). =20 The stream() ui_file points into a string buffer, which the disassemble= r uses before writing to gdb_stdout, so writing into it after the disassembler= has finished has no effect. =20 Fix this by using gdb_stdlog and debug_printf (which is what the unit t= est 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. ... =20 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 ... =20 Tested on x86_64-linux. Diff: --- 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 =3D gdb_disassembler::print_insn (memaddr); =20 if (run_verbose ()) - gdb_printf (stream (), "\n"); + debug_printf ("\n"); =20 return len; }