diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/gdbserver/inferiors.c | 2 | ||||
| -rw-r--r-- | gdb/gdbserver/server.h | 1 | ||||
| -rw-r--r-- | gdb/gdbserver/thread-db.c | 7 |
4 files changed, 17 insertions, 2 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index d7c129a..a5c0bd8 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,14 @@ 2009-04-03 Ulrich Weigand <uweigand@de.ibm.com> + * inferiors.c (get_thread_process): Make global. + * server.h (get_thread_process): Add prototype. + * thread-db.c (find_one_thread): Use get_thread_process + instead of current_process. + (thread_db_get_tls_address): Do not crash if called when + thread layer is not yet initialized. + +2009-04-03 Ulrich Weigand <uweigand@de.ibm.com> + * remote-utils.c (prepare_resume_reply): Null-terminate packet. * spu-low.c (current_tid): Rename to ... (current_ptid): ... this. diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 2d26b6a..f96438e 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -442,7 +442,7 @@ find_process_pid (int pid) find_inferior_id (&all_processes, pid_to_ptid (pid)); } -static struct process_info * +struct process_info * get_thread_process (struct thread_info *thread) { int pid = ptid_get_pid (thread->entry.id); diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 1af5313..7a0b770 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -201,6 +201,7 @@ struct process_info no current thread selected. */ struct process_info *current_process (void); +struct process_info *get_thread_process (struct thread_info *); #include "regcache.h" #include "gdb/signals.h" diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c index 936bb0f..4a26be9 100644 --- a/gdb/gdbserver/thread-db.c +++ b/gdb/gdbserver/thread-db.c @@ -233,7 +233,7 @@ find_one_thread (ptid_t ptid) td_err_e err; struct thread_info *inferior; struct lwp_info *lwp; - struct process_info_private *proc = current_process()->private; + struct process_info_private *proc; int lwpid = ptid_get_lwp (ptid); inferior = (struct thread_info *) find_inferior_id (&all_threads, ptid); @@ -242,6 +242,7 @@ find_one_thread (ptid_t ptid) return 1; /* Get information about this thread. */ + proc = get_thread_process (inferior)->private; err = td_ta_map_lwp2thr (proc->thread_agent, lwpid, &th); if (err != TD_OK) error ("Cannot get thread handle for LWP %d: %s", @@ -382,6 +383,10 @@ thread_db_get_tls_address (struct thread_info *thread, CORE_ADDR offset, struct lwp_info *lwp; struct thread_info *saved_inferior; + /* If the thread layer is not (yet) initialized, fail. */ + if (!get_thread_process (thread)->all_symbols_looked_up) + return TD_ERR; + lwp = get_thread_lwp (thread); if (!lwp->thread_known) find_one_thread (lwp->head.id); |