X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Faix-thread.c;h=1a1d769b5653ba6a7f91e15a641eb7152dd18b48;hb=dce2246a6c934bf35157e8970d0da5a11aefb282;hp=c01a7c56907618580d4fcc8b86cedec6b556577e;hpb=1e6b91a4bf6911ea68506a73eb8ff7ab3567f005;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index c01a7c5690..1a1d769b56 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -1,6 +1,6 @@ /* Low level interface for debugging AIX 4.3+ pthreads. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2017 Free Software Foundation, Inc. Written by Nick Duffek . This file is part of GDB. @@ -40,15 +40,14 @@ */ #include "defs.h" -#include "gdb_assert.h" #include "gdbthread.h" #include "target.h" #include "inferior.h" #include "regcache.h" #include "gdbcmd.h" #include "ppc-tdep.h" -#include #include "observer.h" +#include "objfiles.h" #include #include @@ -85,11 +84,20 @@ static int debug_aix_thread; /* Private data attached to each element in GDB's thread list. */ -struct private_thread_info { +struct aix_thread_info : public private_thread_info +{ pthdb_pthread_t pdtid; /* thread's libpthdebug id */ pthdb_tid_t tid; /* kernel thread id */ }; +/* Return the aix_thread_info attached to THREAD. */ + +static aix_thread_info * +get_aix_thread_info (thread_info *thread) +{ + return static_cast (thread->priv.get ()); +} + /* Information about a thread of which libpthdebug is aware. */ struct pd_thread { @@ -156,7 +164,7 @@ static pthdb_session_t pd_session; /* Return a printable representation of pthdebug function return STATUS. */ -static char * +static const char * pd_status2str (int status) { switch (status) @@ -286,7 +294,7 @@ pid_to_prc (ptid_t *ptidp) static int pdc_symbol_addrs (pthdb_user_t user, pthdb_symbol_t *symbols, int count) { - struct minimal_symbol *ms; + struct bound_minimal_symbol ms; int i; char *name; @@ -306,13 +314,14 @@ pdc_symbol_addrs (pthdb_user_t user, pthdb_symbol_t *symbols, int count) symbols[i].addr = 0; else { - if (!(ms = lookup_minimal_symbol (name, NULL, NULL))) + ms = lookup_minimal_symbol (name, NULL, NULL); + if (ms.minsym == NULL) { if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, " returning PDC_FAILURE\n"); return PDC_FAILURE; } - symbols[i].addr = SYMBOL_VALUE_ADDRESS (ms); + symbols[i].addr = BMSYMBOL_VALUE_ADDRESS (ms); } if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, " symbols[%d].addr = %s\n", @@ -462,7 +471,7 @@ pdc_read_data (pthdb_user_t user, void *buf, "pdc_read_data (user = %ld, buf = 0x%lx, addr = %s, len = %ld)\n", user, (long) buf, hex_string (addr), len); - status = target_read_memory (addr, buf, len); + status = target_read_memory (addr, (gdb_byte *) buf, len); ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE; if (debug_aix_thread) @@ -484,7 +493,7 @@ pdc_write_data (pthdb_user_t user, void *buf, "pdc_write_data (user = %ld, buf = 0x%lx, addr = %s, len = %ld)\n", user, (long) buf, hex_string (addr), len); - status = target_write_memory (addr, buf, len); + status = target_write_memory (addr, (gdb_byte *) buf, len); ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE; if (debug_aix_thread) @@ -703,7 +712,7 @@ sync_threadlists (void) pcount = 0; psize = 1; - pbuf = (struct pd_thread *) xmalloc (psize * sizeof *pbuf); + pbuf = XNEWVEC (struct pd_thread, psize); for (cmd = PTHDB_LIST_FIRST;; cmd = PTHDB_LIST_NEXT) { @@ -740,7 +749,7 @@ sync_threadlists (void) gcount = 0; iterate_over_threads (giter_count, &gcount); - g = gbuf = (struct thread_info **) xmalloc (gcount * sizeof *gbuf); + g = gbuf = XNEWVEC (struct thread_info *, gcount); iterate_over_threads (giter_accum, &g); qsort (gbuf, gcount, sizeof *gbuf, gcmp); @@ -756,10 +765,12 @@ sync_threadlists (void) } else if (gi == gcount) { - thread = add_thread (ptid_build (infpid, 0, pbuf[pi].pthid)); - thread->private = xmalloc (sizeof (struct private_thread_info)); - thread->private->pdtid = pbuf[pi].pdtid; - thread->private->tid = pbuf[pi].tid; + aix_thread_info *priv = new aix_thread_info; + priv->pdtid = pbuf[pi].pdtid; + priv->tid = pbuf[pi].tid; + + thread = add_thread_with_info (ptid_t (infpid, 0, pbuf[pi].pthid), priv); + pi++; } else @@ -776,8 +787,10 @@ sync_threadlists (void) if (cmp_result == 0) { - gbuf[gi]->private->pdtid = pdtid; - gbuf[gi]->private->tid = tid; + aix_thread_info *priv = get_aix_thread_info (gbuf[gi]); + + priv->pdtid = pdtid; + priv->tid = tid; pi++; gi++; } @@ -789,9 +802,11 @@ sync_threadlists (void) else { thread = add_thread (pptid); - thread->private = xmalloc (sizeof (struct private_thread_info)); - thread->private->pdtid = pdtid; - thread->private->tid = tid; + + aix_thread_info *priv = new aix_thread_info; + thread->priv.reset (priv); + priv->pdtid = pdtid; + priv->tid = tid; pi++; } } @@ -808,8 +823,9 @@ static int iter_tid (struct thread_info *thread, void *tidp) { const pthdb_tid_t tid = *(pthdb_tid_t *)tidp; + aix_thread_info *priv = get_aix_thread_info (thread); - return (thread->private->tid == tid); + return priv->tid == tid; } /* Synchronize libpthdebug's state with the inferior and with GDB, @@ -890,7 +906,7 @@ pd_enable (void) { int status; char *stub_name; - struct minimal_symbol *ms; + struct bound_minimal_symbol ms; /* Don't initialize twice. */ if (pd_able) @@ -908,9 +924,10 @@ pd_enable (void) return; /* Set a breakpoint on the returned stub function. */ - if (!(ms = lookup_minimal_symbol (stub_name, NULL, NULL))) + ms = lookup_minimal_symbol (stub_name, NULL, NULL); + if (ms.minsym == NULL) return; - pd_brk_addr = SYMBOL_VALUE_ADDRESS (ms); + pd_brk_addr = BMSYMBOL_VALUE_ADDRESS (ms); if (!create_thread_event_breakpoint (target_gdbarch (), pd_brk_addr)) return; @@ -956,12 +973,9 @@ new_objfile (struct objfile *objfile) /* Attach to process specified by ARGS. */ static void -aix_thread_attach (struct target_ops *ops, char *args, int from_tty) +aix_thread_inferior_created (struct target_ops *ops, int from_tty) { - struct target_ops *beneath = find_target_beneath (ops); - - beneath->to_attach (beneath, args, from_tty); - pd_activate (1); + pd_enable (); } /* Detach from the process attached to by aix_thread_attach(). */ @@ -987,12 +1001,11 @@ aix_thread_resume (struct target_ops *ops, if (!PD_TID (ptid)) { - struct cleanup *cleanup = save_inferior_ptid (); + scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); struct target_ops *beneath = find_target_beneath (ops); inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); beneath->to_resume (beneath, ptid, step, sig); - do_cleanups (cleanup); } else { @@ -1001,7 +1014,9 @@ aix_thread_resume (struct target_ops *ops, error (_("aix-thread resume: unknown pthread %ld"), ptid_get_lwp (ptid)); - tid[0] = thread->private->tid; + aix_thread_info *priv = get_aix_thread_info (thread); + + tid[0] = priv->tid; if (tid[0] == PTHDB_INVALID_TID) error (_("aix-thread resume: no tid for pthread %ld"), ptid_get_lwp (ptid)); @@ -1009,10 +1024,10 @@ aix_thread_resume (struct target_ops *ops, if (arch64) ptrace64aix (PTT_CONTINUE, tid[0], (long long) 1, - gdb_signal_to_host (sig), (void *) tid); + gdb_signal_to_host (sig), (PTRACE_TYPE_ARG5) tid); else ptrace32 (PTT_CONTINUE, tid[0], (addr_ptr) 1, - gdb_signal_to_host (sig), (void *) tid); + gdb_signal_to_host (sig), (PTRACE_TYPE_ARG5) tid); } } @@ -1024,14 +1039,16 @@ static ptid_t aix_thread_wait (struct target_ops *ops, ptid_t ptid, struct target_waitstatus *status, int options) { - struct cleanup *cleanup = save_inferior_ptid (); struct target_ops *beneath = find_target_beneath (ops); - pid_to_prc (&ptid); + { + scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); + + pid_to_prc (&ptid); - inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); - ptid = beneath->to_wait (beneath, ptid, status, options); - do_cleanups (cleanup); + inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); + ptid = beneath->to_wait (beneath, ptid, status, options); + } if (ptid_get_pid (ptid) == -1) return pid_to_ptid (-1); @@ -1041,10 +1058,10 @@ aix_thread_wait (struct target_ops *ops, && status->value.sig == GDB_SIGNAL_TRAP) { struct regcache *regcache = get_thread_regcache (ptid); - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); if (regcache_read_pc (regcache) - - target_decr_pc_after_break (gdbarch) == pd_brk_addr) + - gdbarch_decr_pc_after_break (gdbarch) == pd_brk_addr) return pd_activate (0); } @@ -1056,7 +1073,7 @@ aix_thread_wait (struct target_ops *ops, static void supply_gprs64 (struct regcache *regcache, uint64_t *vals) { - struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache)); + struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ()); int regno; for (regno = 0; regno < ppc_num_gprs; regno++) @@ -1077,7 +1094,7 @@ supply_reg32 (struct regcache *regcache, int regno, uint32_t val) static void supply_fprs (struct regcache *regcache, double *vals) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int regno; @@ -1118,7 +1135,7 @@ supply_sprs64 (struct regcache *regcache, uint64_t lr, uint64_t ctr, uint32_t xer, uint32_t fpscr) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch), @@ -1142,7 +1159,7 @@ supply_sprs32 (struct regcache *regcache, uint32_t lr, uint32_t ctr, uint32_t xer, uint32_t fpscr) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch), @@ -1167,7 +1184,7 @@ supply_sprs32 (struct regcache *regcache, static void fetch_regs_user_thread (struct regcache *regcache, pthdb_pthread_t pdtid) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int status, i; pthdb_context_t ctx; @@ -1222,7 +1239,7 @@ static void fetch_regs_kernel_thread (struct regcache *regcache, int regno, pthdb_tid_t tid) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); uint64_t gprs64[ppc_num_gprs]; uint32_t gprs32[ppc_num_gprs]; @@ -1299,8 +1316,8 @@ fetch_regs_kernel_thread (struct regcache *regcache, int regno, } } -/* Fetch register REGNO if != -1 or all registers otherwise in the - thread/process specified by inferior_ptid. */ +/* Fetch register REGNO if != -1 or all registers otherwise from the + thread/process connected to REGCACHE. */ static void aix_thread_fetch_registers (struct target_ops *ops, @@ -1310,15 +1327,16 @@ aix_thread_fetch_registers (struct target_ops *ops, pthdb_tid_t tid; struct target_ops *beneath = find_target_beneath (ops); - if (!PD_TID (inferior_ptid)) + if (!PD_TID (regcache_get_ptid (regcache))) beneath->to_fetch_registers (beneath, regcache, regno); else { - thread = find_thread_ptid (inferior_ptid); - tid = thread->private->tid; + thread = find_thread_ptid (regcache_get_ptid (regcache)); + aix_thread_info *priv = get_aix_thread_info (thread); + tid = priv->tid; if (tid == PTHDB_INVALID_TID) - fetch_regs_user_thread (regcache, thread->private->pdtid); + fetch_regs_user_thread (regcache, priv->pdtid); else fetch_regs_kernel_thread (regcache, regno, tid); } @@ -1329,7 +1347,7 @@ aix_thread_fetch_registers (struct target_ops *ops, static void fill_gprs64 (const struct regcache *regcache, uint64_t *vals) { - struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache)); + struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ()); int regno; for (regno = 0; regno < ppc_num_gprs; regno++) @@ -1342,7 +1360,7 @@ fill_gprs64 (const struct regcache *regcache, uint64_t *vals) static void fill_gprs32 (const struct regcache *regcache, uint32_t *vals) { - struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache)); + struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ()); int regno; for (regno = 0; regno < ppc_num_gprs; regno++) @@ -1356,7 +1374,7 @@ fill_gprs32 (const struct regcache *regcache, uint32_t *vals) static void fill_fprs (const struct regcache *regcache, double *vals) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int regno; @@ -1381,7 +1399,7 @@ fill_sprs64 (const struct regcache *regcache, uint64_t *lr, uint64_t *ctr, uint32_t *xer, uint32_t *fpscr) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* Verify that the size of the size of the IAR buffer is the @@ -1417,7 +1435,7 @@ fill_sprs32 (const struct regcache *regcache, uint32_t *lr, uint32_t *ctr, uint32_t *xer, uint32_t *fpscr) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* Verify that the size of the size of the IAR buffer is the @@ -1455,7 +1473,7 @@ fill_sprs32 (const struct regcache *regcache, static void store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int status, i; pthdb_context_t ctx; @@ -1552,7 +1570,7 @@ static void store_regs_kernel_thread (const struct regcache *regcache, int regno, pthdb_tid_t tid) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); uint64_t gprs64[ppc_num_gprs]; uint32_t gprs32[ppc_num_gprs]; @@ -1654,7 +1672,7 @@ store_regs_kernel_thread (const struct regcache *regcache, int regno, } /* Store gdb's current view of the register set into the - thread/process specified by inferior_ptid. */ + thread/process connected to REGCACHE. */ static void aix_thread_store_registers (struct target_ops *ops, @@ -1664,15 +1682,16 @@ aix_thread_store_registers (struct target_ops *ops, pthdb_tid_t tid; struct target_ops *beneath = find_target_beneath (ops); - if (!PD_TID (inferior_ptid)) + if (!PD_TID (regcache_get_ptid (regcache))) beneath->to_store_registers (beneath, regcache, regno); else { - thread = find_thread_ptid (inferior_ptid); - tid = thread->private->tid; + thread = find_thread_ptid (regcache_get_ptid (regcache)); + aix_thread_info *priv = get_aix_thread_info (thread); + tid = priv->tid; if (tid == PTHDB_INVALID_TID) - store_regs_user_thread (regcache, thread->private->pdtid); + store_regs_user_thread (regcache, priv->pdtid); else store_regs_kernel_thread (regcache, regno, tid); } @@ -1686,16 +1705,12 @@ aix_thread_xfer_partial (struct target_ops *ops, enum target_object object, const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { - struct cleanup *old_chain = save_inferior_ptid (); - enum target_xfer_status xfer; + scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); struct target_ops *beneath = find_target_beneath (ops); inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); - xfer = beneath->to_xfer_partial (beneath, object, annex, readbuf, + return beneath->to_xfer_partial (beneath, object, annex, readbuf, writebuf, offset, len, xfered_len); - - do_cleanups (old_chain); - return xfer; } /* Clean up after the inferior exits. */ @@ -1727,7 +1742,7 @@ aix_thread_thread_alive (struct target_ops *ops, ptid_t ptid) /* Return a printable representation of composite PID for use in "info threads" output. */ -static char * +static const char * aix_thread_pid_to_str (struct target_ops *ops, ptid_t ptid) { static char *ret = NULL; @@ -1747,11 +1762,10 @@ aix_thread_pid_to_str (struct target_ops *ops, ptid_t ptid) /* Return a printable representation of extra information about THREAD, for use in "info threads" output. */ -static char * +static const char * aix_thread_extra_thread_info (struct target_ops *self, struct thread_info *thread) { - struct ui_file *buf; int status; pthdb_pthread_t pdtid; pthdb_tid_t tid; @@ -1764,43 +1778,43 @@ aix_thread_extra_thread_info (struct target_ops *self, if (!PD_TID (thread->ptid)) return NULL; - buf = mem_fileopen (); + string_file buf; + aix_thread_info *priv = get_aix_thread_info (thread); - pdtid = thread->private->pdtid; - tid = thread->private->tid; + pdtid = priv->pdtid; + tid = priv->tid; if (tid != PTHDB_INVALID_TID) /* i18n: Like "thread-identifier %d, [state] running, suspended" */ - fprintf_unfiltered (buf, _("tid %d"), (int)tid); + buf.printf (_("tid %d"), (int)tid); status = pthdb_pthread_state (pd_session, pdtid, &state); if (status != PTHDB_SUCCESS) state = PST_NOTSUP; - fprintf_unfiltered (buf, ", %s", state2str (state)); + buf.printf (", %s", state2str (state)); status = pthdb_pthread_suspendstate (pd_session, pdtid, &suspendstate); if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED) /* i18n: Like "Thread-Id %d, [state] running, suspended" */ - fprintf_unfiltered (buf, _(", suspended")); + buf.printf (_(", suspended")); status = pthdb_pthread_detachstate (pd_session, pdtid, &detachstate); if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED) /* i18n: Like "Thread-Id %d, [state] running, detached" */ - fprintf_unfiltered (buf, _(", detached")); + buf.printf (_(", detached")); pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend); if (status == PTHDB_SUCCESS && cancelpend) /* i18n: Like "Thread-Id %d, [state] running, cancel pending" */ - fprintf_unfiltered (buf, _(", cancel pending")); + buf.printf (_(", cancel pending")); - ui_file_write (buf, "", 1); + buf.write ("", 1); xfree (ret); /* Free old buffer. */ - ret = ui_file_xstrdup (buf, NULL); - ui_file_delete (buf); + ret = xstrdup (buf.c_str ()); return ret; } @@ -1820,15 +1834,12 @@ init_aix_thread_ops (void) aix_thread_ops.to_longname = _("AIX pthread support"); aix_thread_ops.to_doc = _("AIX pthread support"); - aix_thread_ops.to_attach = aix_thread_attach; aix_thread_ops.to_detach = aix_thread_detach; aix_thread_ops.to_resume = aix_thread_resume; aix_thread_ops.to_wait = aix_thread_wait; aix_thread_ops.to_fetch_registers = aix_thread_fetch_registers; aix_thread_ops.to_store_registers = aix_thread_store_registers; aix_thread_ops.to_xfer_partial = aix_thread_xfer_partial; - /* No need for aix_thread_ops.to_create_inferior, because we activate thread - debugging when the inferior reaches pd_brk_addr. */ aix_thread_ops.to_mourn_inferior = aix_thread_mourn_inferior; aix_thread_ops.to_thread_alive = aix_thread_thread_alive; aix_thread_ops.to_pid_to_str = aix_thread_pid_to_str; @@ -1841,8 +1852,6 @@ init_aix_thread_ops (void) /* Module startup initialization function, automagically called by init.c. */ -void _initialize_aix_thread (void); - void _initialize_aix_thread (void) { @@ -1852,6 +1861,10 @@ _initialize_aix_thread (void) /* Notice when object files get loaded and unloaded. */ observer_attach_new_objfile (new_objfile); + /* Add ourselves to inferior_created event chain. + This is needed to enable the thread target on "attach". */ + observer_attach_inferior_created (aix_thread_inferior_created); + add_setshow_boolean_cmd ("aix-thread", class_maintenance, &debug_aix_thread, _("Set debugging of AIX thread module."), _("Show debugging of AIX thread module."),