From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 7DDC13858C2C for ; Mon, 30 Jan 2023 04:45:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7DDC13858C2C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x335.google.com with SMTP id a1-20020a056830008100b006864df3b1f8so4228235oto.3 for ; Sun, 29 Jan 2023 20:45:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aDmfr8moEGlKeX79D9kihvQnYDRwBCH3CBQz7Qx3euc=; b=AODlEthX2SN7qDIqgUtZjXcFIQWc67rmClQrJp1eBRj/8MO8OKl/iLi1O50gQtBSj9 qq+bM5eFyEq8wCK1+5rwDLonALbEtxIrcfk+2GyNq+I+EzktG3vYF4Wp6ysauv3lL4nn vPh3/OCBkUmZ2iChUTBrbzFiL2RDAzCEmTDTdDCYjsjOhq57JAKA2ERhy6LgA4/pr1TO jbPhsVBP54rkNh6MV6zk1r54JnGxBy07RVNR5cCU3xXoXd/45JKGwvFXOIuX0QidD5Wm RyU8d4Kx6Xaun4KfGZtrHwpHAUbk5H+hJwjKnQBObkWElsL4w07UXmyuBDScQskVn5KN U7MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aDmfr8moEGlKeX79D9kihvQnYDRwBCH3CBQz7Qx3euc=; b=XRAh+SOvfs3f0f8SMJRpPQklP54tfrnJBMhAANaSrgWQVCcSa662aB7tJu+U/7MsF9 /XqW7CxvLtsOoCi4LzLiG5h3eJB5lQ3uVfBTL/sS+/kRegiTxAOyhNnUJJNQb7oqZJlv W12Psw76WdHLBkhgYeGgC/GuEHevm3NfKlA1ORmj7ntpA57GbRbQsN1zCOjptooEzV4W xwGstST2qFHhhHL1n2nPR9BUga/vLHJMFivXDcWppsITTGqzFMpiK+5A+dDCr7C+Y+xV fNXlMIw5nkXnqxz1iVWcTXPhIhYrTN3ljSEmxmZ1vjOeGSnsRsqBycEiaAdhNEknaVcr xYaw== X-Gm-Message-State: AFqh2kqyQkiy/IWw8dcB/huc+KsBfFMOFd+vTQ0slL9KyFjaZfhLnNQQ p85WrTRasJESr9X4FPUy1kmDtW3qOzjMqiyw X-Google-Smtp-Source: AMrXdXskTik8qrHgmbT/+rsyBYqZJ+opXp2z42B1g6B6r3QHPKP6Q1b3jPW0kNpGf79hiaNR9TSUxw== X-Received: by 2002:a05:6830:1457:b0:670:6b50:fde3 with SMTP id w23-20020a056830145700b006706b50fde3mr24811534otp.26.1675053954093; Sun, 29 Jan 2023 20:45:54 -0800 (PST) Received: from localhost ([2804:14d:7e39:8470:df99:10bd:7dca:b2e9]) by smtp.gmail.com with ESMTPSA id g22-20020a9d6496000000b00684bede5359sm5046906otl.42.2023.01.29.20.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 20:45:53 -0800 (PST) From: Thiago Jung Bauermann To: gdb-patches@sourceware.org Cc: Thiago Jung Bauermann Subject: [PATCH v3 6/8] gdb/remote: Parse tdesc field in stop reply and threads list XML Date: Mon, 30 Jan 2023 04:45:16 +0000 Message-Id: <20230130044518.3322695-7-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130044518.3322695-1-thiago.bauermann@linaro.org> References: <20230130044518.3322695-1-thiago.bauermann@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: gdbserver added the concept of target description IDs to the remote protocol and uses them in the threads list XML and in the 'T AA' stop reply packet. It also allows fetching a target description with a given ID. This patch is for the GDB-side support. The target descriptions obtained this way aren't yet used but will be in the next patch. In the DTD for the threads list XML, add a "tdesc" attribute to the node. A tdesc_id field is added to the stop_reply and thread_item structs. An m_remote member is added to the threads_listing_context struct, and to simplify its initialisation a constructor is added as well. This is to provide access to the remote state in start_thread. Finally, the remote_state object keeps a map of the target descriptions that have been received from the target, keyed by their ID. There are also methods to get a target description given its ID, and to fetch target descriptions for IDs that were mentioned by gdbserver but not yet retrieved by GDB. The latter gets called after parsing the response of qXfer:threads:read and of the stop reply packet. --- gdb/features/threads.dtd | 1 + gdb/remote.c | 85 +++++++++++++++++++++++++++++++++++++++- gdb/xml-tdesc.c | 27 ++++++++++--- gdb/xml-tdesc.h | 6 +++ 4 files changed, 112 insertions(+), 7 deletions(-) diff --git a/gdb/features/threads.dtd b/gdb/features/threads.dtd index 036b2ce58837..3102d1352978 100644 --- a/gdb/features/threads.dtd +++ b/gdb/features/threads.dtd @@ -11,3 +11,4 @@ + diff --git a/gdb/remote.c b/gdb/remote.c index 218bca30d047..f1d1944414c3 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -80,6 +80,7 @@ #include #include "async-event.h" #include "gdbsupport/selftest.h" +#include "xml-tdesc.h" /* The remote target. */ @@ -238,6 +239,16 @@ class remote_state /* Get the remote arch state for GDBARCH. */ struct remote_arch_state *get_remote_arch_state (struct gdbarch *gdbarch); + /* Add new ID to the target description list. The corresponding XML will be + requested soon. */ + void add_tdesc_id (ULONGEST id); + + /* Get the target description corresponding to remote protocol ID. */ + const target_desc *get_tdesc (ULONGEST id) const; + + /* Get the target descriptions we don't know about from the target. */ + void fetch_unknown_tdescs (remote_target *remote); + public: /* data */ /* A buffer to use for incoming packets, and its current size. The @@ -387,6 +398,10 @@ class remote_state support multi-process. */ std::unordered_map m_arch_states; + + /* The target descriptions that have been received from the target. The key + is the ID used to reference it in the remote protocol. */ + std::unordered_map m_tdescs; }; static const target_info remote_target_info = { @@ -1009,6 +1024,9 @@ struct stop_reply : public notif_event fetch them is avoided). */ std::vector regcache; + /* The target description ID communicated in the stop reply packet. */ + gdb::optional tdesc_id; + enum target_stop_reason stop_reason; CORE_ADDR watch_data_address; @@ -3689,6 +3707,9 @@ struct thread_item /* The thread handle associated with the thread. */ gdb::byte_vector thread_handle; + + /* The ID of the thread's target description, if provided. */ + gdb::optional tdesc_id; }; /* Context passed around to the various methods listing remote @@ -3697,6 +3718,12 @@ struct thread_item struct threads_listing_context { + threads_listing_context (remote_target *remote) + : m_remote (remote) + {} + + DISABLE_COPY_AND_ASSIGN (threads_listing_context); + /* Return true if this object contains an entry for a thread with ptid PTID. */ @@ -3733,6 +3760,9 @@ struct threads_listing_context /* The threads found on the remote target. */ std::vector items; + + /* The remote target associated with this context. */ + remote_target *m_remote; }; static int @@ -3814,6 +3844,13 @@ start_thread (struct gdb_xml_parser *parser, attr = xml_find_attribute (attributes, "handle"); if (attr != NULL) item.thread_handle = hex2bin ((const char *) attr->value.get ()); + + attr = xml_find_attribute (attributes, "tdesc"); + if (attr != NULL) + { + item.tdesc_id = *(ULONGEST *) attr->value.get (); + data->m_remote->get_remote_state ()->add_tdesc_id (*item.tdesc_id); + } } static void @@ -3833,6 +3870,7 @@ const struct gdb_xml_attribute thread_attributes[] = { { "core", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, { "name", GDB_XML_AF_OPTIONAL, NULL, NULL }, { "handle", GDB_XML_AF_OPTIONAL, NULL, NULL }, + { "tdesc", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, { NULL, GDB_XML_AF_NONE, NULL, NULL } }; @@ -3870,6 +3908,7 @@ remote_target::remote_get_threads_with_qxfer (threads_listing_context *context) { gdb_xml_parse_quick (_("threads"), "threads.dtd", threads_elements, xml->data (), context); + get_remote_state ()->fetch_unknown_tdescs (this); } return 1; @@ -3937,7 +3976,7 @@ has_single_non_exited_thread (inferior *inf) void remote_target::update_thread_list () { - struct threads_listing_context context; + struct threads_listing_context context (this); int got_list = 0; /* We have a few different mechanisms to fetch the thread list. Try @@ -7223,7 +7262,11 @@ remote_notif_stop_parse (remote_target *remote, struct notif_client *self, const char *buf, struct notif_event *event) { - remote->remote_parse_stop_reply (buf, (struct stop_reply *) event); + struct stop_reply *stop_reply = (struct stop_reply *) event; + + remote->remote_parse_stop_reply (buf, stop_reply); + + stop_reply->rs->fetch_unknown_tdescs (remote); } static void @@ -7516,6 +7559,36 @@ strprefix (const char *p, const char *pend, const char *prefix) return *prefix == '\0'; } +void +remote_state::add_tdesc_id (ULONGEST id) +{ + /* Check whether the ID was already added. */ + if (m_tdescs.find (id) != m_tdescs.cend ()) + return; + + m_tdescs[id] = nullptr; +} + +const target_desc * +remote_state::get_tdesc (ULONGEST id) const +{ + auto found = m_tdescs.find (id); + + /* Check if the given ID was already provided. */ + if (found == m_tdescs.cend ()) + return nullptr; + + return found->second; +} + +void +remote_state::fetch_unknown_tdescs (remote_target *remote) +{ + for (auto &pair : m_tdescs) + if (pair.second == nullptr) + m_tdescs[pair.first] = target_read_description_xml (remote, pair.first); +} + /* Parse the stop reply in BUF. Either the function succeeds, and the result is stored in EVENT, or throws an error. */ @@ -7674,6 +7747,14 @@ Packet: '%s'\n"), event->ws.set_thread_created (); p = strchrnul (p1 + 1, ';'); } + else if (strprefix (p, p1, "tdesc")) + { + ULONGEST tdesc_id; + + p = unpack_varlen_hex (++p1, &tdesc_id); + event->rs->add_tdesc_id (tdesc_id); + event->tdesc_id = tdesc_id; + } else { ULONGEST pnum; diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c index ba7154c5d56f..302863e12365 100644 --- a/gdb/xml-tdesc.c +++ b/gdb/xml-tdesc.c @@ -698,14 +698,13 @@ fetch_available_features_from_target (const char *name, target_ops *ops) } -/* Read an XML target description using OPS. Parse it, and return the - parsed description. */ +/* Actual implementation of the target_read_description_xml variants. */ -const struct target_desc * -target_read_description_xml (struct target_ops *ops) +static const struct target_desc * +target_read_description_xml (struct target_ops *ops, const char *desc_name) { gdb::optional tdesc_str - = fetch_available_features_from_target ("target.xml", ops); + = fetch_available_features_from_target (desc_name, ops); if (!tdesc_str) return NULL; @@ -717,6 +716,24 @@ target_read_description_xml (struct target_ops *ops) return tdesc_parse_xml (tdesc_str->data (), fetch_another); } +/* See xml-tdesc.h. */ + +const struct target_desc * +target_read_description_xml (struct target_ops *ops) +{ + return target_read_description_xml (ops, "target.xml"); +} + +/* See xml-tdesc.h. */ + +const struct target_desc * +target_read_description_xml (struct target_ops *ops, ULONGEST id) +{ + std::string desc_name = string_printf ("target-id-%" PRIu64 ".xml", id); + + return target_read_description_xml (ops, desc_name.c_str ()); +} + /* Fetches an XML target description using OPS, processing includes, but not parsing it. Used to dump whole tdesc as a single XML file. */ diff --git a/gdb/xml-tdesc.h b/gdb/xml-tdesc.h index 0fbfc7e043e9..c7cc97c5dfc0 100644 --- a/gdb/xml-tdesc.h +++ b/gdb/xml-tdesc.h @@ -38,6 +38,12 @@ const struct target_desc *file_read_description_xml (const char *filename); const struct target_desc *target_read_description_xml (struct target_ops *); +/* Read an XML target description with the given ID using OPS. Parse it, and + return the parsed description. */ + +const struct target_desc *target_read_description_xml (struct target_ops *ops, + ULONGEST id); + /* Fetches an XML target description using OPS, processing includes, but not parsing it. Used to dump whole tdesc as a single XML file. Returns the description on success, and a disengaged optional