From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id uLWmLOow+V+0QgAAWB0awg (envelope-from ) for ; Fri, 08 Jan 2021 23:28:26 -0500 Received: by simark.ca (Postfix, from userid 112) id B1E111EE17; Fri, 8 Jan 2021 23:28:26 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id D5FFA1E965 for ; Fri, 8 Jan 2021 23:28:23 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 60FE93985474; Sat, 9 Jan 2021 04:28:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 60FE93985474 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1610166503; bh=64KSl2acHYQRiIT0VXlTxZmW/MfzlrmSnAQ3z34gp4k=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=scM3k+KbLpKmmzO/YN+D3uibZYfTwwYboP+mxCo6EodwOSVqFItmPCDNW5dto6/K4 ZOz//J1amJKUCKn8xwTTxAqVdANXg0/QdmmDUHd3yBcJXVx4W9Kj5WesUlFeTXx/JV 6KU8J5lbi19FF1WLTZL8BzC/Lr9Wc69QkuaDnwCU= Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 6DAAE386F420 for ; Sat, 9 Jan 2021 04:28:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6DAAE386F420 X-ASG-Debug-ID: 1610166498-0c856e6cd5661ad0001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id uThUxPMKwVImWoDh (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 08 Jan 2021 23:28:18 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id 0590A441B21; Fri, 8 Jan 2021 23:28:18 -0500 (EST) X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [PATCH 2/5] gdb: convert jit to new-style debug macros Date: Fri, 8 Jan 2021 23:28:13 -0500 X-ASG-Orig-Subj: [PATCH 2/5] gdb: convert jit to new-style debug macros Message-Id: <20210109042816.4140840-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210109042816.4140840-1-simon.marchi@polymtl.ca> References: <20210109042816.4140840-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1610166498 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 6744 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.87110 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Here's a sample output, with infrun debug enabled as well to show nesting: [infrun] fetch_inferior_event: enter [infrun] print_target_wait_results: target_wait (-1.0.0 [process -1], status) = [infrun] print_target_wait_results: 4116727.4116727.0 [process 4116727], [infrun] print_target_wait_results: status->kind = stopped, signal = GDB_SIGNAL_TRAP [infrun] handle_inferior_event: status->kind = stopped, signal = GDB_SIGNAL_TRAP [infrun] start_step_over: enter [infrun] start_step_over: stealing global queue of threads to step, length = 0 [infrun] operator(): step-over queue now empty [infrun] start_step_over: exit [infrun] handle_signal_stop: stop_pc=0x555555555229 [infrun] handle_jit_event: handling bp_jit_event [jit] jit_read_descriptor: descriptor_addr = 0x5555555580b0 [jit] jit_register_code: symfile_addr = 0x7000000, symfile_size = 15560 [jit] jit_bfd_try_read_symtab: symfile_addr = 0x7000000, symfile_size = 15560 [jit] jit_breakpoint_re_set_internal: breakpoint_addr = 0x555555555229 [infrun] process_event_stop_test: BPSTAT_WHAT_SINGLE [infrun] process_event_stop_test: no stepping, continue [infrun] resume_1: step=1, signal=GDB_SIGNAL_0, trap_expected=1, current thread [process 4116727] at 0x555555555229 [infrun] prepare_to_wait: prepare_to_wait [infrun] fetch_inferior_event: exit gdb/ChangeLog: * jit.c (jit_debug_printf): New, use throughout file. Change-Id: Ic0f5eb3ffc926fb555de4914e7dc1076ada63a97 --- gdb/jit.c | 62 +++++++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/gdb/jit.c b/gdb/jit.c index 474ba838b86b..421054d9359b 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -62,6 +62,11 @@ static struct gdbarch_data *jit_gdbarch_data; static bool jit_debug = false; +/* Print a "jit" debug statement. */ + +#define jit_debug_printf(fmt, ...) \ + debug_prefixed_printf_cond (jit_debug, "jit", fmt, ##__VA_ARGS__) + static void show_jit_debug (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -103,9 +108,8 @@ jit_reader_load (const char *file_name) reader_init_fn_type *init_fn; struct gdb_reader_funcs *funcs = NULL; - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, _("Opening shared object %s.\n"), - file_name); + jit_debug_printf ("Opening shared object %s", file_name); + gdb_dlhandle_up so = gdb_dlopen (file_name); init_fn = (reader_init_fn_type *) gdb_dlsym (so, reader_init_fn_sym); @@ -211,10 +215,7 @@ jit_read_descriptor (gdbarch *gdbarch, CORE_ADDR addr = MSYMBOL_VALUE_ADDRESS (jiter, objf_data->descriptor); - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, - "jit_read_descriptor, descriptor_addr = %s\n", - paddress (gdbarch, addr)); + jit_debug_printf ("descriptor_addr = %s", paddress (gdbarch, addr)); /* Figure out how big the descriptor is on the remote and how to read it. */ ptr_type = builtin_type (gdbarch)->builtin_data_ptr; @@ -668,9 +669,9 @@ jit_reader_try_read_symtab (struct jit_code_entry *code_entry, status = 0; } - if (jit_debug && status == 0) - fprintf_unfiltered (gdb_stdlog, - "Could not read symtab using the loaded JIT reader.\n"); + if (status == 0) + jit_debug_printf ("Could not read symtab using the loaded JIT reader."); + return status; } @@ -686,12 +687,9 @@ jit_bfd_try_read_symtab (struct jit_code_entry *code_entry, struct objfile *objfile; const struct bfd_arch_info *b; - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, - "jit_bfd_try_read_symtab, symfile_addr = %s, " - "symfile_size = %s\n", - paddress (gdbarch, code_entry->symfile_addr), - pulongest (code_entry->symfile_size)); + jit_debug_printf ("symfile_addr = %s, symfile_size = %s", + paddress (gdbarch, code_entry->symfile_addr), + pulongest (code_entry->symfile_size)); gdb_bfd_ref_ptr nbfd (gdb_bfd_open_from_target_memory (code_entry->symfile_addr, code_entry->symfile_size, gnutarget)); @@ -752,12 +750,9 @@ jit_register_code (struct gdbarch *gdbarch, { int success; - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, - "jit_register_code, symfile_addr = %s, " - "symfile_size = %s\n", - paddress (gdbarch, code_entry->symfile_addr), - pulongest (code_entry->symfile_size)); + jit_debug_printf ("symfile_addr = %s, symfile_size = %s", + paddress (gdbarch, code_entry->symfile_addr), + pulongest (code_entry->symfile_size)); success = jit_reader_try_read_symtab (code_entry, entry_addr); @@ -845,11 +840,7 @@ jit_breakpoint_re_set_internal (struct gdbarch *gdbarch, program_space *pspace) CORE_ADDR addr = MSYMBOL_VALUE_ADDRESS (the_objfile, objf_data->register_code); - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, - "jit_breakpoint_re_set_internal, " - "breakpoint_addr = %s\n", - paddress (gdbarch, addr)); + jit_debug_printf ("breakpoint_addr = %s", paddress (gdbarch, addr)); /* Check if we need to re-create the breakpoint. */ if (objf_data->cached_code_address == addr) @@ -893,10 +884,7 @@ jit_unwind_reg_set_impl (struct gdb_unwind_callbacks *cb, int dwarf_regnum, dwarf_regnum); if (gdb_reg == -1) { - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, - _("Could not recognize DWARF regnum %d"), - dwarf_regnum); + jit_debug_printf ("Could not recognize DWARF regnum %d", dwarf_regnum); value->free (value); return; } @@ -987,14 +975,11 @@ jit_frame_sniffer (const struct frame_unwind *self, /* Try to coax the provided unwinder to unwind the stack */ if (funcs->unwind (funcs, &callbacks) == GDB_SUCCESS) { - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, _("Successfully unwound frame using " - "JIT reader.\n")); + jit_debug_printf ("Successfully unwound frame using JIT reader."); return 1; } - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, _("Could not unwind frame using " - "JIT reader.\n")); + + jit_debug_printf ("Could not unwind frame using JIT reader."); jit_dealloc_cache (this_frame, *cache); *cache = NULL; @@ -1105,8 +1090,7 @@ jit_inferior_init (inferior *inf) struct gdbarch *gdbarch = inf->gdbarch; program_space *pspace = inf->pspace; - if (jit_debug) - fprintf_unfiltered (gdb_stdlog, "jit_inferior_init\n"); + jit_debug_printf ("called"); jit_prepend_unwinder (gdbarch); -- 2.29.2