+ *prev_pc = tp->prev_pc;
+ *trap_expected = tp->trap_expected;
+ *step_resume_breakpoint = tp->step_resume_breakpoint;
+ *step_range_start = tp->step_range_start;
+ *step_range_end = tp->step_range_end;
+ *step_frame_id = tp->step_frame_id;
+ *handling_longjmp = tp->handling_longjmp;
+ *another_trap = tp->another_trap;
+ *stepping_through_solib_after_catch =
+ tp->stepping_through_solib_after_catch;
+ *stepping_through_solib_catchpoints =
+ tp->stepping_through_solib_catchpoints;
+ *stepping_through_sigtramp = tp->stepping_through_sigtramp;
+ *current_line = tp->current_line;
+ *current_symtab = tp->current_symtab;
+}
+
+/* Save infrun state for the thread PID. */
+
+void
+save_infrun_state (ptid_t ptid,
+ CORE_ADDR prev_pc,
+ int trap_expected,
+ struct breakpoint *step_resume_breakpoint,
+ CORE_ADDR step_range_start,
+ CORE_ADDR step_range_end,
+ const struct frame_id *step_frame_id,
+ int handling_longjmp,
+ int another_trap,
+ int stepping_through_solib_after_catch,
+ bpstat stepping_through_solib_catchpoints,
+ int stepping_through_sigtramp,
+ int current_line,
+ struct symtab *current_symtab)
+{
+ struct thread_info *tp;
+
+ /* If we can't find the thread, then we're debugging a single-threaded
+ process. Nothing to do in that case. */
+ tp = find_thread_id (pid_to_thread_id (ptid));
+ if (tp == NULL)
+ return;
+
+ tp->prev_pc = prev_pc;
+ tp->trap_expected = trap_expected;
+ tp->step_resume_breakpoint = step_resume_breakpoint;
+ tp->step_range_start = step_range_start;
+ tp->step_range_end = step_range_end;
+ tp->step_frame_id = (*step_frame_id);
+ tp->handling_longjmp = handling_longjmp;
+ tp->another_trap = another_trap;
+ tp->stepping_through_solib_after_catch = stepping_through_solib_after_catch;
+ tp->stepping_through_solib_catchpoints = stepping_through_solib_catchpoints;
+ tp->stepping_through_sigtramp = stepping_through_sigtramp;
+ tp->current_line = current_line;
+ tp->current_symtab = current_symtab;
+}
+
+/* Return true if TP is an active thread. */
+static int
+thread_alive (struct thread_info *tp)
+{
+ if (PIDGET (tp->ptid) == -1)
+ return 0;
+ if (!target_thread_alive (tp->ptid))
+ {
+ tp->ptid = pid_to_ptid (-1); /* Mark it as dead */
+ return 0;
+ }
+ return 1;
+}
+
+static void
+prune_threads (void)
+{
+ struct thread_info *tp, *next;
+
+ for (tp = thread_list; tp; tp = next)
+ {
+ next = tp->next;
+ if (!thread_alive (tp))
+ delete_thread (tp->ptid);
+ }
+}
+
+/* Print information about currently known threads
+
+ * Note: this has the drawback that it _really_ switches
+ * threads, which frees the frame cache. A no-side
+ * effects info-threads command would be nicer.
+ */
+
+static void
+info_threads_command (char *arg, int from_tty)
+{
+ struct thread_info *tp;
+ ptid_t current_ptid;
+ struct frame_info *cur_frame;
+ struct frame_id saved_frame_id = get_frame_id (get_selected_frame ());
+ char *extra_info;
+
+ prune_threads ();
+ target_find_new_threads ();
+ current_ptid = inferior_ptid;