summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2003-04-10 11:12:30 +0000
committerCorinna Vinschen <corinna@vinschen.de>2003-04-10 11:12:30 +0000
commitd1211bc7641d75b7ad0dd07c282579688fb40c9a (patch)
tree9b2394d16baa8f43d229c184adcc36f09e6d588d
parent8aee0e6e6a22b330e48f154c40b81a7c77ff7ae0 (diff)
downloadgdb-d1211bc7641d75b7ad0dd07c282579688fb40c9a.tar.gz
* blockframe.c (legacy_frame_chain_valid): Move call to
DEPRECATED_FRAME_CHAIN_VALID before calls to inside_entry_func and inside_entry_file.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/blockframe.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2ee1552764b..01f2f335f21 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-10 Corinna Vinschen <vinschen@redhat.com>
+
+ * blockframe.c (legacy_frame_chain_valid): Move call to
+ DEPRECATED_FRAME_CHAIN_VALID before calls to inside_entry_func and
+ inside_entry_file.
+
2003-04-09 Andrew Cagney <cagney@redhat.com>
* frame.h (struct frame_id): Replace "pc" and "base" with
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index b6326defb29..47e576e8211 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -575,6 +575,11 @@ legacy_frame_chain_valid (CORE_ADDR fp, struct frame_info *fi)
if (INNER_THAN (fp, get_frame_base (fi)))
return 0;
+ /* If the architecture has a custom DEPRECATED_FRAME_CHAIN_VALID,
+ call it now. */
+ if (DEPRECATED_FRAME_CHAIN_VALID_P ())
+ return DEPRECATED_FRAME_CHAIN_VALID (fp, fi);
+
/* If we're already inside the entry function for the main objfile, then it
isn't valid. */
if (inside_entry_func (get_frame_pc (fi)))
@@ -587,10 +592,5 @@ legacy_frame_chain_valid (CORE_ADDR fp, struct frame_info *fi)
if (inside_entry_file (frame_pc_unwind (fi)))
return 0;
- /* If the architecture has a custom DEPRECATED_FRAME_CHAIN_VALID,
- call it now. */
- if (DEPRECATED_FRAME_CHAIN_VALID_P ())
- return DEPRECATED_FRAME_CHAIN_VALID (fp, fi);
-
return 1;
}