X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fbsd-uthread.c;h=9769d207dda2de82566ff60b17283db1e5b165d7;hb=5430098f1807e084fe4ff5057040d68435f3d8a2;hp=5757e770510834fa8984f193432520fe6cdb6849;hpb=ecd75fc8eed3bde86036141228074a20e55dcfc9;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c index 5757e77051..9769d207dd 100644 --- a/gdb/bsd-uthread.c +++ b/gdb/bsd-uthread.c @@ -1,6 +1,6 @@ /* BSD user-level threads support. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2017 Free Software Foundation, Inc. This file is part of GDB. @@ -29,7 +29,6 @@ #include "symfile.h" #include "target.h" -#include "gdb_assert.h" #include "gdb_obstack.h" #include "bsd-uthread.h" @@ -69,7 +68,9 @@ bsd_uthread_set_supply_uthread (struct gdbarch *gdbarch, void (*supply_uthread) (struct regcache *, int, CORE_ADDR)) { - struct bsd_uthread_ops *ops = gdbarch_data (gdbarch, bsd_uthread_data); + struct bsd_uthread_ops *ops + = (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data); + ops->supply_uthread = supply_uthread; } @@ -81,7 +82,9 @@ bsd_uthread_set_collect_uthread (struct gdbarch *gdbarch, void (*collect_uthread) (const struct regcache *, int, CORE_ADDR)) { - struct bsd_uthread_ops *ops = gdbarch_data (gdbarch, bsd_uthread_data); + struct bsd_uthread_ops *ops + = (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data); + ops->collect_uthread = collect_uthread; } @@ -125,11 +128,11 @@ static int bsd_uthread_active; static CORE_ADDR bsd_uthread_lookup_address (const char *name, struct objfile *objfile) { - struct minimal_symbol *sym; + struct bound_minimal_symbol sym; sym = lookup_minimal_symbol (name, NULL, objfile); - if (sym) - return SYMBOL_VALUE_ADDRESS (sym); + if (sym.minsym) + return BMSYMBOL_VALUE_ADDRESS (sym); return 0; } @@ -162,7 +165,8 @@ static int bsd_uthread_activate (struct objfile *objfile) { struct gdbarch *gdbarch = target_gdbarch (); - struct bsd_uthread_ops *ops = gdbarch_data (gdbarch, bsd_uthread_data); + struct bsd_uthread_ops *ops + = (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data); /* Skip if the thread stratum has already been activated. */ if (bsd_uthread_active) @@ -204,7 +208,7 @@ bsd_uthread_activate (struct objfile *objfile) /* Cleanup due to deactivation. */ static void -bsd_uthread_close (void) +bsd_uthread_close (struct target_ops *self) { bsd_uthread_active = 0; bsd_uthread_thread_run_addr = 0; @@ -248,7 +252,7 @@ bsd_uthread_solib_loaded (struct so_list *so) for (names = bsd_uthread_solib_names; *names; names++) { - if (strncmp (so->so_original_name, *names, strlen (*names)) == 0) + if (startswith (so->so_original_name, *names)) { solib_read_symbols (so, 0); @@ -284,10 +288,17 @@ bsd_uthread_fetch_registers (struct target_ops *ops, struct regcache *regcache, int regnum) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - struct bsd_uthread_ops *uthread_ops = gdbarch_data (gdbarch, bsd_uthread_data); - CORE_ADDR addr = ptid_get_tid (inferior_ptid); + struct bsd_uthread_ops *uthread_ops + = (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data); + ptid_t ptid = regcache_get_ptid (regcache); + CORE_ADDR addr = ptid_get_tid (ptid); struct target_ops *beneath = find_target_beneath (ops); CORE_ADDR active_addr; + struct cleanup *cleanup = save_inferior_ptid (); + + /* We are doing operations (e.g. reading memory) that rely on + inferior_ptid. */ + inferior_ptid = ptid; /* Always fetch the appropriate registers from the layer beneath. */ beneath->to_fetch_registers (beneath, regcache, regnum); @@ -304,6 +315,8 @@ bsd_uthread_fetch_registers (struct target_ops *ops, uthread_ops->supply_uthread (regcache, regnum, addr + bsd_uthread_thread_ctx_offset); } + + do_cleanups (cleanup); } static void @@ -311,10 +324,17 @@ bsd_uthread_store_registers (struct target_ops *ops, struct regcache *regcache, int regnum) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - struct bsd_uthread_ops *uthread_ops = gdbarch_data (gdbarch, bsd_uthread_data); + struct bsd_uthread_ops *uthread_ops + = (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data); struct target_ops *beneath = find_target_beneath (ops); - CORE_ADDR addr = ptid_get_tid (inferior_ptid); + ptid_t ptid = regcache_get_ptid (regcache); + CORE_ADDR addr = ptid_get_tid (ptid); CORE_ADDR active_addr; + struct cleanup *cleanup = save_inferior_ptid (); + + /* We are doing operations (e.g. reading memory) that rely on + inferior_ptid. */ + inferior_ptid = ptid; active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr); if (addr != 0 && addr != active_addr) @@ -329,20 +349,8 @@ bsd_uthread_store_registers (struct target_ops *ops, request to the layer beneath. */ beneath->to_store_registers (beneath, regcache, regnum); } -} - -/* FIXME: This function is only there because otherwise GDB tries to - invoke deprecate_xfer_memory. */ -static LONGEST -bsd_uthread_xfer_partial (struct target_ops *ops, enum target_object object, - const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, - ULONGEST offset, LONGEST len) -{ - gdb_assert (ops->beneath->to_xfer_partial); - return ops->beneath->to_xfer_partial (ops->beneath, object, annex, readbuf, - writebuf, offset, len); + do_cleanups (cleanup); } static ptid_t @@ -409,7 +417,7 @@ bsd_uthread_thread_alive (struct target_ops *ops, ptid_t ptid) { enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ()); struct target_ops *beneath = find_target_beneath (ops); - CORE_ADDR addr = ptid_get_tid (inferior_ptid); + CORE_ADDR addr = ptid_get_tid (ptid); if (addr != 0) { @@ -427,12 +435,14 @@ bsd_uthread_thread_alive (struct target_ops *ops, ptid_t ptid) } static void -bsd_uthread_find_new_threads (struct target_ops *ops) +bsd_uthread_update_thread_list (struct target_ops *ops) { pid_t pid = ptid_get_pid (inferior_ptid); int offset = bsd_uthread_thread_next_offset; CORE_ADDR addr; + prune_threads (); + addr = bsd_uthread_read_memory_address (bsd_uthread_thread_list_addr); while (addr != 0) { @@ -454,7 +464,7 @@ bsd_uthread_find_new_threads (struct target_ops *ops) } /* Possible states a thread can be in. */ -static char *bsd_uthread_state[] = +static const char *bsd_uthread_state[] = { "RUNNING", "SIGTHREAD", @@ -481,8 +491,9 @@ static char *bsd_uthread_state[] = /* Return a string describing th state of the thread specified by INFO. */ -static char * -bsd_uthread_extra_thread_info (struct thread_info *info) +static const char * +bsd_uthread_extra_thread_info (struct target_ops *self, + struct thread_info *info) { enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ()); CORE_ADDR addr = ptid_get_tid (info->ptid); @@ -500,7 +511,7 @@ bsd_uthread_extra_thread_info (struct thread_info *info) return NULL; } -static char * +static const char * bsd_uthread_pid_to_str (struct target_ops *ops, ptid_t ptid) { if (ptid_get_tid (ptid) != 0) @@ -518,7 +529,7 @@ bsd_uthread_pid_to_str (struct target_ops *ops, ptid_t ptid) static struct target_ops * bsd_uthread_target (void) { - struct target_ops *t = XZALLOC (struct target_ops); + struct target_ops *t = XCNEW (struct target_ops); t->to_shortname = "bsd-uthreads"; t->to_longname = "BSD user-level threads"; @@ -527,11 +538,10 @@ bsd_uthread_target (void) t->to_mourn_inferior = bsd_uthread_mourn_inferior; t->to_fetch_registers = bsd_uthread_fetch_registers; t->to_store_registers = bsd_uthread_store_registers; - t->to_xfer_partial = bsd_uthread_xfer_partial; t->to_wait = bsd_uthread_wait; t->to_resume = bsd_uthread_resume; t->to_thread_alive = bsd_uthread_thread_alive; - t->to_find_new_threads = bsd_uthread_find_new_threads; + t->to_update_thread_list = bsd_uthread_update_thread_list; t->to_extra_thread_info = bsd_uthread_extra_thread_info; t->to_pid_to_str = bsd_uthread_pid_to_str; t->to_stratum = thread_stratum;