--- ./gdb/aix-thread.c_orig 2022-11-12 09:42:29 +0000 +++ ./gdb//aix-thread.c 2022-11-14 02:11:55 +0000 @@ -73,10 +73,6 @@ #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. */ - -#define PD_USER 1 /* Success and failure values returned by pthdb callbacks. */ @@ -332,7 +328,7 @@ the address of SYMBOLS[].name. */ static int -pdc_symbol_addrs (pthdb_user_t user, pthdb_symbol_t *symbols, int count) +pdc_symbol_addrs (pthdb_user_t user_current_pid, pthdb_symbol_t *symbols, int count) { struct bound_minimal_symbol ms; int i; @@ -340,8 +336,8 @@ if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, - "pdc_symbol_addrs (user = %ld, symbols = 0x%lx, count = %d)\n", - user, (long) symbols, count); + "pdc_symbol_addrs (user_current_pid = %ld, symbols = 0x%lx, count = %d)\n", + user_current_pid, (long) symbols, count); for (i = 0; i < count; i++) { @@ -379,7 +375,7 @@ If successful return 0, else non-zero is returned. */ static int -pdc_read_regs (pthdb_user_t user, +pdc_read_regs (pthdb_user_t user_current_pid, pthdb_tid_t tid, unsigned long long flags, pthdb_context_t *context) @@ -451,7 +447,7 @@ If successful return 0, else non-zero is returned. */ static int -pdc_write_regs (pthdb_user_t user, +pdc_write_regs (pthdb_user_t user_current_pid, pthdb_tid_t tid, unsigned long long flags, pthdb_context_t *context) @@ -501,17 +497,30 @@ /* pthdb callback: read LEN bytes from process ADDR into BUF. */ static int -pdc_read_data (pthdb_user_t user, void *buf, +pdc_read_data (pthdb_user_t user_current_pid, void *buf, pthdb_addr_t addr, size_t len) { int status, ret; if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, - "pdc_read_data (user = %ld, buf = 0x%lx, addr = %s, len = %ld)\n", - user, (long) buf, hex_string (addr), len); + "pdc_read_data (user_current_pid = %ld, buf = 0x%lx, addr = %s, len = %ld)\n", + user_current_pid, (long) buf, hex_string (addr), len); + - status = target_read_memory (addr, (gdb_byte *) buf, len); + /* This is needed to eliminate the dependency of current thread + which is null so that thread reads the correct target memory. */ + { + scoped_restore_current_thread restore_current_thread; + /* Before the first inferior is added, we pass inferior_ptid.pid () + from pd_enable () which is 0. There is no need to switch threads + during first initialisation. In the rest of the callbacks the + current thread needs to be correct. */ + if (user_current_pid != 0) + switch_to_thread (current_inferior ()->process_target (), + ptid_t (user_current_pid)); + status = target_read_memory (addr, (gdb_byte *) buf, len); + } ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE; if (debug_aix_thread) @@ -523,15 +532,15 @@ /* pthdb callback: write LEN bytes from BUF to process ADDR. */ static int -pdc_write_data (pthdb_user_t user, void *buf, +pdc_write_data (pthdb_user_t user_current_pid, void *buf, pthdb_addr_t addr, size_t len) { int status, ret; if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, - "pdc_write_data (user = %ld, buf = 0x%lx, addr = %s, len = %ld)\n", - user, (long) buf, hex_string (addr), len); + "pdc_write_data (user_current_pid = %ld, buf = 0x%lx, addr = %s, len = %ld)\n", + user_current_pid, (long) buf, hex_string (addr), len); status = target_write_memory (addr, (gdb_byte *) buf, len); ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE; @@ -546,12 +555,12 @@ in BUFP. */ static int -pdc_alloc (pthdb_user_t user, size_t len, void **bufp) +pdc_alloc (pthdb_user_t user_current_pid, size_t len, void **bufp) { if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, - "pdc_alloc (user = %ld, len = %ld, bufp = 0x%lx)\n", - user, len, (long) bufp); + "pdc_alloc (user_current_pid = %ld, len = %ld, bufp = 0x%lx)\n", + user_current_pid, len, (long) bufp); *bufp = xmalloc (len); if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, @@ -568,12 +577,12 @@ pointer to the result in BUFP. */ static int -pdc_realloc (pthdb_user_t user, void *buf, size_t len, void **bufp) +pdc_realloc (pthdb_user_t user_current_pid, void *buf, size_t len, void **bufp) { if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, - "pdc_realloc (user = %ld, buf = 0x%lx, len = %ld, bufp = 0x%lx)\n", - user, (long) buf, len, (long) bufp); + "pdc_realloc (user_current_pid = %ld, buf = 0x%lx, len = %ld, bufp = 0x%lx)\n", + user_current_pid, (long) buf, len, (long) bufp); *bufp = xrealloc (buf, len); if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, @@ -585,11 +594,11 @@ realloc callback. */ static int -pdc_dealloc (pthdb_user_t user, void *buf) +pdc_dealloc (pthdb_user_t user_current_pid, void *buf) { if (debug_aix_thread) fprintf_unfiltered (gdb_stdlog, - "pdc_free (user = %ld, buf = 0x%lx)\n", user, + "pdc_free (user_current_pid = %ld, buf = 0x%lx)\n", user_current_pid, (long) buf); xfree (buf); return PDC_SUCCESS; @@ -702,14 +711,14 @@ Return 0 if none found. */ static pthdb_tid_t -get_signaled_thread (void) +get_signaled_thread (int pid) { struct thrdsinfo64 thrinf; tid_t ktid = 0; while (1) { - if (getthrds (inferior_ptid.pid (), &thrinf, + if (getthrds (pid, &thrinf, sizeof (thrinf), &ktid, 1) != 1) break; @@ -735,9 +744,9 @@ have difficulty with certain call patterns */ static void -sync_threadlists (void) +sync_threadlists (int pid) { - int cmd, status, infpid; + int cmd, status; int pcount, psize, pi, gcount, gi; struct pd_thread *pbuf; struct thread_info **gbuf, **g, *thread; @@ -792,7 +801,6 @@ /* Apply differences between the two arrays to GDB's thread list. */ - infpid = inferior_ptid.pid (); for (pi = gi = 0; pi < pcount || gi < gcount;) { if (pi == pcount) @@ -809,7 +817,7 @@ process_stratum_target *proc_target = current_inferior ()->process_target (); thread = add_thread_with_info (proc_target, - ptid_t (infpid, 0, pbuf[pi].pthid), + ptid_t (pid, 0, pbuf[pi].pthid), priv); pi++; @@ -819,7 +827,7 @@ ptid_t pptid, gptid; int cmp_result; - pptid = ptid_t (infpid, 0, pbuf[pi].pthid); + pptid = ptid_t (pid, 0, pbuf[pi].pthid); gptid = gbuf[gi]->ptid; pdtid = pbuf[pi].pdtid; tid = pbuf[pi].tid; @@ -873,10 +881,11 @@ /* Synchronize libpthdebug's state with the inferior and with GDB, generate a composite process/thread for the current thread, - set inferior_ptid to if SET_INFPID, and return . */ + Return the ptid of the event thread if one can be found, else + return a pid-only ptid with PID. */ static ptid_t -pd_update (int set_infpid) +pd_update (int pid) { int status; ptid_t ptid; @@ -884,48 +893,45 @@ struct thread_info *thread = NULL; if (!pd_active) - return inferior_ptid; + return ptid_t (pid); status = pthdb_session_update (pd_session); if (status != PTHDB_SUCCESS) - return inferior_ptid; + return ptid_t (pid); - sync_threadlists (); + sync_threadlists (pid); /* Define "current thread" as one that just received a trap signal. */ - tid = get_signaled_thread (); + tid = get_signaled_thread (pid); if (tid != 0) thread = iterate_over_threads (iter_tid, &tid); if (!thread) - ptid = inferior_ptid; + ptid = ptid_t (pid); else - { - ptid = thread->ptid; - if (set_infpid) - switch_to_thread (thread); - } + ptid = thread->ptid; + return ptid; } /* Try to start debugging threads in the current process. - If successful and SET_INFPID, set inferior_ptid to reflect the - current thread. */ + If successful and there exists and we can find an event thread, return a ptid + for that thread. Otherwise, return a ptid-only ptid using PID. */ static ptid_t -pd_activate (int set_infpid) +pd_activate (int pid) { int status; - status = pthdb_session_init (PD_USER, arch64 ? PEM_64BIT : PEM_32BIT, + status = pthdb_session_init (pid, arch64 ? PEM_64BIT : PEM_32BIT, PTHDB_FLAG_REGS, &pd_callbacks, &pd_session); if (status != PTHDB_SUCCESS) { - return inferior_ptid; + return ptid_t (pid); } pd_active = 1; - return pd_update (set_infpid); + return pd_update (pid); } /* Undo the effects of pd_activate(). */ @@ -960,7 +966,7 @@ /* Check whether the application is pthreaded. */ stub_name = NULL; - status = pthdb_session_pthreaded (PD_USER, PTHDB_FLAG_REGS, + status = pthdb_session_pthreaded (inferior_ptid.pid (), PTHDB_FLAG_REGS, &pd_callbacks, &stub_name); if ((status != PTHDB_SUCCESS && status != PTHDB_NOT_PTHREADED) || !stub_name) @@ -981,7 +987,7 @@ /* If we're debugging a core file or an attached inferior, the pthread library may already have been initialized, so try to activate thread debugging. */ - pd_activate (1); + pd_activate (inferior_ptid.pid ()); } /* Undo the effects of pd_enable(). */ @@ -1081,17 +1087,19 @@ int options) { { - scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - pid_to_prc (&ptid); - inferior_ptid = ptid_t (inferior_ptid.pid ()); ptid = beneath ()->wait (ptid, status, options); } if (ptid.pid () == -1) return ptid_t (-1); + /* The target beneath does not deal with threads, so it should only return + pid-only ptids. */ + gdb_assert (ptid.is_pid ()); + + /* Check whether libpthdebug might be ready to be initialized. */ if (!pd_active && status->kind == TARGET_WAITKIND_STOPPED && status->value.sig == GDB_SIGNAL_TRAP) @@ -1103,10 +1111,10 @@ if (regcache_read_pc (regcache) - gdbarch_decr_pc_after_break (gdbarch) == pd_brk_addr) - return pd_activate (0); + return pd_activate (ptid.pid ()); } - return pd_update (0); + return pd_update (ptid.pid ()); } /* Record that the 64-bit general-purpose registers contain VALS. */ @@ -1884,7 +1892,7 @@ if (!PD_TID (ptid)) return beneath ()->pid_to_str (ptid); - return string_printf (_("Thread %ld"), ptid.tid ()); + return string_printf (_("Thread %s"), pulongest (ptid.tid ())); } /* Return a printable representation of extra information about --- ./gdb/rs6000-nat.c_orig 2022-11-12 09:42:29 +0000 +++ ./gdb/rs6000-nat.c 2022-11-14 02:18:21 +0000 @@ -738,14 +738,13 @@ _("Child process unexpectedly missing: %s.\n"), safe_strerror (save_errno)); - /* Claim it exited with unknown signal. */ - ourstatus->kind = TARGET_WAITKIND_SIGNALLED; - ourstatus->value.sig = GDB_SIGNAL_UNKNOWN; - return inferior_ptid; + /* Claim it exited with unknown signal. */ + ourstatus->kind = TARGET_WAITKIND_IGNORE; + return minus_one_ptid; } /* Ignore terminated detached child processes. */ - if (!WIFSTOPPED (status) && pid != inferior_ptid.pid ()) + if (!WIFSTOPPED (status) && find_inferior_pid (this, pid) == nullptr) pid = -1; } while (pid == -1);