From c7660128e838a58bf807b42cd0a3fca3d1d0dc9d Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 12 Mar 2009 17:44:29 +0000 Subject: [PATCH] Fix a build failure on AIX introduced after a change in the profile of some of the "methods" in the target_ops structure. * aix-thread.c: Add missing target_ops parameter throughout. Implement Ada task switching on AIX. * aix-thread.c (aix_thread_get_ada_task_ptid): New function. (init_aix_thread_ops): Set aix_thread_ops.to_get_ada_task_ptid. --- gdb/ChangeLog | 10 ++++++++++ gdb/aix-thread.c | 26 ++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 400bb73f484..80d44b2daa6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2009-03-12 Joel Brobecker + + Fix a build failure on AIX introduced after a change in the profile + of some of the "methods" in the target_ops structure. + * aix-thread.c: Add missing target_ops parameter throughout. + + Implement Ada task switching on AIX. + * aix-thread.c (aix_thread_get_ada_task_ptid): New function. + (init_aix_thread_ops): Set aix_thread_ops.to_get_ada_task_ptid. + 2009-03-11 Daniel Jacobowitz * breakpoint.c (bpstat_check_breakpoint_conditions): Use diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index 051de07d15b..f453d0ed5ff 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -958,7 +958,8 @@ aix_thread_detach (struct target_ops *ops, char *args, int from_tty) and all threads otherwise. */ static void -aix_thread_resume (ptid_t ptid, int step, enum target_signal sig) +aix_thread_resume (struct target_ops *ops, + ptid_t ptid, int step, enum target_signal sig) { struct thread_info *thread; pthdb_tid_t tid[2]; @@ -967,7 +968,7 @@ aix_thread_resume (ptid_t ptid, int step, enum target_signal sig) { struct cleanup *cleanup = save_inferior_ptid (); inferior_ptid = pid_to_ptid (PIDGET (inferior_ptid)); - base_target.to_resume (ptid, step, sig); + base_target.to_resume (ops, ptid, step, sig); do_cleanups (cleanup); } else @@ -1276,13 +1277,14 @@ fetch_regs_kernel_thread (struct regcache *regcache, int regno, thread/process specified by inferior_ptid. */ static void -aix_thread_fetch_registers (struct regcache *regcache, int regno) +aix_thread_fetch_registers (struct target_ops *ops, + struct regcache *regcache, int regno) { struct thread_info *thread; pthdb_tid_t tid; if (!PD_TID (inferior_ptid)) - base_target.to_fetch_registers (regcache, regno); + base_target.to_fetch_registers (ops, regcache, regno); else { thread = find_thread_pid (inferior_ptid); @@ -1615,13 +1617,14 @@ store_regs_kernel_thread (const struct regcache *regcache, int regno, thread/process specified by inferior_ptid. */ static void -aix_thread_store_registers (struct regcache *regcache, int regno) +aix_thread_store_registers (struct target_ops *ops, + struct regcache *regcache, int regno) { struct thread_info *thread; pthdb_tid_t tid; if (!PD_TID (inferior_ptid)) - base_target.to_store_registers (regcache, regno); + base_target.to_store_registers (ops, regcache, regno); else { thread = find_thread_pid (inferior_ptid); @@ -1678,10 +1681,10 @@ aix_thread_mourn_inferior (struct target_ops *ops) /* Return whether thread PID is still valid. */ static int -aix_thread_thread_alive (ptid_t ptid) +aix_thread_thread_alive (struct target_ops *ops, ptid_t ptid) { if (!PD_TID (ptid)) - return base_target.to_thread_alive (ptid); + return base_target.to_thread_alive (ops, ptid); /* We update the thread list every time the child stops, so all valid threads should be in the thread list. */ @@ -1768,6 +1771,12 @@ aix_thread_extra_thread_info (struct thread_info *thread) return ret; } +static ptid_t +aix_thread_get_ada_task_ptid (long lwp, long thread) +{ + return ptid_build (ptid_get_pid (inferior_ptid), 0, thread); +} + /* Initialize target aix_thread_ops. */ static void @@ -1791,6 +1800,7 @@ init_aix_thread_ops (void) aix_thread_ops.to_thread_alive = aix_thread_thread_alive; aix_thread_ops.to_pid_to_str = aix_thread_pid_to_str; aix_thread_ops.to_extra_thread_info = aix_thread_extra_thread_info; + aix_thread_ops.to_get_ada_task_ptid = aix_thread_get_ada_task_ptid; aix_thread_ops.to_stratum = thread_stratum; aix_thread_ops.to_magic = OPS_MAGIC; } -- 2.30.2