From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH 4/5] gdb: remove copy_inferior_target_desc_info
Date: Fri, 3 Feb 2023 09:21:25 -0500 [thread overview]
Message-ID: <20230203142126.286866-5-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <20230203142126.286866-1-simon.marchi@polymtl.ca>
This function is now trivial, we can just copy inferior::tdesc_info
where needed.
Change-Id: I25185e2cd4ba1ef24a822d9e0eebec6e611d54d6
---
gdb/inferior.c | 2 +-
gdb/infrun.c | 4 ++--
gdb/target-descriptions.c | 11 -----------
gdb/target-descriptions.h | 7 -------
4 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/gdb/inferior.c b/gdb/inferior.c
index dfe523664de0..65863440b9c0 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -962,7 +962,7 @@ clone_inferior_command (const char *args, int from_tty)
/* If the original inferior had a user specified target
description, make the clone use it too. */
if (target_desc_info_from_user_p (&inf->tdesc_info))
- copy_inferior_target_desc_info (inf, orginf);
+ inf->tdesc_info = orginf->tdesc_info;
clone_program_space (pspace, orginf->pspace);
diff --git a/gdb/infrun.c b/gdb/infrun.c
index edfb5ab0a91f..87ab73c47a4f 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -478,7 +478,7 @@ holding the child stopped. Try \"set detach-on-fork\" or \
child_inf->attach_flag = parent_inf->attach_flag;
copy_terminal_info (child_inf, parent_inf);
child_inf->gdbarch = parent_inf->gdbarch;
- copy_inferior_target_desc_info (child_inf, parent_inf);
+ child_inf->tdesc_info = parent_inf->tdesc_info;
child_inf->symfile_flags = SYMFILE_NO_READ;
@@ -546,7 +546,7 @@ holding the child stopped. Try \"set detach-on-fork\" or \
child_inf->attach_flag = parent_inf->attach_flag;
copy_terminal_info (child_inf, parent_inf);
child_inf->gdbarch = parent_inf->gdbarch;
- copy_inferior_target_desc_info (child_inf, parent_inf);
+ child_inf->tdesc_info = parent_inf->tdesc_info;
if (has_vforked)
{
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 0561a8098c5c..6defd5bbe863 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -459,17 +459,6 @@ target_desc_info_from_user_p (struct target_desc_info *info)
return info != nullptr && !info->filename.empty ();
}
-/* See target-descriptions.h. */
-
-void
-copy_inferior_target_desc_info (struct inferior *destinf, struct inferior *srcinf)
-{
- struct target_desc_info *src = &srcinf->tdesc_info;
- struct target_desc_info *dest = &destinf->tdesc_info;
-
- *dest = *src;
-}
-
/* The string manipulated by the "set tdesc filename ..." command. */
static std::string tdesc_filename_cmd_string;
diff --git a/gdb/target-descriptions.h b/gdb/target-descriptions.h
index c337c177c8e8..b835e144c680 100644
--- a/gdb/target-descriptions.h
+++ b/gdb/target-descriptions.h
@@ -48,13 +48,6 @@ void target_clear_description (void);
const struct target_desc *target_current_description (void);
-/* Copy inferior target description data. Used for example when
- handling (v)forks, where child's description is the same as the
- parent's, since the child really is a copy of the parent. */
-
-void copy_inferior_target_desc_info (struct inferior *destinf,
- struct inferior *srcinf);
-
/* Returns true if INFO indicates the target description had been
supplied by the user. */
--
2.39.1
next prev parent reply other threads:[~2023-02-03 14:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 14:21 [PATCH 0/5] Some target_desc_info cleanups Simon Marchi
2023-02-03 14:21 ` [PATCH 1/5] gdb: move target_desc_info to inferior.h Simon Marchi
2023-02-03 14:21 ` [PATCH 2/5] gdb: change inferior::tdesc_info to non-pointer Simon Marchi
2023-02-03 14:21 ` [PATCH 3/5] gdb: remove get_tdesc_info Simon Marchi
2023-02-03 15:53 ` Andrew Burgess
2023-02-03 16:05 ` Simon Marchi
2023-02-03 14:21 ` Simon Marchi [this message]
2023-02-03 15:54 ` [PATCH 4/5] gdb: remove copy_inferior_target_desc_info Andrew Burgess
2023-02-03 16:05 ` Simon Marchi
2023-02-03 14:21 ` [PATCH 5/5] gdb: make target_desc_info_from_user_p a method of target_desc_info Simon Marchi
2023-02-06 18:41 ` Pedro Alves
2023-02-06 19:13 ` Simon Marchi
2023-02-03 15:56 ` [PATCH 0/5] Some target_desc_info cleanups Andrew Burgess
2023-02-03 16:07 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230203142126.286866-5-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).