From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH 3/7] gdb: move frame_info_ptr method implementations to frame-info.c
Date: Mon, 7 Nov 2022 10:53:06 -0500 [thread overview]
Message-ID: <20221107155310.2590069-3-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <20221107155310.2590069-1-simon.marchi@polymtl.ca>
I don't see any particular reason why the implementations of the
frame_info_ptr object are in the header file. It only seems to add some
complexity. Since we can't include frame.h in frame-info.h, we have to
add declarations of functions defined in frame.c, in frame-info.h. By
moving the implementations to a new frame-info.c, we can avoid that.
Change-Id: I435c828f81b8a3392c43ef018af31effddf6be9c
---
gdb/Makefile.in | 1 +
gdb/frame-info.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
gdb/frame-info.h | 20 ++------------------
gdb/frame.c | 4 +---
gdb/frame.h | 4 ++++
5 files changed, 55 insertions(+), 21 deletions(-)
create mode 100644 gdb/frame-info.c
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index c528ee5aa806..32dbbb9c7003 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1086,6 +1086,7 @@ COMMON_SFILES = \
findvar.c \
frame.c \
frame-base.c \
+ frame-info.c \
frame-unwind.c \
gcore.c \
gdb-demangle.c \
diff --git a/gdb/frame-info.c b/gdb/frame-info.c
new file mode 100644
index 000000000000..84791205d906
--- /dev/null
+++ b/gdb/frame-info.c
@@ -0,0 +1,47 @@
+/* Frame info pointer
+
+ Copyright (C) 2022 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+
+#include "frame-info.h"
+#include "frame.h"
+
+/* See frame-info-ptr.h. */
+
+intrusive_list<frame_info_ptr> frame_info_ptr::frame_list;
+
+/* See frame-info-ptr.h. */
+
+void
+frame_info_ptr::prepare_reinflate ()
+{
+ m_cached_id = get_frame_id (*this);
+}
+
+/* See frame-info-ptr.h. */
+
+void
+frame_info_ptr::reinflate ()
+{
+ gdb_assert (m_cached_id != null_frame_id);
+
+ if (m_ptr == nullptr)
+ m_ptr = frame_find_by_id (m_cached_id).get ();
+ gdb_assert (m_ptr != nullptr);
+}
diff --git a/gdb/frame-info.h b/gdb/frame-info.h
index 7159f82b1962..1d2d4bdc7e68 100644
--- a/gdb/frame-info.h
+++ b/gdb/frame-info.h
@@ -25,12 +25,6 @@
struct frame_info;
-/* Forward declarations of functions, needed for the frame_info_ptr
- to work correctly. */
-extern void reinit_frame_cache ();
-extern struct frame_id get_frame_id (frame_info_ptr);
-extern frame_info_ptr frame_find_by_id (struct frame_id id);
-
/* A wrapper for "frame_info *". frame_info objects are invalidated
whenever reinit_frame_cache is called. This class arranges to
invalidate the pointer when appropriate. This is done to help
@@ -136,20 +130,10 @@ class frame_info_ptr : public intrusive_list_node<frame_info_ptr>
}
/* Cache the frame_id that the pointer will use to reinflate. */
- void prepare_reinflate ()
- {
- m_cached_id = get_frame_id (*this);
- }
+ void prepare_reinflate ();
/* Use the cached frame_id to reinflate the pointer. */
- void reinflate ()
- {
- gdb_assert (m_cached_id != null_frame_id);
-
- if (m_ptr == nullptr)
- m_ptr = frame_find_by_id (m_cached_id).get ();
- gdb_assert (m_ptr != nullptr);
- }
+ void reinflate ();
private:
diff --git a/gdb/frame.c b/gdb/frame.c
index 5cf9186e43d7..997fda77d019 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -19,6 +19,7 @@
#include "defs.h"
#include "frame.h"
+#include "frame-info.h"
#include "target.h"
#include "value.h"
#include "inferior.h" /* for inferior_ptid */
@@ -56,9 +57,6 @@ static frame_info *sentinel_frame;
/* Number of calls to reinit_frame_cache. */
static unsigned int frame_cache_generation = 0;
-/* See frame-info.h. */
-intrusive_list<frame_info_ptr> frame_info_ptr::frame_list;
-
/* See frame.h. */
unsigned int
diff --git a/gdb/frame.h b/gdb/frame.h
index f61ea63c290b..5f7dcb69ee90 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -287,6 +287,10 @@ extern frame_info_ptr get_next_frame_sentinel_okay (frame_info_ptr);
frame. */
extern frame_info_ptr get_prev_frame_always (frame_info_ptr);
+/* Given a frame's ID, relocate the frame. Returns NULL if the frame
+ is not found. */
+extern frame_info_ptr frame_find_by_id (frame_id id);
+
/* Base attributes of a frame: */
/* The frame's `resume' address. Where the program will resume in
--
2.38.1
next prev parent reply other threads:[~2022-11-07 15:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 15:53 [PATCH 1/7] gdb: clear other.m_cached_id in frame_info_ptr's move ctor Simon Marchi
2022-11-07 15:53 ` [PATCH 2/7] gdb: add prepare_reinflate/reinflate around print_frame_args in info_frame_command_core Simon Marchi
2022-11-08 9:32 ` Bruno Larsen
2022-11-08 15:55 ` Simon Marchi
2022-11-08 19:39 ` Tom Tromey
2022-11-08 19:55 ` Simon Marchi
2022-11-07 15:53 ` Simon Marchi [this message]
2022-11-08 9:55 ` [PATCH 3/7] gdb: move frame_info_ptr method implementations to frame-info.c Bruno Larsen
2022-11-08 17:39 ` Tom Tromey
2022-11-07 15:53 ` [PATCH 4/7] gdb: remove manual frame_info reinflation code in backtrace_command_1 Simon Marchi
2022-11-08 10:14 ` Bruno Larsen
2022-11-08 16:05 ` Simon Marchi
2022-11-07 15:53 ` [PATCH 5/7] gdb: use frame_id_p instead of comparing to null_frame_id in frame_info_ptr::reinflate Simon Marchi
2022-11-08 17:43 ` Tom Tromey
2022-11-07 15:53 ` [PATCH 6/7] gdb: add missing prepare_reinflate call in print_frame_info Simon Marchi
2022-11-08 10:28 ` Bruno Larsen
2022-11-08 11:31 ` Lancelot SIX
2022-11-08 16:08 ` Simon Marchi
2022-11-07 15:53 ` [PATCH 7/7] gdb: add special handling for frame level 0 in frame_info_ptr Simon Marchi
2022-11-08 10:40 ` Bruno Larsen
2022-11-08 16:19 ` Simon Marchi
2022-11-10 16:28 ` Bruno Larsen
2022-11-10 16:30 ` Simon Marchi
2022-11-08 8:53 ` [PATCH 1/7] gdb: clear other.m_cached_id in frame_info_ptr's move ctor Bruno Larsen
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=20221107155310.2590069-3-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).