X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Faix-thread.c;h=efecf417dbb33d5bd2596c43bcdda351454e949a;hb=7697afb662b2ffd67d044209d6d807a8e21dfed9;hp=d328bdd872ae0ba9af10eab3c0ada90fd68badc0;hpb=d9f719f1adb653ab40a55e4c1b8c300215b400ff;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index d328bdd872..efecf417db 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-2018 Free Software Foundation, Inc. + Copyright (C) 1999-2020 Free Software Foundation, Inc. Written by Nick Duffek . This file is part of GDB. @@ -61,7 +61,7 @@ extern int getthrds (pid_t, struct thrdsinfo64 *, int, tid_t *, int); #endif /* Whether to emit debugging output. */ -static int debug_aix_thread; +static bool debug_aix_thread; /* In AIX 5.1, functions use pthdb_tid_t instead of tid_t. */ #ifndef PTHDB_VERSION_3 @@ -70,7 +70,7 @@ static int debug_aix_thread; /* Return whether to treat PID as a debuggable thread id. */ -#define PD_TID(ptid) (pd_active && ptid_get_tid (ptid) != 0) +#define PD_TID(ptid) (pd_active && ptid.tid () != 0) /* pthdb_user_t value that we pass to pthdb functions. 0 causes PTHDB_BAD_USER errors, so use 1. */ @@ -117,12 +117,11 @@ static const target_info aix_thread_target_info = { class aix_thread_target final : public target_ops { public: - aix_thread_target () - { to_stratum = thread_stratum; } - const target_info &info () const override { return aix_thread_target_info; } + strata stratum () const override { return thread_stratum; } + void detach (inferior *, int) override; void resume (ptid_t, int, enum gdb_signal) override; ptid_t wait (ptid_t, struct target_waitstatus *, int) override; @@ -141,7 +140,7 @@ public: bool thread_alive (ptid_t ptid) override; - const char *pid_to_str (ptid_t) override; + std::string pid_to_str (ptid_t) override; const char *extra_thread_info (struct thread_info *) override; @@ -325,7 +324,7 @@ pid_to_prc (ptid_t *ptidp) ptid = *ptidp; if (PD_TID (ptid)) - *ptidp = pid_to_ptid (ptid_get_pid (ptid)); + *ptidp = ptid_t (ptid.pid ()); } /* pthdb callback: for from 0 to COUNT, set SYMBOLS[].addr to @@ -671,19 +670,17 @@ giter_accum (struct thread_info *thread, void *bufp) static int ptid_cmp (ptid_t ptid1, ptid_t ptid2) { - int pid1, pid2; - - if (ptid_get_pid (ptid1) < ptid_get_pid (ptid2)) + if (ptid1.pid () < ptid2.pid ()) return -1; - else if (ptid_get_pid (ptid1) > ptid_get_pid (ptid2)) + else if (ptid1.pid () > ptid2.pid ()) return 1; - else if (ptid_get_tid (ptid1) < ptid_get_tid (ptid2)) + else if (ptid1.tid () < ptid2.tid ()) return -1; - else if (ptid_get_tid (ptid1) > ptid_get_tid (ptid2)) + else if (ptid1.tid () > ptid2.tid ()) return 1; - else if (ptid_get_lwp (ptid1) < ptid_get_lwp (ptid2)) + else if (ptid1.lwp () < ptid2.lwp ()) return -1; - else if (ptid_get_lwp (ptid1) > ptid_get_lwp (ptid2)) + else if (ptid1.lwp () > ptid2.lwp ()) return 1; else return 0; @@ -708,11 +705,10 @@ get_signaled_thread (void) { struct thrdsinfo64 thrinf; tid_t ktid = 0; - int result = 0; while (1) { - if (getthrds (ptid_get_pid (inferior_ptid), &thrinf, + if (getthrds (inferior_ptid.pid (), &thrinf, sizeof (thrinf), &ktid, 1) != 1) break; @@ -795,12 +791,12 @@ sync_threadlists (void) /* Apply differences between the two arrays to GDB's thread list. */ - infpid = ptid_get_pid (inferior_ptid); + infpid = inferior_ptid.pid (); for (pi = gi = 0; pi < pcount || gi < gcount;) { if (pi == pcount) { - delete_thread (gbuf[gi]->ptid); + delete_thread (gbuf[gi]); gi++; } else if (gi == gcount) @@ -818,7 +814,7 @@ sync_threadlists (void) ptid_t pptid, gptid; int cmp_result; - pptid = ptid_build (infpid, 0, pbuf[pi].pthid); + pptid = ptid_t (infpid, 0, pbuf[pi].pthid); gptid = gbuf[gi]->ptid; pdtid = pbuf[pi].pdtid; tid = pbuf[pi].tid; @@ -836,7 +832,7 @@ sync_threadlists (void) } else if (cmp_result > 0) { - delete_thread (gptid); + delete_thread (gbuf[gi]); gi++; } else @@ -1023,7 +1019,7 @@ aix_thread_inferior_created (struct target_ops *ops, int from_tty) void aix_thread_target::detach (inferior *inf, int from_tty) { - struct target_ops *beneath = find_target_beneath (this); + target_ops *beneath = this->beneath (); pd_disable (); beneath->detach (inf, from_tty); @@ -1041,24 +1037,23 @@ aix_thread_target::resume (ptid_t ptid, int step, enum gdb_signal sig) if (!PD_TID (ptid)) { scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - struct target_ops *beneath = find_target_beneath (this); - inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); - beneath->resume (ptid, step, sig); + inferior_ptid = ptid_t (inferior_ptid.pid ()); + beneath ()->resume (ptid, step, sig); } else { thread = find_thread_ptid (ptid); if (!thread) error (_("aix-thread resume: unknown pthread %ld"), - ptid_get_lwp (ptid)); + ptid.lwp ()); 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)); + ptid.lwp ()); tid[1] = 0; if (arch64) @@ -1078,19 +1073,17 @@ ptid_t aix_thread_target::wait (ptid_t ptid, struct target_waitstatus *status, int options) { - struct target_ops *beneath = find_target_beneath (this); - { 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->wait (ptid, status, options); + inferior_ptid = ptid_t (inferior_ptid.pid ()); + ptid = beneath ()->wait (ptid, status, options); } - if (ptid_get_pid (ptid) == -1) - return pid_to_ptid (-1); + if (ptid.pid () == -1) + return ptid_t (-1); /* Check whether libpthdebug might be ready to be initialized. */ if (!pd_active && status->kind == TARGET_WAITKIND_STOPPED @@ -1116,8 +1109,8 @@ supply_gprs64 (struct regcache *regcache, uint64_t *vals) int regno; for (regno = 0; regno < ppc_num_gprs; regno++) - regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + regno, - (char *) (vals + regno)); + regcache->raw_supply (tdep->ppc_gp0_regnum + regno, + (char *) (vals + regno)); } /* Record that 32-bit register REGNO contains VAL. */ @@ -1125,7 +1118,7 @@ supply_gprs64 (struct regcache *regcache, uint64_t *vals) static void supply_reg32 (struct regcache *regcache, int regno, uint32_t val) { - regcache_raw_supply (regcache, regno, (char *) &val); + regcache->raw_supply (regno, (char *) &val); } /* Record that the floating-point registers contain VALS. */ @@ -1144,8 +1137,8 @@ supply_fprs (struct regcache *regcache, double *vals) for (regno = tdep->ppc_fp0_regnum; regno < tdep->ppc_fp0_regnum + ppc_num_fprs; regno++) - regcache_raw_supply (regcache, regno, - (char *) (vals + regno - tdep->ppc_fp0_regnum)); + regcache->raw_supply (regno, + (char *) (vals + regno - tdep->ppc_fp0_regnum)); } /* Predicate to test whether given register number is a "special" register. */ @@ -1177,16 +1170,14 @@ supply_sprs64 (struct regcache *regcache, struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch), - (char *) &iar); - regcache_raw_supply (regcache, tdep->ppc_ps_regnum, (char *) &msr); - regcache_raw_supply (regcache, tdep->ppc_cr_regnum, (char *) &cr); - regcache_raw_supply (regcache, tdep->ppc_lr_regnum, (char *) &lr); - regcache_raw_supply (regcache, tdep->ppc_ctr_regnum, (char *) &ctr); - regcache_raw_supply (regcache, tdep->ppc_xer_regnum, (char *) &xer); + regcache->raw_supply (gdbarch_pc_regnum (gdbarch), (char *) &iar); + regcache->raw_supply (tdep->ppc_ps_regnum, (char *) &msr); + regcache->raw_supply (tdep->ppc_cr_regnum, (char *) &cr); + regcache->raw_supply (tdep->ppc_lr_regnum, (char *) &lr); + regcache->raw_supply (tdep->ppc_ctr_regnum, (char *) &ctr); + regcache->raw_supply (tdep->ppc_xer_regnum, (char *) &xer); if (tdep->ppc_fpscr_regnum >= 0) - regcache_raw_supply (regcache, tdep->ppc_fpscr_regnum, - (char *) &fpscr); + regcache->raw_supply (tdep->ppc_fpscr_regnum, (char *) &fpscr); } /* Record that the special registers contain the specified 32-bit @@ -1201,16 +1192,14 @@ supply_sprs32 (struct regcache *regcache, struct gdbarch *gdbarch = regcache->arch (); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch), - (char *) &iar); - regcache_raw_supply (regcache, tdep->ppc_ps_regnum, (char *) &msr); - regcache_raw_supply (regcache, tdep->ppc_cr_regnum, (char *) &cr); - regcache_raw_supply (regcache, tdep->ppc_lr_regnum, (char *) &lr); - regcache_raw_supply (regcache, tdep->ppc_ctr_regnum, (char *) &ctr); - regcache_raw_supply (regcache, tdep->ppc_xer_regnum, (char *) &xer); + regcache->raw_supply (gdbarch_pc_regnum (gdbarch), (char *) &iar); + regcache->raw_supply (tdep->ppc_ps_regnum, (char *) &msr); + regcache->raw_supply (tdep->ppc_cr_regnum, (char *) &cr); + regcache->raw_supply (tdep->ppc_lr_regnum, (char *) &lr); + regcache->raw_supply (tdep->ppc_ctr_regnum, (char *) &ctr); + regcache->raw_supply (tdep->ppc_xer_regnum, (char *) &xer); if (tdep->ppc_fpscr_regnum >= 0) - regcache_raw_supply (regcache, tdep->ppc_fpscr_regnum, - (char *) &fpscr); + regcache->raw_supply (tdep->ppc_fpscr_regnum, (char *) &fpscr); } /* Fetch all registers from pthread PDTID, which doesn't have a kernel @@ -1340,8 +1329,6 @@ fetch_regs_kernel_thread (struct regcache *regcache, int regno, } else { - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - if (!ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL)) memset (&sprs32, 0, sizeof (sprs32)); supply_sprs32 (regcache, sprs32.pt_iar, sprs32.pt_msr, sprs32.pt_cr, @@ -1349,8 +1336,7 @@ fetch_regs_kernel_thread (struct regcache *regcache, int regno, sprs32.pt_fpscr); if (tdep->ppc_mq_regnum >= 0) - regcache_raw_supply (regcache, tdep->ppc_mq_regnum, - (char *) &sprs32.pt_mq); + regcache->raw_supply (tdep->ppc_mq_regnum, (char *) &sprs32.pt_mq); } } } @@ -1363,13 +1349,12 @@ aix_thread_target::fetch_registers (struct regcache *regcache, int regno) { struct thread_info *thread; pthdb_tid_t tid; - struct target_ops *beneath = find_target_beneath (this); - if (!PD_TID (regcache_get_ptid (regcache))) - beneath->fetch_registers (regcache, regno); + if (!PD_TID (regcache->ptid ())) + beneath ()->fetch_registers (regcache, regno); else { - thread = find_thread_ptid (regcache_get_ptid (regcache)); + thread = find_thread_ptid (regcache->ptid ()); aix_thread_info *priv = get_aix_thread_info (thread); tid = priv->tid; @@ -1389,10 +1374,9 @@ fill_gprs64 (const struct regcache *regcache, uint64_t *vals) int regno; for (regno = 0; regno < ppc_num_gprs; regno++) - if (REG_VALID == regcache_register_status (regcache, - tdep->ppc_gp0_regnum + regno)) - regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + regno, - vals + regno); + if (REG_VALID == regcache->get_register_status + (tdep->ppc_gp0_regnum + regno)) + regcache->raw_collect (tdep->ppc_gp0_regnum + regno, vals + regno); } static void @@ -1402,10 +1386,9 @@ fill_gprs32 (const struct regcache *regcache, uint32_t *vals) int regno; for (regno = 0; regno < ppc_num_gprs; regno++) - if (REG_VALID == regcache_register_status (regcache, - tdep->ppc_gp0_regnum + regno)) - regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + regno, - vals + regno); + if (REG_VALID == regcache->get_register_status + (tdep->ppc_gp0_regnum + regno)) + regcache->raw_collect (tdep->ppc_gp0_regnum + regno, vals + regno); } /* Store the floating point registers into a double array. */ @@ -1423,9 +1406,8 @@ fill_fprs (const struct regcache *regcache, double *vals) for (regno = tdep->ppc_fp0_regnum; regno < tdep->ppc_fp0_regnum + ppc_num_fprs; regno++) - if (REG_VALID == regcache_register_status (regcache, regno)) - regcache_raw_collect (regcache, regno, - vals + regno - tdep->ppc_fp0_regnum); + if (REG_VALID == regcache->get_register_status (regno)) + regcache->raw_collect (regno, vals + regno - tdep->ppc_fp0_regnum); } /* Store the special registers into the specified 64-bit and 32-bit @@ -1448,23 +1430,21 @@ fill_sprs64 (const struct regcache *regcache, gdb_assert (sizeof (*iar) == register_size (gdbarch, gdbarch_pc_regnum (gdbarch))); - if (REG_VALID == regcache_register_status (regcache, - gdbarch_pc_regnum (gdbarch))) - regcache_raw_collect (regcache, gdbarch_pc_regnum (gdbarch), iar); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ps_regnum)) - regcache_raw_collect (regcache, tdep->ppc_ps_regnum, msr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_cr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_cr_regnum, cr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_lr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_lr_regnum, lr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ctr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_ctr_regnum, ctr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_xer_regnum)) - regcache_raw_collect (regcache, tdep->ppc_xer_regnum, xer); + if (REG_VALID == regcache->get_register_status (gdbarch_pc_regnum (gdbarch))) + regcache->raw_collect (gdbarch_pc_regnum (gdbarch), iar); + if (REG_VALID == regcache->get_register_status (tdep->ppc_ps_regnum)) + regcache->raw_collect (tdep->ppc_ps_regnum, msr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_cr_regnum)) + regcache->raw_collect (tdep->ppc_cr_regnum, cr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_lr_regnum)) + regcache->raw_collect (tdep->ppc_lr_regnum, lr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_ctr_regnum)) + regcache->raw_collect (tdep->ppc_ctr_regnum, ctr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_xer_regnum)) + regcache->raw_collect (tdep->ppc_xer_regnum, xer); if (tdep->ppc_fpscr_regnum >= 0 - && REG_VALID == regcache_register_status (regcache, - tdep->ppc_fpscr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr); + && REG_VALID == regcache->get_register_status (tdep->ppc_fpscr_regnum)) + regcache->raw_collect (tdep->ppc_fpscr_regnum, fpscr); } static void @@ -1484,22 +1464,21 @@ fill_sprs32 (const struct regcache *regcache, gdb_assert (sizeof (*iar) == register_size (gdbarch, gdbarch_pc_regnum (gdbarch))); - if (REG_VALID == regcache_register_status (regcache, - gdbarch_pc_regnum (gdbarch))) - regcache_raw_collect (regcache, gdbarch_pc_regnum (gdbarch), iar); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ps_regnum)) - regcache_raw_collect (regcache, tdep->ppc_ps_regnum, msr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_cr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_cr_regnum, cr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_lr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_lr_regnum, lr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ctr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_ctr_regnum, ctr); - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_xer_regnum)) - regcache_raw_collect (regcache, tdep->ppc_xer_regnum, xer); + if (REG_VALID == regcache->get_register_status (gdbarch_pc_regnum (gdbarch))) + regcache->raw_collect (gdbarch_pc_regnum (gdbarch), iar); + if (REG_VALID == regcache->get_register_status (tdep->ppc_ps_regnum)) + regcache->raw_collect (tdep->ppc_ps_regnum, msr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_cr_regnum)) + regcache->raw_collect (tdep->ppc_cr_regnum, cr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_lr_regnum)) + regcache->raw_collect (tdep->ppc_lr_regnum, lr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_ctr_regnum)) + regcache->raw_collect (tdep->ppc_ctr_regnum, ctr); + if (REG_VALID == regcache->get_register_status (tdep->ppc_xer_regnum)) + regcache->raw_collect (tdep->ppc_xer_regnum, xer); if (tdep->ppc_fpscr_regnum >= 0 - && REG_VALID == regcache_register_status (regcache, tdep->ppc_fpscr_regnum)) - regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr); + && REG_VALID == regcache->get_register_status (tdep->ppc_fpscr_regnum)) + regcache->raw_collect (tdep->ppc_fpscr_regnum, fpscr); } /* Store all registers into pthread PDTID, which doesn't have a kernel @@ -1517,7 +1496,6 @@ store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid) pthdb_context_t ctx; uint32_t int32; uint64_t int64; - double dbl; if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, @@ -1533,19 +1511,16 @@ store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid) /* Collect general-purpose register values from the regcache. */ for (i = 0; i < ppc_num_gprs; i++) - if (REG_VALID == regcache_register_status (regcache, - tdep->ppc_gp0_regnum + i)) + if (REG_VALID == regcache->get_register_status (tdep->ppc_gp0_regnum + i)) { if (arch64) { - regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + i, - (void *) &int64); + regcache->raw_collect (tdep->ppc_gp0_regnum + i, (void *) &int64); ctx.gpr[i] = int64; } else { - regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + i, - (void *) &int32); + regcache->raw_collect (tdep->ppc_gp0_regnum + i, (void *) &int32); ctx.gpr[i] = int32; } } @@ -1569,23 +1544,20 @@ store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid) fill_sprs32 (regcache, &tmp_iar, &tmp_msr, &tmp_cr, &tmp_lr, &tmp_ctr, &tmp_xer, &tmp_fpscr); - if (REG_VALID == regcache_register_status (regcache, - gdbarch_pc_regnum (gdbarch))) + if (REG_VALID == regcache->get_register_status + (gdbarch_pc_regnum (gdbarch))) ctx.iar = tmp_iar; - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ps_regnum)) + if (REG_VALID == regcache->get_register_status (tdep->ppc_ps_regnum)) ctx.msr = tmp_msr; - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_cr_regnum)) + if (REG_VALID == regcache->get_register_status (tdep->ppc_cr_regnum)) ctx.cr = tmp_cr; - if (REG_VALID == regcache_register_status (regcache, tdep->ppc_lr_regnum)) + if (REG_VALID == regcache->get_register_status (tdep->ppc_lr_regnum)) ctx.lr = tmp_lr; - if (REG_VALID == regcache_register_status (regcache, - tdep->ppc_ctr_regnum)) + if (REG_VALID == regcache->get_register_status (tdep->ppc_ctr_regnum)) ctx.ctr = tmp_ctr; - if (REG_VALID == regcache_register_status (regcache, - tdep->ppc_xer_regnum)) + if (REG_VALID == regcache->get_register_status (tdep->ppc_xer_regnum)) ctx.xer = tmp_xer; - if (REG_VALID == regcache_register_status (regcache, - tdep->ppc_xer_regnum)) + if (REG_VALID == regcache->get_register_status (tdep->ppc_xer_regnum)) ctx.fpscr = tmp_fpscr; } @@ -1615,7 +1587,6 @@ store_regs_kernel_thread (const struct regcache *regcache, int regno, double fprs[ppc_num_fprs]; struct ptxsprs sprs64; struct ptsprs sprs32; - int i; if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, @@ -1699,10 +1670,9 @@ store_regs_kernel_thread (const struct regcache *regcache, int regno, sprs32.pt_fpscr = tmp_fpscr; if (tdep->ppc_mq_regnum >= 0) - if (REG_VALID == regcache_register_status (regcache, - tdep->ppc_mq_regnum)) - regcache_raw_collect (regcache, tdep->ppc_mq_regnum, - &sprs32.pt_mq); + if (REG_VALID == regcache->get_register_status + (tdep->ppc_mq_regnum)) + regcache->raw_collect (tdep->ppc_mq_regnum, &sprs32.pt_mq); ptrace32 (PTT_WRITE_SPRS, tid, (uintptr_t) &sprs32, 0, NULL); } @@ -1717,13 +1687,12 @@ aix_thread_target::store_registers (struct regcache *regcache, int regno) { struct thread_info *thread; pthdb_tid_t tid; - struct target_ops *beneath = find_target_beneath (this); - if (!PD_TID (regcache_get_ptid (regcache))) - beneath->store_registers (regcache, regno); + if (!PD_TID (regcache->ptid ())) + beneath ()->store_registers (regcache, regno); else { - thread = find_thread_ptid (regcache_get_ptid (regcache)); + thread = find_thread_ptid (regcache->ptid ()); aix_thread_info *priv = get_aix_thread_info (thread); tid = priv->tid; @@ -1744,11 +1713,10 @@ aix_thread_target::xfer_partial (enum target_object object, ULONGEST *xfered_len) { scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - struct target_ops *beneath = find_target_beneath (this); - inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); - return beneath->xfer_partial (object, annex, readbuf, - writebuf, offset, len, xfered_len); + inferior_ptid = ptid_t (inferior_ptid.pid ()); + return beneath ()->xfer_partial (object, annex, readbuf, + writebuf, offset, len, xfered_len); } /* Clean up after the inferior exits. */ @@ -1756,7 +1724,7 @@ aix_thread_target::xfer_partial (enum target_object object, void aix_thread_target::mourn_inferior () { - struct target_ops *beneath = find_target_beneath (this); + target_ops *beneath = this->beneath (); pd_deactivate (); beneath->mourn_inferior (); @@ -1767,10 +1735,8 @@ aix_thread_target::mourn_inferior () bool aix_thread_target::thread_alive (ptid_t ptid) { - struct target_ops *beneath = find_target_beneath (this); - if (!PD_TID (ptid)) - return beneath->thread_alive (ptid); + return beneath ()->thread_alive (ptid); /* We update the thread list every time the child stops, so all valid threads should be in the thread list. */ @@ -1780,21 +1746,13 @@ aix_thread_target::thread_alive (ptid_t ptid) /* Return a printable representation of composite PID for use in "info threads" output. */ -const char * +std::string aix_thread_target::pid_to_str (ptid_t ptid) { - static char *ret = NULL; - struct target_ops *beneath = find_target_beneath (this); - if (!PD_TID (ptid)) - return beneath->pid_to_str (ptid); - - /* Free previous return value; a new one will be allocated by - xstrprintf(). */ - xfree (ret); + return beneath ()->pid_to_str (ptid); - ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid)); - return ret; + return string_printf (_("Thread %ld"), ptid.tid ()); } /* Return a printable representation of extra information about @@ -1859,7 +1817,7 @@ aix_thread_target::extra_thread_info (struct thread_info *thread) ptid_t aix_thread_target::get_ada_task_ptid (long lwp, long thread) { - return ptid_build (ptid_get_pid (inferior_ptid), 0, thread); + return ptid_t (inferior_ptid.pid (), 0, thread); }