From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DBE653952523 for ; Fri, 6 May 2022 17:17:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DBE653952523 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-386-loa9TOPJNPu6d5OFIBVQtg-1; Fri, 06 May 2022 13:17:26 -0400 X-MC-Unique: loa9TOPJNPu6d5OFIBVQtg-1 Received: by mail-ej1-f71.google.com with SMTP id dt6-20020a170907728600b006f40b4ea280so4671853ejc.21 for ; Fri, 06 May 2022 10:17:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gKLm6mAPbHjFxciVchBlDsKTtuuA6glQr8m9PbdSUhE=; b=rDj8JuPdsOQAYzpxRe9419e+lz6d9iUSudTv7L1z9kqJC2nH5h3H/H7PBKiDlEgKcZ cbr7K7lNUP/2p2LOgE70Zenzg+uCoen+jLBoTT9331wRjV6SXFDfH/luusNBCk39xP2W sXYLeSKpHncoHfdy8LTEA5LrRnUH00Ei5mCQJrtbcUcP7F6INwRNMsugii/T3uLT/3m+ WwNzKD2Lg3DZjM47s0/383XPvqidx7La8A+N9pSFPzMTTfN86e0ACAFJir3SAHNTirgM RlHUPjNoZlVyQZOpC9kq69gXrdMRaD2SA4Y6FmMRTiTLfXKEk4a4nS3Czi4pHto5t8ik a9Iw== X-Gm-Message-State: AOAM5323xuwge7mAVzWx0jUQl73jjnKB50k9R54tNgaQhWOhkTFAyFXZ YoIXmJGrJ1Gu9hkZkQPMOF5gXiM3G3YQlnb9uWiBHAl0f3TEBuhfwyTbhbU0KOf/jnuCZrmlwV9 gp0rZPoHSq8GXlEDAlZoLBEtwGDAlPg4YvwzgWe2ckH4iyANhGnSzy7+qsfcRDtF77EMt5IWvTA == X-Received: by 2002:aa7:da43:0:b0:425:cd4c:e43f with SMTP id w3-20020aa7da43000000b00425cd4ce43fmr4466476eds.106.1651857444927; Fri, 06 May 2022 10:17:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXRtclrVPUaqrLzbW7MrYT1bHdbwfk/FW50o6mQyXj3a4+jjfnZ1X9eRpLgY6YBTCOg3OyVQ== X-Received: by 2002:aa7:da43:0:b0:425:cd4c:e43f with SMTP id w3-20020aa7da43000000b00425cd4ce43fmr4466427eds.106.1651857444469; Fri, 06 May 2022 10:17:24 -0700 (PDT) Received: from localhost (92.40.178.210.threembb.co.uk. [92.40.178.210]) by smtp.gmail.com with ESMTPSA id e15-20020a50e44f000000b0042617ba63c7sm2535267edm.81.2022.05.06.10.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 10:17:23 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv5 2/5] gdb: add extension language print_insn hook Date: Fri, 6 May 2022 18:17:11 +0100 Message-Id: <7ec107f6b6b66b6196c035a399b298f7a9e904cf.1651857000.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org 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: , X-List-Received-Date: Fri, 06 May 2022 17:17:29 -0000 From: Andrew Burgess This commit is setup for the next commit. In the next commit I will add a Python API to intercept the print_insn calls within GDB, each print_insn call is responsible for disassembling, and printing one instruction. After the next commit it will be possible for a user to write Python code that either wraps around the existing disassembler, or even, in extreme situations, entirely replaces the existing disassembler. This commit does not add any new Python API. What this commit does is put the extension language framework in place for a print_insn hook. There's a new callback added to 'struct extension_language_ops', which is then filled in with nullptr for Python and Guile. Finally, in the disassembler, the code is restructured so that the new extension language function ext_lang_print_insn is called before we delegate to gdbarch_print_insn. After this, the next commit can focus entirely on providing a Python implementation of the new print_insn callback. There should be no user visible change after this commit. --- gdb/disasm.c | 29 ++++++++++++++++++++++++++--- gdb/extension-priv.h | 15 +++++++++++++++ gdb/extension.c | 20 ++++++++++++++++++++ gdb/extension.h | 10 ++++++++++ gdb/guile/guile.c | 6 +++++- gdb/python/python.c | 2 ++ 6 files changed, 78 insertions(+), 4 deletions(-) diff --git a/gdb/disasm.c b/gdb/disasm.c index 6ac84388cc3..4af40c916b2 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -851,6 +851,29 @@ gdb_disassemble_info::~gdb_disassemble_info () disassemble_free_target (&m_di); } +/* Wrapper around calling gdbarch_print_insn. This function takes care of + first calling the extension language hooks for print_insn, and, if none + of the extension languages can print this instruction, calls + gdbarch_print_insn to do the work. + + GDBARCH is the architecture to disassemble in, VMA is the address of the + instruction being disassembled, and INFO is the libopcodes disassembler + related information. */ + +static int +gdb_print_insn_1 (struct gdbarch *gdbarch, CORE_ADDR vma, + struct disassemble_info *info) +{ + /* Call into the extension languages to do the disassembly. */ + gdb::optional length = ext_lang_print_insn (gdbarch, vma, info); + if (length.has_value ()) + return *length; + + /* No extension language wanted to do the disassembly, so do it + manually. */ + return gdbarch_print_insn (gdbarch, vma, info); +} + /* See disasm.h. */ bool gdb_disassembler::use_ext_lang_colorization_p = true; @@ -864,7 +887,7 @@ gdb_disassembler::print_insn (CORE_ADDR memaddr, m_err_memaddr.reset (); m_buffer.clear (); - int length = gdbarch_print_insn (arch (), memaddr, &m_di); + int length = gdb_print_insn_1 (arch (), memaddr, &m_di); /* If we have successfully disassembled an instruction, styling is on, we think that the extension language might be able to perform styling for @@ -899,7 +922,7 @@ gdb_disassembler::print_insn (CORE_ADDR memaddr, gdb_assert (!m_buffer.term_out ()); m_buffer.~string_file (); new (&m_buffer) string_file (true); - length = gdbarch_print_insn (arch (), memaddr, &m_di); + length = gdb_print_insn_1 (arch (), memaddr, &m_di); gdb_assert (length > 0); } } @@ -1054,7 +1077,7 @@ gdb_buffered_insn_length (struct gdbarch *gdbarch, gdb_buffered_insn_length_init_dis (gdbarch, &di, insn, max_len, addr, &disassembler_options_holder); - int result = gdbarch_print_insn (gdbarch, addr, &di); + int result = gdb_print_insn_1 (gdbarch, addr, &di); disassemble_free_target (&di); return result; } diff --git a/gdb/extension-priv.h b/gdb/extension-priv.h index d9450b51231..7c74e721c57 100644 --- a/gdb/extension-priv.h +++ b/gdb/extension-priv.h @@ -263,6 +263,21 @@ struct extension_language_ops contents, or an empty optional. */ gdb::optional (*colorize_disasm) (const std::string &content, gdbarch *gdbarch); + + /* Print a single instruction from ADDRESS in architecture GDBARCH. INFO + is the standard libopcodes disassembler_info structure. Bytes for the + instruction being printed should be read using INFO->read_memory_func + as the actual instruction bytes might be in a buffer. + + Use INFO->fprintf_func to print the results of the disassembly, and + return the length of the instruction. + + If no instruction can be disassembled then return an empty value and + other extension languages will get a chance to perform the + disassembly. */ + gdb::optional (*print_insn) (struct gdbarch *gdbarch, + CORE_ADDR address, + struct disassemble_info *info); }; /* State necessary to restore a signal handler to its previous value. */ diff --git a/gdb/extension.c b/gdb/extension.c index 8f39b86e952..5a805bea00e 100644 --- a/gdb/extension.c +++ b/gdb/extension.c @@ -924,6 +924,26 @@ ext_lang_colorize_disasm (const std::string &content, gdbarch *gdbarch) return result; } +/* See extension.h. */ + +gdb::optional +ext_lang_print_insn (struct gdbarch *gdbarch, CORE_ADDR address, + struct disassemble_info *info) +{ + for (const struct extension_language_defn *extlang : extension_languages) + { + if (extlang->ops == nullptr + || extlang->ops->print_insn == nullptr) + continue; + gdb::optional length + = extlang->ops->print_insn (gdbarch, address, info); + if (length.has_value ()) + return length; + } + + return {}; +} + /* Called via an observer before gdb prints its prompt. Iterate over the extension languages giving them a chance to change the prompt. The first one to change the prompt wins, diff --git a/gdb/extension.h b/gdb/extension.h index 7eb89530c44..47839ea50be 100644 --- a/gdb/extension.h +++ b/gdb/extension.h @@ -327,6 +327,16 @@ extern gdb::optional ext_lang_colorize extern gdb::optional ext_lang_colorize_disasm (const std::string &content, gdbarch *gdbarch); +/* Calls extension_language_ops::print_insn for each extension language, + returning the result from the first extension language that returns a + non-empty result (any further extension languages are not then called). + + All arguments are forwarded to extension_language_ops::print_insn, see + that function for a full description. */ + +extern gdb::optional ext_lang_print_insn + (struct gdbarch *gdbarch, CORE_ADDR address, struct disassemble_info *info); + #if GDB_SELF_TEST namespace selftests { extern void (*hook_set_active_ext_lang) (); diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c index c7be48fb739..14b191ded62 100644 --- a/gdb/guile/guile.c +++ b/gdb/guile/guile.c @@ -130,8 +130,12 @@ static const struct extension_language_ops guile_extension_ops = gdbscm_breakpoint_has_cond, gdbscm_breakpoint_cond_says_stop, - NULL, /* gdbscm_check_quit_flag, */ NULL, /* gdbscm_set_quit_flag, */ + NULL, /* gdbscm_check_quit_flag, */ + NULL, /* gdbscm_before_prompt, */ + NULL, /* gdbscm_get_matching_xmethod_workers */ + NULL, /* gdbscm_colorize */ + NULL, /* gdbscm_print_insn */ }; #endif diff --git a/gdb/python/python.c b/gdb/python/python.c index 11aaa7ae778..b5b8379e23c 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -166,6 +166,8 @@ static const struct extension_language_ops python_extension_ops = gdbpy_colorize, gdbpy_colorize_disasm, + + NULL, /* gdbpy_print_insn, */ }; #endif /* HAVE_PYTHON */ -- 2.25.4