diff options
| -rw-r--r-- | gdb/mi/mi-main.c | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index abd033b..91eb8d1 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1974,27 +1974,51 @@ struct user_selected_context { /* Constructor. */ user_selected_context () - : m_previous_ptid (inferior_ptid), - m_previous_frame (deprecated_safe_get_selected_frame ()) - { /* Nothing. */ } + : m_previous_ptid (inferior_ptid) + { + save_selected_frame (&m_previous_frame_id, &m_previous_frame_level); + } /* Return true if the user selected context has changed since this object was created. */ bool has_changed () const { - return ((m_previous_ptid != null_ptid - && inferior_ptid != null_ptid - && m_previous_ptid != inferior_ptid) - || m_previous_frame != deprecated_safe_get_selected_frame ()); + /* Did the selected thread change? */ + if (m_previous_ptid != null_ptid && inferior_ptid != null_ptid + && m_previous_ptid != inferior_ptid) + return true; + + /* Grab details of the currently selected frame, for comparison. */ + frame_id current_frame_id; + int current_frame_level; + save_selected_frame (¤t_frame_id, ¤t_frame_level); + + /* Did the selected frame level change? */ + if (current_frame_level != m_previous_frame_level) + return true; + + /* Did the selected frame id change? If the innermost frame is + selected then the level will be -1, and the frame-id will be + null_frame_id. As comparing null_frame_id with itself always + reports not-equal, we only do the equality test if we have something + other than the innermost frame selected. */ + if (current_frame_level != -1 + && !frame_id_eq (current_frame_id, m_previous_frame_id)) + return true; + + /* Nothing changed! */ + return false; } private: /* The previously selected thread. This might be null_ptid if there was no previously selected thread. */ ptid_t m_previous_ptid; - /* The previously selected frame. This might be nullptr if there was no - previously selected frame. */ - frame_info *m_previous_frame; + /* The previously selected frame. If the innermost frame is selected, or + no frame is selected, then the frame_id will be null_frame_id, and the + level will be -1. */ + frame_id m_previous_frame_id; + int m_previous_frame_level; }; static void |