From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 56968 invoked by alias); 15 Sep 2015 11:43:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 56953 invoked by uid 89); 15 Sep 2015 11:43:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 X-HELO: eu-smtp-delivery-143.mimecast.com Received: from eu-smtp-delivery-143.mimecast.com (HELO eu-smtp-delivery-143.mimecast.com) (207.82.80.143) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 15 Sep 2015 11:43:16 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-16-eLGIoa39TRW8RO98bioibw-1; Tue, 15 Sep 2015 12:43:11 +0100 Received: from e105615-lin.cambridge.arm.com ([10.1.2.79]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 15 Sep 2015 12:43:10 +0100 From: Pierre Langlois To: gdb-patches@sourceware.org Cc: Pierre Langlois Subject: [PATCH 2/8 v2] [AArch64] Use debug_printf instead of fprintf_unfiltered Date: Tue, 15 Sep 2015 11:43:00 -0000 Message-Id: <1442317388-16641-1-git-send-email-pierre.langlois@arm.com> In-Reply-To: <86si6g2amf.fsf@gmail.com> References: <86si6g2amf.fsf@gmail.com> X-MC-Unique: eLGIoa39TRW8RO98bioibw-1 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes X-SW-Source: 2015-09/txt/msg00318.txt.bz2 Here is an updated patch that fixes the formatting issues. I've had to rebase the following patches on top of this one, to propagate to changes over to functions that were moved. I'll post them shortly. Thanks, Pierre --- GDBserver uses debug_printf to print debugging output. This patch makes GDB use this too so we can share some of this code with GDBserver later. gdb/ChangeLog: * aarch64-tdep.c (decode_add_sub_imm): Use debug_printf. (decode_adrp): Likewise. (decode_b): Likewise. (decode_bcond): Likewise. (decode_br): Likewise. (decode_cb): Likewise. (decode_eret): Likewise. (decode_movz): Likewise. (decode_orr_shifted_register_x): Likewise. (decode_ret): Likewise. (decode_stp_offset): Likewise. (decode_stp_offset_wb): Likewise. (decode_stur): Likewise. (decode_tb): Likewise. (aarch64_analyze_prologue): Likewise. (pass_in_x): Likewise. (pass_in_v): Likewise. (pass_on_stack): Likewise. (aarch64_push_dummy_call): Likewise. (aarch64_extract_return_value): Likewise. (aarch64_store_return_value): Likewise. (aarch64_return_value): Likewise. (aarch64_record_asimd_load_store): Likewise. (aarch64_record_load_store): Likewise. (aarch64_record_data_proc_simd_fp): Likewise. --- gdb/aarch64-tdep.c | 261 +++++++++++++++++++++++++++----------------------= ---- 1 file changed, 132 insertions(+), 129 deletions(-) diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 2ac1a49..9a4eda2 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -261,10 +261,11 @@ decode_add_sub_imm (CORE_ADDR addr, uint32_t insn, un= signed *rd, unsigned *rn, *imm =3D -*imm; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x add x%u, x%u, #%d\n", - core_addr_to_string_nz (addr), insn, *rd, *rn, - *imm); + { + debug_printf ("decode: 0x%s 0x%x add x%u, x%u, #%d\n", + core_addr_to_string_nz (addr), insn, *rd, *rn, + *imm); + } return 1; } return 0; @@ -286,9 +287,10 @@ decode_adrp (CORE_ADDR addr, uint32_t insn, unsigned *= rd) *rd =3D (insn >> 0) & 0x1f; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x adrp x%u, #?\n", - core_addr_to_string_nz (addr), insn, *rd); + { + debug_printf ("decode: 0x%s 0x%x adrp x%u, #?\n", + core_addr_to_string_nz (addr), insn, *rd); + } return 1; } return 0; @@ -315,11 +317,12 @@ decode_b (CORE_ADDR addr, uint32_t insn, int *is_bl, = int32_t *offset) *offset =3D extract_signed_bitfield (insn, 26, 0) << 2; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x %s 0x%s\n", - core_addr_to_string_nz (addr), insn, - *is_bl ? "bl" : "b", - core_addr_to_string_nz (addr + *offset)); + { + debug_printf ("decode: 0x%s 0x%x %s 0x%s\n", + core_addr_to_string_nz (addr), insn, + *is_bl ? "bl" : "b", + core_addr_to_string_nz (addr + *offset)); + } =20 return 1; } @@ -346,10 +349,11 @@ decode_bcond (CORE_ADDR addr, uint32_t insn, unsigned= *cond, int32_t *offset) *offset =3D extract_signed_bitfield (insn, 19, 5) << 2; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x b<%u> 0x%s\n", - core_addr_to_string_nz (addr), insn, *cond, - core_addr_to_string_nz (addr + *offset)); + { + debug_printf ("decode: 0x%s 0x%x b<%u> 0x%s\n", + core_addr_to_string_nz (addr), insn, *cond, + core_addr_to_string_nz (addr + *offset)); + } return 1; } return 0; @@ -376,10 +380,11 @@ decode_br (CORE_ADDR addr, uint32_t insn, int *is_blr= , unsigned *rn) *rn =3D (insn >> 5) & 0x1f; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x %s 0x%x\n", - core_addr_to_string_nz (addr), insn, - *is_blr ? "blr" : "br", *rn); + { + debug_printf ("decode: 0x%s 0x%x %s 0x%x\n", + core_addr_to_string_nz (addr), insn, + *is_blr ? "blr" : "br", *rn); + } =20 return 1; } @@ -411,11 +416,12 @@ decode_cb (CORE_ADDR addr, uint32_t insn, int *is64, = int *is_cbnz, *offset =3D extract_signed_bitfield (insn, 19, 5) << 2; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x %s 0x%s\n", - core_addr_to_string_nz (addr), insn, - *is_cbnz ? "cbnz" : "cbz", - core_addr_to_string_nz (addr + *offset)); + { + debug_printf ("decode: 0x%s 0x%x %s 0x%s\n", + core_addr_to_string_nz (addr), insn, + *is_cbnz ? "cbnz" : "cbz", + core_addr_to_string_nz (addr + *offset)); + } return 1; } return 0; @@ -435,8 +441,10 @@ decode_eret (CORE_ADDR addr, uint32_t insn) if (insn =3D=3D 0xd69f03e0) { if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, "decode: 0x%s 0x%x eret\n", - core_addr_to_string_nz (addr), insn); + { + debug_printf ("decode: 0x%s 0x%x eret\n", + core_addr_to_string_nz (addr), insn); + } return 1; } return 0; @@ -458,9 +466,10 @@ decode_movz (CORE_ADDR addr, uint32_t insn, unsigned *= rd) *rd =3D (insn >> 0) & 0x1f; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x movz x%u, #?\n", - core_addr_to_string_nz (addr), insn, *rd); + { + debug_printf ("decode: 0x%s 0x%x movz x%u, #?\n", + core_addr_to_string_nz (addr), insn, *rd); + } return 1; } return 0; @@ -491,10 +500,11 @@ decode_orr_shifted_register_x (CORE_ADDR addr, *imm =3D (insn >> 10) & 0x3f; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x orr x%u, x%u, x%u, #%u\n", - core_addr_to_string_nz (addr), insn, *rd, - *rn, *rm, *imm); + { + debug_printf ("decode: 0x%s 0x%x orr x%u, x%u, x%u, #%u\n", + core_addr_to_string_nz (addr), insn, *rd, *rn, + *rm, *imm); + } return 1; } return 0; @@ -515,9 +525,10 @@ decode_ret (CORE_ADDR addr, uint32_t insn, unsigned *r= n) { *rn =3D (insn >> 5) & 0x1f; if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x ret x%u\n", - core_addr_to_string_nz (addr), insn, *rn); + { + debug_printf ("decode: 0x%s 0x%x ret x%u\n", + core_addr_to_string_nz (addr), insn, *rn); + } return 1; } return 0; @@ -549,10 +560,11 @@ decode_stp_offset (CORE_ADDR addr, *imm <<=3D 3; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x stp x%u, x%u, [x%u + #%d]\n", - core_addr_to_string_nz (addr), insn, - *rt1, *rt2, *rn, *imm); + { + debug_printf ("decode: 0x%s 0x%x stp x%u, x%u, [x%u + #%d]\n", + core_addr_to_string_nz (addr), insn, *rt1, *rt2, + *rn, *imm); + } return 1; } return 0; @@ -585,10 +597,11 @@ decode_stp_offset_wb (CORE_ADDR addr, *imm <<=3D 3; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x stp x%u, x%u, [x%u + #%d]!\n", - core_addr_to_string_nz (addr), insn, - *rt1, *rt2, *rn, *imm); + { + debug_printf ("decode: 0x%s 0x%x stp x%u, x%u, [x%u + #%d]!\n", + core_addr_to_string_nz (addr), insn, *rt1, *rt2, + *rn, *imm); + } return 1; } return 0; @@ -618,10 +631,11 @@ decode_stur (CORE_ADDR addr, uint32_t insn, int *is64= , unsigned *rt, *imm =3D extract_signed_bitfield (insn, 9, 12); =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x stur %c%u, [x%u + #%d]\n", - core_addr_to_string_nz (addr), insn, - *is64 ? 'x' : 'w', *rt, *rn, *imm); + { + debug_printf ("decode: 0x%s 0x%x stur %c%u, [x%u + #%d]\n", + core_addr_to_string_nz (addr), insn, + *is64 ? 'x' : 'w', *rt, *rn, *imm); + } return 1; } return 0; @@ -652,11 +666,12 @@ decode_tb (CORE_ADDR addr, uint32_t insn, int *is_tbn= z, unsigned *bit, *imm =3D extract_signed_bitfield (insn, 14, 5) << 2; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "decode: 0x%s 0x%x %s x%u, #%u, 0x%s\n", - core_addr_to_string_nz (addr), insn, - *is_tbnz ? "tbnz" : "tbz", *rt, *bit, - core_addr_to_string_nz (addr + *imm)); + { + debug_printf ("decode: 0x%s 0x%x %s x%u, #%u, 0x%s\n", + core_addr_to_string_nz (addr), insn, + *is_tbnz ? "tbnz" : "tbz", *rt, *bit, + core_addr_to_string_nz (addr + *imm)); + } return 1; } return 0; @@ -742,12 +757,11 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch, else { if (aarch64_debug) - fprintf_unfiltered - (gdb_stdlog, - "aarch64: prologue analysis gave up addr=3D0x%s " - "opcode=3D0x%x (orr x register)\n", - core_addr_to_string_nz (start), - insn); + { + debug_printf ("aarch64: prologue analysis gave up " + "addr=3D0x%s opcode=3D0x%x (orr x register)\n", + core_addr_to_string_nz (start), insn); + } break; } } @@ -806,10 +820,11 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch, else { if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "aarch64: prologue analysis gave up addr=3D0x%s" - " opcode=3D0x%x\n", - core_addr_to_string_nz (start), insn); + { + debug_printf ("aarch64: prologue analysis gave up addr=3D0x%s" + " opcode=3D0x%x\n", + core_addr_to_string_nz (start), insn); + } break; } } @@ -1453,10 +1468,11 @@ pass_in_x (struct gdbarch *gdbarch, struct regcache= *regcache, regval <<=3D ((X_REGISTER_SIZE - partial_len) * TARGET_CHAR_BIT); =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, "arg %d in %s =3D 0x%s\n", - info->argnum, - gdbarch_register_name (gdbarch, regnum), - phex (regval, X_REGISTER_SIZE)); + { + debug_printf ("arg %d in %s =3D 0x%s\n", info->argnum, + gdbarch_register_name (gdbarch, regnum), + phex (regval, X_REGISTER_SIZE)); + } regcache_cooked_write_unsigned (regcache, regnum, regval); len -=3D partial_len; buf +=3D partial_len; @@ -1485,9 +1501,10 @@ pass_in_v (struct gdbarch *gdbarch, =20 regcache_cooked_write (regcache, regnum, buf); if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, "arg %d in %s\n", - info->argnum, - gdbarch_register_name (gdbarch, regnum)); + { + debug_printf ("arg %d in %s\n", info->argnum, + gdbarch_register_name (gdbarch, regnum)); + } return 1; } info->nsrn =3D 8; @@ -1517,8 +1534,10 @@ pass_on_stack (struct aarch64_call_info *info, struc= t type *type, align =3D 16; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, "arg %d len=3D%d @ sp + %d\n", - info->argnum, len, info->nsaa); + { + debug_printf ("arg %d len=3D%d @ sp + %d\n", info->argnum, len, + info->nsaa); + } =20 item.len =3D len; item.data =3D buf; @@ -1653,11 +1672,12 @@ aarch64_push_dummy_call (struct gdbarch *gdbarch, s= truct value *function, if (struct_return || lang_struct_return) { if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, "struct return in %s =3D 0x%s\n", - gdbarch_register_name - (gdbarch, - AARCH64_STRUCT_RETURN_REGNUM), - paddress (gdbarch, struct_addr)); + { + debug_printf ("struct return in %s =3D 0x%s\n", + gdbarch_register_name (gdbarch, + AARCH64_STRUCT_RETURN_REGNUM), + paddress (gdbarch, struct_addr)); + } regcache_cooked_write_unsigned (regcache, AARCH64_STRUCT_RETURN_REGN= UM, struct_addr); } @@ -2062,10 +2082,11 @@ aarch64_extract_return_value (struct type *type, st= ruct regcache *regs, bfd_byte buf[X_REGISTER_SIZE]; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "read HFA return value element %d from %s\n", - i + 1, - gdbarch_register_name (gdbarch, regno)); + { + debug_printf ("read HFA return value element %d from %s\n", + i + 1, + gdbarch_register_name (gdbarch, regno)); + } regcache_cooked_read (regs, regno, buf); =20 memcpy (valbuf, buf, len); @@ -2190,10 +2211,11 @@ aarch64_store_return_value (struct type *type, stru= ct regcache *regs, bfd_byte tmpbuf[MAX_REGISTER_SIZE]; =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, - "write HFA return value element %d to %s\n", - i + 1, - gdbarch_register_name (gdbarch, regno)); + { + debug_printf ("write HFA return value element %d to %s\n", + i + 1, + gdbarch_register_name (gdbarch, regno)); + } =20 memcpy (tmpbuf, valbuf, len); regcache_cooked_write (regs, regno, tmpbuf); @@ -2236,7 +2258,7 @@ aarch64_return_value (struct gdbarch *gdbarch, struct= value *func_value, if (aarch64_return_in_memory (gdbarch, valtype)) { if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, "return value in memory\n"); + debug_printf ("return value in memory\n"); return RETURN_VALUE_STRUCT_CONVENTION; } } @@ -2248,7 +2270,7 @@ aarch64_return_value (struct gdbarch *gdbarch, struct= value *func_value, aarch64_extract_return_value (valtype, regcache, readbuf); =20 if (aarch64_debug) - fprintf_unfiltered (gdb_stdlog, "return value in registers\n"); + debug_printf ("return value in registers\n"); =20 return RETURN_VALUE_REGISTER_CONVENTION; } @@ -3185,10 +3207,7 @@ aarch64_record_asimd_load_store (insn_decode_record = *aarch64_insn_r) regcache_raw_read_unsigned (aarch64_insn_r->regcache, reg_rn, &address); =20 if (record_debug) - { - fprintf_unfiltered (gdb_stdlog, - "Process record: Advanced SIMD load/store\n"); - } + debug_printf ("Process record: Advanced SIMD load/store\n"); =20 /* Load/store single structure. */ if (bit (aarch64_insn_r->aarch64_insn, 24)) @@ -3362,10 +3381,7 @@ aarch64_record_load_store (insn_decode_record *aarch= 64_insn_r) if (insn_bits24_27 =3D=3D 0x08 && insn_bits28_29 =3D=3D 0x00) { if (record_debug) - { - fprintf_unfiltered (gdb_stdlog, - "Process record: load/store exclusive\n"); - } + debug_printf ("Process record: load/store exclusive\n"); =20 if (ld_flag) { @@ -3400,10 +3416,7 @@ aarch64_record_load_store (insn_decode_record *aarch= 64_insn_r) else if ((insn_bits24_27 & 0x0b) =3D=3D 0x08 && insn_bits28_29 =3D=3D 0x= 01) { if (record_debug) - { - fprintf_unfiltered (gdb_stdlog, - "Process record: load register (literal)\n"); - } + debug_printf ("Process record: load register (literal)\n"); if (vector_flag) record_buf[0] =3D reg_rt + AARCH64_V0_REGNUM; else @@ -3414,10 +3427,7 @@ aarch64_record_load_store (insn_decode_record *aarch= 64_insn_r) else if ((insn_bits24_27 & 0x0a) =3D=3D 0x08 && insn_bits28_29 =3D=3D 0x= 02) { if (record_debug) - { - fprintf_unfiltered (gdb_stdlog, - "Process record: load/store pair\n"); - } + debug_printf ("Process record: load/store pair\n"); =20 if (ld_flag) { @@ -3478,10 +3488,9 @@ aarch64_record_load_store (insn_decode_record *aarch= 64_insn_r) =20 if (record_debug) { - fprintf_unfiltered (gdb_stdlog, - "Process record: load/store (unsigned immediate):" - " size %x V %d opc %x\n", size_bits, vector_flag, - opc); + debug_printf ("Process record: load/store (unsigned immediate):" + " size %x V %d opc %x\n", size_bits, vector_flag, + opc); } =20 if (!ld_flag) @@ -3511,10 +3520,7 @@ aarch64_record_load_store (insn_decode_record *aarch= 64_insn_r) && insn_bits10_11 =3D=3D 0x02 && insn_bit21) { if (record_debug) - { - fprintf_unfiltered (gdb_stdlog, - "Process record: load/store (register offset)\n"); - } + debug_printf ("Process record: load/store (register offset)\n"); opc =3D bits (aarch64_insn_r->aarch64_insn, 22, 23); if (!(opc >> 1)) if (opc & 0x01) @@ -3559,8 +3565,8 @@ aarch64_record_load_store (insn_decode_record *aarch6= 4_insn_r) { if (record_debug) { - fprintf_unfiltered (gdb_stdlog, - "Process record: load/store (immediate and unprivileged)\n"); + debug_printf ("Process record: load/store " + "(immediate and unprivileged)\n"); } opc =3D bits (aarch64_insn_r->aarch64_insn, 22, 23); if (!(opc >> 1)) @@ -3636,10 +3642,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record= *aarch64_insn_r) insn_bit21 =3D bit (aarch64_insn_r->aarch64_insn, 21); =20 if (record_debug) - { - fprintf_unfiltered (gdb_stdlog, - "Process record: data processing SIMD/FP: "); - } + debug_printf ("Process record: data processing SIMD/FP: "); =20 if ((insn_bits28_31 & 0x05) =3D=3D 0x01 && insn_bits24_27 =3D=3D 0x0e) { @@ -3647,7 +3650,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record = *aarch64_insn_r) if (!insn_bit21) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "FP - fixed point conversion"); + debug_printf ("FP - fixed point conversion"); =20 if ((opcode >> 1) =3D=3D 0x0 && rmode =3D=3D 0x03) record_buf[0] =3D reg_rd; @@ -3658,7 +3661,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record = *aarch64_insn_r) else if (insn_bits10_11 =3D=3D 0x01) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "FP - conditional compare"); + debug_printf ("FP - conditional compare"); =20 record_buf[0] =3D AARCH64_CPSR_REGNUM; } @@ -3667,7 +3670,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record = *aarch64_insn_r) else if (insn_bits10_11 =3D=3D 0x02 || insn_bits10_11 =3D=3D 0x03) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "FP - DP (2-source)"); + debug_printf ("FP - DP (2-source)"); =20 record_buf[0] =3D reg_rd + AARCH64_V0_REGNUM; } @@ -3678,14 +3681,14 @@ aarch64_record_data_proc_simd_fp (insn_decode_recor= d *aarch64_insn_r) || (insn_bits12_15 & 0x07) =3D=3D 0x04) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "FP - immediate"); + debug_printf ("FP - immediate"); record_buf[0] =3D reg_rd + AARCH64_V0_REGNUM; } /* Floating point - compare instructions. */ else if ((insn_bits12_15 & 0x03) =3D=3D 0x02) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "FP - immediate"); + debug_printf ("FP - immediate"); record_buf[0] =3D AARCH64_CPSR_REGNUM; } /* Floating point - integer conversions instructions. */ @@ -3695,7 +3698,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record = *aarch64_insn_r) if (!(opcode >> 1) || ((opcode >> 1) =3D=3D 0x02 && !rmode)) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "float to int conversion"); + debug_printf ("float to int conversion"); =20 record_buf[0] =3D reg_rd + AARCH64_X0_REGNUM; } @@ -3703,7 +3706,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record = *aarch64_insn_r) else if ((opcode >> 1) =3D=3D 0x01 && !rmode) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "int to float conversion"); + debug_printf ("int to float conversion"); =20 record_buf[0] =3D reg_rd + AARCH64_V0_REGNUM; } @@ -3711,7 +3714,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record = *aarch64_insn_r) else if ((opcode >> 1) =3D=3D 0x03) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "move float to int"); + debug_printf ("move float to int"); =20 if (!(opcode & 0x01)) record_buf[0] =3D reg_rd + AARCH64_X0_REGNUM; @@ -3730,7 +3733,7 @@ aarch64_record_data_proc_simd_fp (insn_decode_record = *aarch64_insn_r) else if ((insn_bits28_31 & 0x09) =3D=3D 0x00 && insn_bits24_27 =3D=3D 0x= 0e) { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "SIMD copy"); + debug_printf ("SIMD copy"); =20 /* Advanced SIMD copy instructions. */ if (!bits (aarch64_insn_r->aarch64_insn, 21, 23) @@ -3749,13 +3752,13 @@ aarch64_record_data_proc_simd_fp (insn_decode_recor= d *aarch64_insn_r) else { if (record_debug) - fprintf_unfiltered (gdb_stdlog, "all remain"); + debug_printf ("all remain"); =20 record_buf[0] =3D reg_rd + AARCH64_V0_REGNUM; } =20 if (record_debug) - fprintf_unfiltered (gdb_stdlog, "\n"); + debug_printf ("\n"); =20 aarch64_insn_r->reg_rec_count++; gdb_assert (aarch64_insn_r->reg_rec_count =3D=3D 1); --=20 2.4.6