From 7c86889b04a1cd1c14060dd734a2a6659304b294 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 10 Apr 2003 11:12:30 +0000 Subject: [PATCH] * blockframe.c (legacy_frame_chain_valid): Move call to DEPRECATED_FRAME_CHAIN_VALID before calls to inside_entry_func and inside_entry_file. --- gdb/ChangeLog | 6 ++++++ gdb/blockframe.c | 10 +++++----- 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 + + * 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 * 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; } -- 2.30.2