/* Low level interface for debugging AIX 4.3+ pthreads.
- Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
Written by Nick Duffek <nsd@redhat.com>.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* This module uses the libpthdebug.a library provided by AIX 4.3+ for
libpthdebug peculiarities:
- - pthdb_ptid_pthread() is prototyped in <sys/pthdebug.h>, but it's not
- documented, and after several calls it stops working and causes other
- libpthdebug functions to fail.
+ - pthdb_ptid_pthread() is prototyped in <sys/pthdebug.h>, but
+ it's not documented, and after several calls it stops working
+ and causes other libpthdebug functions to fail.
- - pthdb_tid_pthread() doesn't always work after pthdb_session_update(),
- but it does work after cycling through all threads using
- pthdb_pthread().
+ - pthdb_tid_pthread() doesn't always work after
+ pthdb_session_update(), but it does work after cycling through
+ all threads using pthdb_pthread().
*/
#include "defs.h"
+#include "gdb_assert.h"
#include "gdbthread.h"
#include "target.h"
#include "inferior.h"
#include "regcache.h"
#include "gdbcmd.h"
-
-#if 0
-#include "coff/internal.h" /* for libcoff.h */
-#include "bfd/libcoff.h" /* for xcoff_data */
-#endif
+#include "ppc-tdep.h"
+#include <string.h>
+#include "observer.h"
#include <procinfo.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/reg.h>
-#if 0
-#include <pthread.h>
-#endif
#include <sched.h>
#include <sys/pthdebug.h>
-/* Whether to emit debugging output. */
+#if !HAVE_DECL_GETTHRDS
+extern int getthrds (pid_t, struct thrdsinfo64 *, int, tid_t *, int);
+#endif
+
+/* Whether to emit debugging output. */
static int debug_aix_thread;
-/* in AIX 5.1, functions use pthdb_tid_t instead of tid_t */
+/* In AIX 5.1, functions use pthdb_tid_t instead of tid_t. */
#ifndef PTHDB_VERSION_3
#define pthdb_tid_t tid_t
#endif
-/* Return whether to treat PID as a debuggable thread id. */
+/* Return whether to treat PID as a debuggable thread id. */
#define PD_TID(ptid) (pd_active && ptid_get_tid (ptid) != 0)
-/* Build a thread ptid. */
-#define BUILD_THREAD(TID, PID) ptid_build (PID, 0, TID)
-
-/* Build and lwp ptid. */
-#define BUILD_LWP(LWP, PID) MERGEPID (PID, LWP)
-
-/* Call error() with a message indicating that libpthdebug FUNC failed with
- STATUS. */
-
-#define PD_ERROR(func, status) \
- error ("aix-thread: %s returned %s", func, pd_status2str (status))
-
/* pthdb_user_t value that we pass to pthdb functions. 0 causes
- PTHDB_BAD_USER errors, so use 1. */
+ PTHDB_BAD_USER errors, so use 1. */
#define PD_USER 1
-/* Success and failure values returned by pthdb callbacks. */
+/* Success and failure values returned by pthdb callbacks. */
#define PDC_SUCCESS PTHDB_SUCCESS
#define PDC_FAILURE PTHDB_CALLBACK
-/* Convert composite process/thread inferior_ptid to a process id, evaluate
- base_ops function CALL, and then restore inferior_ptid. */
-
-#define CALL_BASE(call) \
- do { \
- struct cleanup *cleanup = save_inferior_ptid (); \
- inferior_ptid = pid_to_ptid (PIDGET (inferior_ptid)); \
- call; \
- do_cleanups (cleanup); \
- } while (0)
-
-/* Private data attached to each element in GDB's thread list. */
+/* Private data attached to each element in GDB's thread list. */
struct private_thread_info {
- pthdb_pthread_t pdtid; /* thread's libpthdebug id */
+ pthdb_pthread_t pdtid; /* thread's libpthdebug id */
pthdb_tid_t tid; /* kernel thread id */
};
-/* Information about a thread of which libpthdebug is aware. */
+/* Information about a thread of which libpthdebug is aware. */
struct pd_thread {
pthdb_pthread_t pdtid;
pthdb_tid_t tid;
};
-/* This module's target-specific operations, active while pd_able is true. */
-
-static struct target_ops ops;
-
-/* Copy of the target over which ops is pushed. This is
- more convenient than a pointer to child_ops or core_ops, because
- they lack current_target's default callbacks. */
+/* This module's target-specific operations, active while pd_able is true. */
-static struct target_ops base_ops;
+static struct target_ops aix_thread_ops;
-/* Address of the function that libpthread will call when libpthdebug is
- ready to be initialized. */
+/* Address of the function that libpthread will call when libpthdebug
+ is ready to be initialized. */
static CORE_ADDR pd_brk_addr;
-/* Whether the current application is debuggable by pthdb. */
+/* Whether the current application is debuggable by pthdb. */
static int pd_able = 0;
-/* Whether a threaded application is being debugged. */
+/* Whether a threaded application is being debugged. */
static int pd_active = 0;
-/* Whether the current architecture is 64-bit. Only valid when pd_able is
- true. */
+/* Whether the current architecture is 64-bit.
+ Only valid when pd_able is true. */
static int arch64;
-/* Saved pointer to previous owner of target_new_objfile_hook. */
-
-static void (*target_new_objfile_chain)(struct objfile *);
-
-/* Forward declarations for pthdb callbacks. */
+/* Forward declarations for pthdb callbacks. */
static int pdc_symbol_addrs (pthdb_user_t, pthdb_symbol_t *, int);
static int pdc_read_data (pthdb_user_t, void *, pthdb_addr_t, size_t);
static int pdc_write_data (pthdb_user_t, void *, pthdb_addr_t, size_t);
static int pdc_read_regs (pthdb_user_t user, pthdb_tid_t tid,
- unsigned long long flags, pthdb_context_t *context);
+ unsigned long long flags,
+ pthdb_context_t *context);
static int pdc_write_regs (pthdb_user_t user, pthdb_tid_t tid,
- unsigned long long flags, pthdb_context_t *context);
+ unsigned long long flags,
+ pthdb_context_t *context);
static int pdc_alloc (pthdb_user_t, size_t, void **);
static int pdc_realloc (pthdb_user_t, void *, size_t, void **);
static int pdc_dealloc (pthdb_user_t, void *);
-/* pthdb callbacks. */
+/* pthdb callbacks. */
static pthdb_callbacks_t pd_callbacks = {
pdc_symbol_addrs,
NULL
};
-/* Current pthdb session. */
+/* Current pthdb session. */
static pthdb_session_t pd_session;
-/* Return a printable representation of pthdebug function return STATUS. */
+/* Return a printable representation of pthdebug function return
+ STATUS. */
static char *
pd_status2str (int status)
}
}
-/* A call to ptrace(REQ, ID, ...) just returned RET. Check for exceptional
- conditions and either return nonlocally or else return 1 for success and 0
- for failure. */
+/* A call to ptrace(REQ, ID, ...) just returned RET. Check for
+ exceptional conditions and either return nonlocally or else return
+ 1 for success and 0 for failure. */
static int
ptrace_check (int req, int id, int ret)
if (ret == 0 && !errno)
return 1;
- /* According to ptrace(2), ptrace may fail with EPERM if "the Identifier
- parameter corresponds to a kernel thread which is stopped in kernel mode
- and whose computational state cannot be read or written." This happens
- quite often with register reads. */
+ /* According to ptrace(2), ptrace may fail with EPERM if "the
+ Identifier parameter corresponds to a kernel thread which is
+ stopped in kernel mode and whose computational state cannot be
+ read or written." This happens quite often with register reads. */
switch (req)
{
if (ret == -1 && errno == EPERM)
{
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, "ptrace (%d, %d) = %d (errno = %d)",
+ fprintf_unfiltered (gdb_stdlog,
+ "ptrace (%d, %d) = %d (errno = %d)\n",
req, id, ret, errno);
return ret == -1 ? 0 : 1;
}
break;
}
- error ("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)",
- req, id, ret, errno, strerror (errno));
- return 0; /* not reached. */
+ error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"),
+ req, id, ret, errno, safe_strerror (errno));
+ return 0; /* Not reached. */
}
-/* Call ptracex(REQ, ID, ADDR, DATA, BUF). Return success. */
+/* Call ptracex (REQ, ID, ADDR, DATA, BUF) or
+ ptrace64 (REQ, ID, ADDR, DATA, BUF) if HAVE_PTRACE64.
+ Return success. */
+
+#ifdef HAVE_PTRACE64
+# define ptracex(request, pid, addr, data, buf) \
+ ptrace64 (request, pid, addr, data, buf)
+#endif
static int
ptrace64aix (int req, int id, long long addr, int data, int *buf)
return ptrace_check (req, id, ptracex (req, id, addr, data, buf));
}
-/* Call ptrace(REQ, ID, ADDR, DATA, BUF). Return success. */
+/* Call ptrace (REQ, ID, ADDR, DATA, BUF) or
+ ptrace64 (REQ, ID, ADDR, DATA, BUF) if HAVE_PTRACE64.
+ Return success. */
+
+#ifdef HAVE_PTRACE64
+# define ptrace(request, pid, addr, data, buf) \
+ ptrace64 (request, pid, addr, data, buf)
+# define addr_ptr long long
+#else
+# define addr_ptr int *
+#endif
static int
-ptrace32 (int req, int id, int *addr, int data, int *buf)
+ptrace32 (int req, int id, addr_ptr addr, int data, int *buf)
{
errno = 0;
- return ptrace_check (req, id, ptrace (req, id, (int *)addr, data, buf));
+ return ptrace_check (req, id,
+ ptrace (req, id, addr, data, buf));
}
-/* If *PIDP is a composite process/thread id, convert it to a process id. */
+/* If *PIDP is a composite process/thread id, convert it to a
+ process id. */
static void
pid_to_prc (ptid_t *ptidp)
ptid = *ptidp;
if (PD_TID (ptid))
- *ptidp = pid_to_ptid (PIDGET (ptid));
+ *ptidp = pid_to_ptid (ptid_get_pid (ptid));
}
-/* pthdb callback: for <i> from 0 to COUNT, set SYMBOLS[<i>].addr to the
- address of SYMBOLS[<i>].name. */
+/* pthdb callback: for <i> from 0 to COUNT, set SYMBOLS[<i>].addr to
+ the address of SYMBOLS[<i>].name. */
static int
pdc_symbol_addrs (pthdb_user_t user, pthdb_symbol_t *symbols, int count)
if (debug_aix_thread)
fprintf_unfiltered (gdb_stdlog,
- "pdc_symbol_addrs (user = %ld, symbols = 0x%lx, count = %d)",
+ "pdc_symbol_addrs (user = %ld, symbols = 0x%lx, count = %d)\n",
user, (long) symbols, count);
for (i = 0; i < count; i++)
{
name = symbols[i].name;
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " symbols[%d].name = \"%s\"", i, name);
+ fprintf_unfiltered (gdb_stdlog,
+ " symbols[%d].name = \"%s\"\n", i, name);
if (!*name)
symbols[i].addr = 0;
if (!(ms = lookup_minimal_symbol (name, NULL, NULL)))
{
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " returning PDC_FAILURE");
+ fprintf_unfiltered (gdb_stdlog, " returning PDC_FAILURE\n");
return PDC_FAILURE;
}
symbols[i].addr = SYMBOL_VALUE_ADDRESS (ms);
}
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " symbols[%d].addr = 0x%llx",
- i, symbols[i].addr);
+ fprintf_unfiltered (gdb_stdlog, " symbols[%d].addr = %s\n",
+ i, hex_string (symbols[i].addr));
}
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " returning PDC_SUCCESS");
+ fprintf_unfiltered (gdb_stdlog, " returning PDC_SUCCESS\n");
return PDC_SUCCESS;
}
-/* Read registers call back function should be able to read the context */
-/* information of a debuggee kernel thread from an active process or from */
-/* a core file. The information should be formatted in context64 form for */
-/* both 32-bit and 64-bit process. If successful return 0, else non-zero */
-/* is returned. */
+/* Read registers call back function should be able to read the
+ context information of a debuggee kernel thread from an active
+ process or from a core file. The information should be formatted
+ in context64 form for both 32-bit and 64-bit process.
+ If successful return 0, else non-zero is returned. */
+
static int
pdc_read_regs (pthdb_user_t user,
pthdb_tid_t tid,
unsigned long long flags,
pthdb_context_t *context)
{
- /* this function doesn't appear to be used, so we could probably just */
- /* return 0 here. HOWEVER, if it is not defined, the OS will complain */
- /* and several thread debug functions will fail. In case this is needed, */
- /* I have implemented what I think it should do, however this code is */
- /* untested. */
- uint64_t gprs64[32];
- uint32_t gprs32[32];
- double fprs[32];
+ /* This function doesn't appear to be used, so we could probably
+ just return 0 here. HOWEVER, if it is not defined, the OS will
+ complain and several thread debug functions will fail. In case
+ this is needed, I have implemented what I think it should do,
+ however this code is untested. */
+
+ uint64_t gprs64[ppc_num_gprs];
+ uint32_t gprs32[ppc_num_gprs];
+ double fprs[ppc_num_fprs];
struct ptxsprs sprs64;
struct ptsprs sprs32;
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, "pdc_read_regs tid=%d flags=%llx\n",
- (int)tid, flags);
+ fprintf_unfiltered (gdb_stdlog, "pdc_read_regs tid=%d flags=%s\n",
+ (int) tid, hex_string (flags));
- /* General-purpose registers. */
+ /* General-purpose registers. */
if (flags & PTHDB_FLAG_GPRS)
{
if (arch64)
{
- if (!ptrace64aix (PTT_READ_GPRS, tid, (unsigned long) gprs64, 0, NULL))
+ if (!ptrace64aix (PTT_READ_GPRS, tid,
+ (unsigned long) gprs64, 0, NULL))
memset (gprs64, 0, sizeof (gprs64));
memcpy (context->gpr, gprs64, sizeof(gprs64));
}
else
{
- if (!ptrace32 (PTT_READ_GPRS, tid, gprs32, 0, NULL))
+ if (!ptrace32 (PTT_READ_GPRS, tid, (uintptr_t) gprs32, 0, NULL))
memset (gprs32, 0, sizeof (gprs32));
memcpy (context->gpr, gprs32, sizeof(gprs32));
}
}
- /* Floating-point registers. */
+ /* Floating-point registers. */
if (flags & PTHDB_FLAG_FPRS)
{
- if (!ptrace32 (PTT_READ_FPRS, tid, (int *) fprs, 0, NULL))
+ if (!ptrace32 (PTT_READ_FPRS, tid, (uintptr_t) fprs, 0, NULL))
memset (fprs, 0, sizeof (fprs));
- memcpy (context->fpr, fprs, sizeof(fprs));
+ memcpy (context->fpr, fprs, sizeof(fprs));
}
- /* Special-purpose registers. */
+ /* Special-purpose registers. */
if (flags & PTHDB_FLAG_SPRS)
{
if (arch64)
{
- if (!ptrace64aix (PTT_READ_SPRS, tid, (unsigned long) &sprs64, 0, NULL))
+ if (!ptrace64aix (PTT_READ_SPRS, tid,
+ (unsigned long) &sprs64, 0, NULL))
memset (&sprs64, 0, sizeof (sprs64));
memcpy (&context->msr, &sprs64, sizeof(sprs64));
}
else
{
- if (!ptrace32 (PTT_READ_SPRS, tid, (int *) &sprs32, 0, NULL))
+ if (!ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL))
memset (&sprs32, 0, sizeof (sprs32));
memcpy (&context->msr, &sprs32, sizeof(sprs32));
}
return 0;
}
-/* Write register function should be able to write requested context */
-/* information to specified debuggee's kernel thread id. If successful */
-/* return 0, else non-zero is returned. */
+/* Write register function should be able to write requested context
+ information to specified debuggee's kernel thread id.
+ If successful return 0, else non-zero is returned. */
+
static int
pdc_write_regs (pthdb_user_t user,
pthdb_tid_t tid,
unsigned long long flags,
pthdb_context_t *context)
{
- /* this function doesn't appear to be used, so we could probably just */
- /* return 0 here. HOWEVER, if it is not defined, the OS will complain */
- /* and several thread debug functions will fail. In case this is needed, */
- /* I have implemented what I think it should do, however this code is */
- /* untested. */
+ /* This function doesn't appear to be used, so we could probably
+ just return 0 here. HOWEVER, if it is not defined, the OS will
+ complain and several thread debug functions will fail. In case
+ this is needed, I have implemented what I think it should do,
+ however this code is untested. */
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, "pdc_write_regs tid=%d flags=%llx\n",
- (int)tid, flags);
+ fprintf_unfiltered (gdb_stdlog, "pdc_write_regs tid=%d flags=%s\n",
+ (int) tid, hex_string (flags));
- /* General-purpose registers. */
+ /* General-purpose registers. */
if (flags & PTHDB_FLAG_GPRS)
{
if (arch64)
- ptrace64aix (PTT_WRITE_GPRS, tid, (unsigned long)context->gpr, 0, NULL);
+ ptrace64aix (PTT_WRITE_GPRS, tid,
+ (unsigned long) context->gpr, 0, NULL);
else
- ptrace32 (PTT_WRITE_GPRS, tid, (int *)context->gpr, 0, NULL);
+ ptrace32 (PTT_WRITE_GPRS, tid, (uintptr_t) context->gpr, 0, NULL);
}
- /* Floating-point registers. */
+ /* Floating-point registers. */
if (flags & PTHDB_FLAG_FPRS)
{
- ptrace32 (PTT_WRITE_FPRS, tid, (int *)context->fpr, 0, NULL);
+ ptrace32 (PTT_WRITE_FPRS, tid, (uintptr_t) context->fpr, 0, NULL);
}
- /* Special-purpose registers. */
+ /* Special-purpose registers. */
if (flags & PTHDB_FLAG_SPRS)
{
if (arch64)
{
- ptrace64aix (PTT_WRITE_SPRS, tid, (unsigned long) &context->msr, 0, NULL);
+ ptrace64aix (PTT_WRITE_SPRS, tid,
+ (unsigned long) &context->msr, 0, NULL);
}
else
{
- ptrace32 (PTT_WRITE_SPRS, tid, (int *)&context->msr, 0, NULL);
+ ptrace32 (PTT_WRITE_SPRS, tid, (uintptr_t) &context->msr, 0, NULL);
}
}
return 0;
}
-/* pthdb callback: read LEN bytes from process ADDR into BUF. */
+/* pthdb callback: read LEN bytes from process ADDR into BUF. */
static int
-pdc_read_data (pthdb_user_t user, void *buf, pthdb_addr_t addr, size_t len)
+pdc_read_data (pthdb_user_t user, 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 = 0x%llx, len = %ld)",
- user, (long) buf, addr, len);
+ "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);
ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE;
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " status=%d, returning %s", status,
- pd_status2str (ret));
+ fprintf_unfiltered (gdb_stdlog, " status=%d, returning %s\n",
+ status, pd_status2str (ret));
return ret;
}
-/* pthdb callback: write LEN bytes from BUF to process ADDR. */
+/* pthdb callback: write LEN bytes from BUF to process ADDR. */
static int
-pdc_write_data (pthdb_user_t user, void *buf, pthdb_addr_t addr, size_t len)
+pdc_write_data (pthdb_user_t user, 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 = 0x%llx, len = %ld)",
- user, (long) buf, addr, len);
+ "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);
ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE;
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " status=%d, returning %s", status,
+ fprintf_unfiltered (gdb_stdlog, " status=%d, returning %s\n", status,
pd_status2str (ret));
return ret;
}
-/* pthdb callback: allocate a LEN-byte buffer and store a pointer to it in
- BUFP. */
+/* pthdb callback: allocate a LEN-byte buffer and store a pointer to it
+ in BUFP. */
static int
pdc_alloc (pthdb_user_t user, size_t len, void **bufp)
{
if (debug_aix_thread)
fprintf_unfiltered (gdb_stdlog,
- "pdc_alloc (user = %ld, len = %ld, bufp = 0x%lx)",
+ "pdc_alloc (user = %ld, len = %ld, bufp = 0x%lx)\n",
user, len, (long) bufp);
*bufp = xmalloc (len);
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " malloc returned 0x%lx", (long) *bufp);
- /* Note: xmalloc() can't return 0; therefore PDC_FAILURE will never be
- returned. */
+ fprintf_unfiltered (gdb_stdlog,
+ " malloc returned 0x%lx\n", (long) *bufp);
+
+ /* Note: xmalloc() can't return 0; therefore PDC_FAILURE will never
+ be returned. */
+
return *bufp ? PDC_SUCCESS : PDC_FAILURE;
}
-/* pthdb callback: reallocate BUF, which was allocated by the alloc or realloc
- callback, so that it contains LEN bytes, and store a pointer to the result
- in BUFP. */
+/* pthdb callback: reallocate BUF, which was allocated by the alloc or
+ realloc callback, so that it contains LEN bytes, and store a
+ pointer to the result in BUFP. */
static int
pdc_realloc (pthdb_user_t user, 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)",
+ "pdc_realloc (user = %ld, buf = 0x%lx, len = %ld, bufp = 0x%lx)\n",
user, (long) buf, len, (long) bufp);
- *bufp = realloc (buf, len);
+ *bufp = xrealloc (buf, len);
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, " realloc returned 0x%lx", (long) *bufp);
+ fprintf_unfiltered (gdb_stdlog,
+ " realloc returned 0x%lx\n", (long) *bufp);
return *bufp ? PDC_SUCCESS : PDC_FAILURE;
}
-/* pthdb callback: free BUF, which was allocated by the alloc or realloc
- callback. */
+/* pthdb callback: free BUF, which was allocated by the alloc or
+ realloc callback. */
static int
pdc_dealloc (pthdb_user_t user, void *buf)
{
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, "pdc_free (user = %ld, buf = 0x%lx)", user,
+ fprintf_unfiltered (gdb_stdlog,
+ "pdc_free (user = %ld, buf = 0x%lx)\n", user,
(long) buf);
xfree (buf);
return PDC_SUCCESS;
}
-/* Return a printable representation of pthread STATE. */
+/* Return a printable representation of pthread STATE. */
static char *
state2str (pthdb_state_t state)
{
switch (state)
{
- case PST_IDLE: return "idle"; /* being created */
- case PST_RUN: return "running"; /* running */
- case PST_SLEEP: return "sleeping"; /* awaiting an event */
- case PST_READY: return "ready"; /* runnable */
- case PST_TERM: return "finished"; /* awaiting a join/detach */
- default: return "unknown";
+ case PST_IDLE:
+ /* i18n: Like "Thread-Id %d, [state] idle" */
+ return _("idle"); /* being created */
+ case PST_RUN:
+ /* i18n: Like "Thread-Id %d, [state] running" */
+ return _("running"); /* running */
+ case PST_SLEEP:
+ /* i18n: Like "Thread-Id %d, [state] sleeping" */
+ return _("sleeping"); /* awaiting an event */
+ case PST_READY:
+ /* i18n: Like "Thread-Id %d, [state] ready" */
+ return _("ready"); /* runnable */
+ case PST_TERM:
+ /* i18n: Like "Thread-Id %d, [state] finished" */
+ return _("finished"); /* awaiting a join/detach */
+ default:
+ /* i18n: Like "Thread-Id %d, [state] unknown" */
+ return _("unknown");
}
}
-/* qsort() comparison function for sorting pd_thread structs by pthid. */
+/* qsort() comparison function for sorting pd_thread structs by pthid. */
static int
pcmp (const void *p1v, const void *p2v)
return p1->pthid < p2->pthid ? -1 : p1->pthid > p2->pthid;
}
-/* iterate_over_threads() callback for counting GDB threads. */
+/* iterate_over_threads() callback for counting GDB threads.
+
+ Do not count the main thread (whose tid is zero). This matches
+ the list of threads provided by the pthreaddebug library, which
+ does not include that main thread either, and thus allows us
+ to compare the two lists. */
static int
giter_count (struct thread_info *thread, void *countp)
{
- (*(int *) countp)++;
+ if (PD_TID (thread->ptid))
+ (*(int *) countp)++;
return 0;
}
-/* iterate_over_threads() callback for accumulating GDB thread pids. */
+/* iterate_over_threads() callback for accumulating GDB thread pids.
+
+ Do not include the main thread (whose tid is zero). This matches
+ the list of threads provided by the pthreaddebug library, which
+ does not include that main thread either, and thus allows us
+ to compare the two lists. */
static int
giter_accum (struct thread_info *thread, void *bufp)
{
- **(struct thread_info ***) bufp = thread;
- (*(struct thread_info ***) bufp)++;
+ if (PD_TID (thread->ptid))
+ {
+ **(struct thread_info ***) bufp = thread;
+ (*(struct thread_info ***) bufp)++;
+ }
return 0;
}
/* ptid comparison function */
+
static int
ptid_cmp (ptid_t ptid1, ptid_t ptid2)
{
return 0;
}
-/* qsort() comparison function for sorting thread_info structs by pid. */
+/* qsort() comparison function for sorting thread_info structs by pid. */
static int
gcmp (const void *t1v, const void *t2v)
return ptid_cmp (t1->ptid, t2->ptid);
}
+/* Search through the list of all kernel threads for the thread
+ that has stopped on a SIGTRAP signal, and return its TID.
+ Return 0 if none found. */
+
+static pthdb_tid_t
+get_signaled_thread (void)
+{
+ struct thrdsinfo64 thrinf;
+ tid_t ktid = 0;
+ int result = 0;
+
+ while (1)
+ {
+ if (getthrds (ptid_get_pid (inferior_ptid), &thrinf,
+ sizeof (thrinf), &ktid, 1) != 1)
+ break;
+
+ if (thrinf.ti_cursig == SIGTRAP)
+ return thrinf.ti_tid;
+ }
+
+ /* Didn't find any thread stopped on a SIGTRAP signal. */
+ return 0;
+}
+
/* Synchronize GDB's thread list with libpthdebug's.
There are some benefits of doing this every time the inferior stops:
- - allows users to run thread-specific commands without needing to run
- "info threads" first
+ - allows users to run thread-specific commands without needing to
+ run "info threads" first
- helps pthdb_tid_pthread() work properly (see "libpthdebug
peculiarities" at the top of this module)
- - simplifies the demands placed on libpthdebug, which seems to have
- difficulty with certain call patterns */
+ - simplifies the demands placed on libpthdebug, which seems to
+ have difficulty with certain call patterns */
static void
sync_threadlists (void)
pthread_t pthid;
pthdb_tid_t tid;
- /* Accumulate an array of libpthdebug threads sorted by pthread id. */
+ /* Accumulate an array of libpthdebug threads sorted by pthread id. */
pcount = 0;
psize = 1;
if (pcount == psize)
{
psize *= 2;
- pbuf = (struct pd_thread *) xrealloc (pbuf, psize * sizeof *pbuf);
+ pbuf = (struct pd_thread *) xrealloc (pbuf,
+ psize * sizeof *pbuf);
}
pbuf[pcount].pdtid = pdtid;
pbuf[pcount].pthid = pthid;
qsort (pbuf, pcount, sizeof *pbuf, pcmp);
- /* Accumulate an array of GDB threads sorted by pid. */
+ /* Accumulate an array of GDB threads sorted by pid. */
gcount = 0;
iterate_over_threads (giter_count, &gcount);
iterate_over_threads (giter_accum, &g);
qsort (gbuf, gcount, sizeof *gbuf, gcmp);
- /* Apply differences between the two arrays to GDB's thread list. */
+ /* Apply differences between the two arrays to GDB's thread list. */
- infpid = PIDGET (inferior_ptid);
+ infpid = ptid_get_pid (inferior_ptid);
for (pi = gi = 0; pi < pcount || gi < gcount;)
{
if (pi == pcount)
}
else if (gi == gcount)
{
- thread = add_thread (BUILD_THREAD (pbuf[pi].pthid, infpid));
+ 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;
ptid_t pptid, gptid;
int cmp_result;
- pptid = BUILD_THREAD (pbuf[pi].pthid, infpid);
+ pptid = ptid_build (infpid, 0, pbuf[pi].pthid);
gptid = gbuf[gi]->ptid;
pdtid = pbuf[pi].pdtid;
tid = pbuf[pi].tid;
xfree (gbuf);
}
-/* iterate_over_threads() callback for locating a thread whose kernel thread
- just received a trap signal. */
+/* Iterate_over_threads() callback for locating a thread, using
+ the TID of its associated kernel thread. */
static int
-iter_trap (struct thread_info *thread, void *unused)
+iter_tid (struct thread_info *thread, void *tidp)
{
- struct thrdsinfo64 thrinf;
- pthdb_tid_t tid;
+ const pthdb_tid_t tid = *(pthdb_tid_t *)tidp;
- /* getthrds(3) isn't prototyped in any AIX 4.3.3 #include file. */
- extern int getthrds (pid_t, struct thrdsinfo64 *, int, pthdb_tid_t *, int);
-
- tid = thread->private->tid;
- if (tid == PTHDB_INVALID_TID)
- return 0;
-
- if (getthrds (PIDGET (inferior_ptid), &thrinf, sizeof (thrinf), &tid, 1) != 1)
- return 0;
-
- return thrinf.ti_cursig == SIGTRAP;
+ return (thread->private->tid == tid);
}
-/* Synchronize libpthdebug's state with the inferior and with GDB, generate a
- composite process/thread <pid> for the current thread, set inferior_ptid to
- <pid> if SET_INFPID, and return <pid>. */
+/* Synchronize libpthdebug's state with the inferior and with GDB,
+ generate a composite process/thread <pid> for the current thread,
+ set inferior_ptid to <pid> if SET_INFPID, and return <pid>. */
static ptid_t
pd_update (int set_infpid)
{
int status;
ptid_t ptid;
- struct thread_info *thread;
+ pthdb_tid_t tid;
+ struct thread_info *thread = NULL;
if (!pd_active)
return inferior_ptid;
sync_threadlists ();
- /* Define "current thread" as one that just received a trap signal. */
+ /* Define "current thread" as one that just received a trap signal. */
- thread = iterate_over_threads (iter_trap, NULL);
+ tid = get_signaled_thread ();
+ if (tid != 0)
+ thread = iterate_over_threads (iter_tid, &tid);
if (!thread)
ptid = inferior_ptid;
else
return ptid;
}
-/* Try to start debugging threads in the current process. If successful and
- SET_INFPID, set inferior_ptid to reflect the current thread. */
+/* Try to start debugging threads in the current process.
+ If successful and SET_INFPID, set inferior_ptid to reflect the
+ current thread. */
static ptid_t
pd_activate (int set_infpid)
int status;
status = pthdb_session_init (PD_USER, arch64 ? PEM_64BIT : PEM_32BIT,
- PTHDB_FLAG_REGS, &pd_callbacks, &pd_session);
+ PTHDB_FLAG_REGS, &pd_callbacks,
+ &pd_session);
if (status != PTHDB_SUCCESS)
{
return inferior_ptid;
return pd_update (set_infpid);
}
-/* Undo the effects of pd_activate(). */
+/* Undo the effects of pd_activate(). */
static void
pd_deactivate (void)
pd_active = 0;
}
-/* An object file has just been loaded. Check whether the current application
- is pthreaded, and if so, prepare for thread debugging. */
+/* An object file has just been loaded. Check whether the current
+ application is pthreaded, and if so, prepare for thread debugging. */
static void
pd_enable (void)
char *stub_name;
struct minimal_symbol *ms;
- /* Don't initialize twice. */
+ /* Don't initialize twice. */
if (pd_able)
return;
- /* Check application word size. */
- arch64 = REGISTER_RAW_SIZE (0) == 8;
+ /* Check application word size. */
+ arch64 = register_size (target_gdbarch (), 0) == 8;
- /* Check whether the application is pthreaded. */
+ /* Check whether the application is pthreaded. */
stub_name = NULL;
- status = pthdb_session_pthreaded (PD_USER, PTHDB_FLAG_REGS, &pd_callbacks,
- &stub_name);
- if ((status != PTHDB_SUCCESS && status != PTHDB_NOT_PTHREADED) || !stub_name)
+ status = pthdb_session_pthreaded (PD_USER, PTHDB_FLAG_REGS,
+ &pd_callbacks, &stub_name);
+ if ((status != PTHDB_SUCCESS
+ && status != PTHDB_NOT_PTHREADED) || !stub_name)
return;
- /* Set a breakpoint on the returned stub function. */
+ /* Set a breakpoint on the returned stub function. */
if (!(ms = lookup_minimal_symbol (stub_name, NULL, NULL)))
return;
pd_brk_addr = SYMBOL_VALUE_ADDRESS (ms);
- if (!create_thread_event_breakpoint (pd_brk_addr))
+ if (!create_thread_event_breakpoint (target_gdbarch (), pd_brk_addr))
return;
- /* Prepare for thread debugging. */
- base_ops = current_target;
- push_target (&ops);
+ /* Prepare for thread debugging. */
+ push_target (&aix_thread_ops);
pd_able = 1;
- /* 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. */
+ /* 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);
}
-/* Undo the effects of pd_enable(). */
+/* Undo the effects of pd_enable(). */
static void
pd_disable (void)
if (pd_active)
pd_deactivate ();
pd_able = 0;
- unpush_target (&ops);
+ unpush_target (&aix_thread_ops);
}
-/* target_new_objfile_hook callback.
+/* new_objfile observer callback.
- If OBJFILE is non-null, check whether a threaded application is being
- debugged, and if so, prepare for thread debugging.
+ If OBJFILE is non-null, check whether a threaded application is
+ being debugged, and if so, prepare for thread debugging.
- If OBJFILE is null, stop debugging threads. */
+ If OBJFILE is null, stop debugging threads. */
static void
new_objfile (struct objfile *objfile)
pd_enable ();
else
pd_disable ();
-
- if (target_new_objfile_chain)
- target_new_objfile_chain (objfile);
}
-/* Attach to process specified by ARGS. */
+/* Attach to process specified by ARGS. */
static void
-ops_attach (char *args, int from_tty)
+aix_thread_attach (struct target_ops *ops, char *args, int from_tty)
{
- base_ops.to_attach (args, from_tty);
+ struct target_ops *beneath = find_target_beneath (ops);
+
+ beneath->to_attach (beneath, args, from_tty);
pd_activate (1);
}
-/* Detach from the process attached to by ops_attach(). */
+/* Detach from the process attached to by aix_thread_attach(). */
static void
-ops_detach (char *args, int from_tty)
+aix_thread_detach (struct target_ops *ops, const char *args, int from_tty)
{
- pd_deactivate ();
- base_ops.to_detach (args, from_tty);
+ struct target_ops *beneath = find_target_beneath (ops);
+
+ pd_disable ();
+ beneath->to_detach (beneath, args, from_tty);
}
/* Tell the inferior process to continue running thread PID if != -1
- and all threads otherwise. */
+ and all threads otherwise. */
static void
-ops_resume (ptid_t ptid, int step, enum target_signal sig)
+aix_thread_resume (struct target_ops *ops,
+ ptid_t ptid, int step, enum gdb_signal sig)
{
struct thread_info *thread;
pthdb_tid_t tid[2];
if (!PD_TID (ptid))
- CALL_BASE (base_ops.to_resume (ptid, step, sig));
+ {
+ struct cleanup *cleanup = save_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
{
- thread = find_thread_pid (ptid);
+ thread = find_thread_ptid (ptid);
if (!thread)
- error ("aix-thread resume: unknown pthread %ld", TIDGET (ptid));
+ error (_("aix-thread resume: unknown pthread %ld"),
+ ptid_get_lwp (ptid));
tid[0] = thread->private->tid;
if (tid[0] == PTHDB_INVALID_TID)
- error ("aix-thread resume: no tid for pthread %ld", TIDGET (ptid));
+ error (_("aix-thread resume: no tid for pthread %ld"),
+ ptid_get_lwp (ptid));
tid[1] = 0;
if (arch64)
- ptrace64aix (PTT_CONTINUE, tid[0], 1, target_signal_to_host (sig), (int *)tid);
+ ptrace64aix (PTT_CONTINUE, tid[0], (long long) 1,
+ gdb_signal_to_host (sig), (void *) tid);
else
- ptrace32 (PTT_CONTINUE, tid[0], (int *) 1,
- target_signal_to_host (sig), (int *)tid);
+ ptrace32 (PTT_CONTINUE, tid[0], (addr_ptr) 1,
+ gdb_signal_to_host (sig), (void *) tid);
}
}
-/* Wait for thread/process ID if != -1 or for any thread otherwise. If an
- error occurs, return -1, else return the pid of the stopped thread. */
+/* Wait for thread/process ID if != -1 or for any thread otherwise.
+ If an error occurs, return -1, else return the pid of the stopped
+ thread. */
static ptid_t
-ops_wait (ptid_t ptid, struct target_waitstatus *status)
+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);
- CALL_BASE (ptid = base_ops.to_wait (ptid, status));
- if (PIDGET (ptid) == -1)
+
+ inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
+ ptid = beneath->to_wait (beneath, ptid, status, options);
+ do_cleanups (cleanup);
+
+ if (ptid_get_pid (ptid) == -1)
return pid_to_ptid (-1);
- /* Check whether libpthdebug might be ready to be initialized. */
- if (!pd_active && status->kind == TARGET_WAITKIND_STOPPED &&
- status->value.sig == TARGET_SIGNAL_TRAP &&
- read_pc_pid (ptid) - DECR_PC_AFTER_BREAK == pd_brk_addr)
- return pd_activate (0);
+ /* Check whether libpthdebug might be ready to be initialized. */
+ if (!pd_active && status->kind == TARGET_WAITKIND_STOPPED
+ && status->value.sig == GDB_SIGNAL_TRAP)
+ {
+ struct regcache *regcache = get_thread_regcache (ptid);
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+
+ if (regcache_read_pc (regcache)
+ - target_decr_pc_after_break (gdbarch) == pd_brk_addr)
+ return pd_activate (0);
+ }
return pd_update (0);
}
-/* Record that the 64-bit general-purpose registers contain VALS. */
+/* Record that the 64-bit general-purpose registers contain VALS. */
static void
-supply_gprs64 (uint64_t *vals)
+supply_gprs64 (struct regcache *regcache, uint64_t *vals)
{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache));
int regno;
- for (regno = 0; regno < 32; regno++)
- supply_register (regno, (char *) (vals + regno));
+ for (regno = 0; regno < ppc_num_gprs; regno++)
+ regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + regno,
+ (char *) (vals + regno));
}
-/* Record that 32-bit register REGNO contains VAL. */
+/* Record that 32-bit register REGNO contains VAL. */
static void
-supply_reg32 (int regno, uint32_t val)
+supply_reg32 (struct regcache *regcache, int regno, uint32_t val)
{
- supply_register (regno, (char *) &val);
+ regcache_raw_supply (regcache, regno, (char *) &val);
}
-/* Record that the floating-point registers contain VALS. */
+/* Record that the floating-point registers contain VALS. */
static void
-supply_fprs (double *vals)
+supply_fprs (struct regcache *regcache, double *vals)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
int regno;
- for (regno = 0; regno < 32; regno++)
- supply_register (regno + FP0_REGNUM, (char *) (vals + regno));
+ /* This function should never be called on architectures without
+ floating-point registers. */
+ gdb_assert (ppc_floating_point_unit_p (gdbarch));
+
+ 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));
+}
+
+/* Predicate to test whether given register number is a "special" register. */
+static int
+special_register_p (struct gdbarch *gdbarch, int regno)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ return regno == gdbarch_pc_regnum (gdbarch)
+ || regno == tdep->ppc_ps_regnum
+ || regno == tdep->ppc_cr_regnum
+ || regno == tdep->ppc_lr_regnum
+ || regno == tdep->ppc_ctr_regnum
+ || regno == tdep->ppc_xer_regnum
+ || (tdep->ppc_fpscr_regnum >= 0 && regno == tdep->ppc_fpscr_regnum)
+ || (tdep->ppc_mq_regnum >= 0 && regno == tdep->ppc_mq_regnum);
}
-/* Record that the special registers contain the specified 64-bit and 32-bit
- values. */
+
+/* Record that the special registers contain the specified 64-bit and
+ 32-bit values. */
static void
-supply_sprs64 (uint64_t iar, uint64_t msr, uint32_t cr,
- uint64_t lr, uint64_t ctr, uint32_t xer)
+supply_sprs64 (struct regcache *regcache,
+ uint64_t iar, uint64_t msr, uint32_t cr,
+ uint64_t lr, uint64_t ctr, uint32_t xer,
+ uint32_t fpscr)
{
- int regno = FIRST_UISA_SP_REGNUM;
- supply_register (regno, (char *) &iar);
- supply_register (regno + 1, (char *) &msr);
- supply_register (regno + 2, (char *) &cr);
- supply_register (regno + 3, (char *) &lr);
- supply_register (regno + 4, (char *) &ctr);
- supply_register (regno + 5, (char *) &xer);
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ 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);
+ if (tdep->ppc_fpscr_regnum >= 0)
+ regcache_raw_supply (regcache, tdep->ppc_fpscr_regnum,
+ (char *) &fpscr);
}
-/* Record that the special registers contain the specified 32-bit values. */
+/* Record that the special registers contain the specified 32-bit
+ values. */
static void
-supply_sprs32 (uint32_t iar, uint32_t msr, uint32_t cr,
- uint32_t lr, uint32_t ctr, uint32_t xer)
+supply_sprs32 (struct regcache *regcache,
+ uint32_t iar, uint32_t msr, uint32_t cr,
+ uint32_t lr, uint32_t ctr, uint32_t xer,
+ uint32_t fpscr)
{
- int regno = FIRST_UISA_SP_REGNUM;
- supply_register (regno, (char *) &iar);
- supply_register (regno + 1, (char *) &msr);
- supply_register (regno + 2, (char *) &cr);
- supply_register (regno + 3, (char *) &lr);
- supply_register (regno + 4, (char *) &ctr);
- supply_register (regno + 5, (char *) &xer);
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ 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);
+ if (tdep->ppc_fpscr_regnum >= 0)
+ regcache_raw_supply (regcache, tdep->ppc_fpscr_regnum,
+ (char *) &fpscr);
}
/* Fetch all registers from pthread PDTID, which doesn't have a kernel
thread.
- There's no way to query a single register from a non-kernel pthread,
- so there's no need for a single-register version of this function. */
+ There's no way to query a single register from a non-kernel
+ pthread, so there's no need for a single-register version of this
+ function. */
static void
-fetch_regs_lib (pthdb_pthread_t pdtid)
+fetch_regs_user_thread (struct regcache *regcache, pthdb_pthread_t pdtid)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
int status, i;
pthdb_context_t ctx;
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, "fetch_regs_lib %lx\n", (long)pdtid);
+ fprintf_unfiltered (gdb_stdlog,
+ "fetch_regs_user_thread %lx\n", (long) pdtid);
status = pthdb_pthread_context (pd_session, pdtid, &ctx);
if (status != PTHDB_SUCCESS)
- PD_ERROR ("fetch_registers: pthdb_pthread_context", status);
+ error (_("aix-thread: fetch_registers: pthdb_pthread_context returned %s"),
+ pd_status2str (status));
- /* General-purpose registers. */
+ /* General-purpose registers. */
if (arch64)
- supply_gprs64 (ctx.gpr);
+ supply_gprs64 (regcache, ctx.gpr);
else
- for (i = 0; i < 32; i++)
- supply_reg32 (i, ctx.gpr[i]);
+ for (i = 0; i < ppc_num_gprs; i++)
+ supply_reg32 (regcache, tdep->ppc_gp0_regnum + i, ctx.gpr[i]);
- /* Floating-point registers. */
+ /* Floating-point registers. */
- supply_fprs (ctx.fpr);
+ if (ppc_floating_point_unit_p (gdbarch))
+ supply_fprs (regcache, ctx.fpr);
- /* Special registers. */
+ /* Special registers. */
if (arch64)
- supply_sprs64 (ctx.iar, ctx.msr, ctx.cr, ctx.lr, ctx.ctr, ctx.xer);
+ supply_sprs64 (regcache, ctx.iar, ctx.msr, ctx.cr, ctx.lr, ctx.ctr,
+ ctx.xer, ctx.fpscr);
else
- supply_sprs32 (ctx.iar, ctx.msr, ctx.cr, ctx.lr, ctx.ctr, ctx.xer);
+ supply_sprs32 (regcache, ctx.iar, ctx.msr, ctx.cr, ctx.lr, ctx.ctr,
+ ctx.xer, ctx.fpscr);
}
-/* Fetch register REGNO if != -1 or all registers otherwise from kernel thread
- TID.
+/* Fetch register REGNO if != -1 or all registers otherwise from
+ kernel thread TID.
- AIX provides a way to query all of a kernel thread's GPRs, FPRs, or SPRs,
- but there's no way to query individual registers within those groups.
- Therefore, if REGNO != -1, this function fetches an entire group.
+ AIX provides a way to query all of a kernel thread's GPRs, FPRs, or
+ SPRs, but there's no way to query individual registers within those
+ groups. Therefore, if REGNO != -1, this function fetches an entire
+ group.
- Unfortunately, kernel thread register queries often fail with EPERM,
- indicating that the thread is in kernel space. This breaks backtraces of
- threads other than the current one. To make that breakage obvious without
- throwing an error to top level (which is bad e.g. during "info threads"
- output), zero registers that can't be retrieved. */
+ Unfortunately, kernel thread register queries often fail with
+ EPERM, indicating that the thread is in kernel space. This breaks
+ backtraces of threads other than the current one. To make that
+ breakage obvious without throwing an error to top level (which is
+ bad e.g. during "info threads" output), zero registers that can't
+ be retrieved. */
static void
-fetch_regs_kern (int regno, pthdb_tid_t tid)
+fetch_regs_kernel_thread (struct regcache *regcache, int regno,
+ pthdb_tid_t tid)
{
- uint64_t gprs64[32];
- uint32_t gprs32[32];
- double fprs[32];
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ uint64_t gprs64[ppc_num_gprs];
+ uint32_t gprs32[ppc_num_gprs];
+ double fprs[ppc_num_fprs];
struct ptxsprs sprs64;
struct ptsprs sprs32;
int i;
if (debug_aix_thread)
fprintf_unfiltered (gdb_stdlog,
- "fetch_regs_kern tid=%lx regno=%d arch64=%d\n",
- (long)tid, regno, arch64);
+ "fetch_regs_kernel_thread tid=%lx regno=%d arch64=%d\n",
+ (long) tid, regno, arch64);
- /* General-purpose registers. */
- if (regno == -1 || regno < FP0_REGNUM)
+ /* General-purpose registers. */
+ if (regno == -1
+ || (tdep->ppc_gp0_regnum <= regno
+ && regno < tdep->ppc_gp0_regnum + ppc_num_gprs))
{
if (arch64)
{
- if (!ptrace64aix (PTT_READ_GPRS, tid, (unsigned long) gprs64, 0, NULL))
+ if (!ptrace64aix (PTT_READ_GPRS, tid,
+ (unsigned long) gprs64, 0, NULL))
memset (gprs64, 0, sizeof (gprs64));
- supply_gprs64 (gprs64);
+ supply_gprs64 (regcache, gprs64);
}
else
{
- if (!ptrace32 (PTT_READ_GPRS, tid, gprs32, 0, NULL))
+ if (!ptrace32 (PTT_READ_GPRS, tid, (uintptr_t) gprs32, 0, NULL))
memset (gprs32, 0, sizeof (gprs32));
- for (i = 0; i < 32; i++)
- supply_reg32 (i, gprs32[i]);
+ for (i = 0; i < ppc_num_gprs; i++)
+ supply_reg32 (regcache, tdep->ppc_gp0_regnum + i, gprs32[i]);
}
}
- /* Floating-point registers. */
+ /* Floating-point registers. */
- if (regno == -1 || (regno >= FP0_REGNUM && regno <= FPLAST_REGNUM))
+ if (ppc_floating_point_unit_p (gdbarch)
+ && (regno == -1
+ || (regno >= tdep->ppc_fp0_regnum
+ && regno < tdep->ppc_fp0_regnum + ppc_num_fprs)))
{
- if (!ptrace32 (PTT_READ_FPRS, tid, (int *) fprs, 0, NULL))
+ if (!ptrace32 (PTT_READ_FPRS, tid, (uintptr_t) fprs, 0, NULL))
memset (fprs, 0, sizeof (fprs));
- supply_fprs (fprs);
+ supply_fprs (regcache, fprs);
}
- /* Special-purpose registers. */
+ /* Special-purpose registers. */
- if (regno == -1 || (regno > FPLAST_REGNUM && regno <= LAST_UISA_SP_REGNUM))
+ if (regno == -1 || special_register_p (gdbarch, regno))
{
if (arch64)
{
- if (!ptrace64aix (PTT_READ_SPRS, tid, (unsigned long) &sprs64, 0, NULL))
+ if (!ptrace64aix (PTT_READ_SPRS, tid,
+ (unsigned long) &sprs64, 0, NULL))
memset (&sprs64, 0, sizeof (sprs64));
- supply_sprs64 (sprs64.pt_iar, sprs64.pt_msr, sprs64.pt_cr,
- sprs64.pt_lr, sprs64.pt_ctr, sprs64.pt_xer);
+ supply_sprs64 (regcache, sprs64.pt_iar, sprs64.pt_msr,
+ sprs64.pt_cr, sprs64.pt_lr, sprs64.pt_ctr,
+ sprs64.pt_xer, sprs64.pt_fpscr);
}
else
{
- if (!ptrace32 (PTT_READ_SPRS, tid, (int *) &sprs32, 0, NULL))
+ 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 (sprs32.pt_iar, sprs32.pt_msr, sprs32.pt_cr,
- sprs32.pt_lr, sprs32.pt_ctr, sprs32.pt_xer);
+ supply_sprs32 (regcache, sprs32.pt_iar, sprs32.pt_msr, sprs32.pt_cr,
+ sprs32.pt_lr, sprs32.pt_ctr, sprs32.pt_xer,
+ sprs32.pt_fpscr);
- if (REGISTER_RAW_SIZE (LAST_UISA_SP_REGNUM))
- supply_register (LAST_UISA_SP_REGNUM, (char *) &sprs32.pt_mq);
+ if (tdep->ppc_mq_regnum >= 0)
+ regcache_raw_supply (regcache, tdep->ppc_mq_regnum,
+ (char *) &sprs32.pt_mq);
}
}
}
/* Fetch register REGNO if != -1 or all registers otherwise in the
- thread/process specified by inferior_ptid. */
+ thread/process specified by inferior_ptid. */
static void
-ops_fetch_registers (int regno)
+aix_thread_fetch_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
struct thread_info *thread;
pthdb_tid_t tid;
+ struct target_ops *beneath = find_target_beneath (ops);
if (!PD_TID (inferior_ptid))
- base_ops.to_fetch_registers (regno);
+ beneath->to_fetch_registers (beneath, regcache, regno);
else
{
- thread = find_thread_pid (inferior_ptid);
+ thread = find_thread_ptid (inferior_ptid);
tid = thread->private->tid;
if (tid == PTHDB_INVALID_TID)
- fetch_regs_lib (thread->private->pdtid);
+ fetch_regs_user_thread (regcache, thread->private->pdtid);
else
- fetch_regs_kern (regno, tid);
+ fetch_regs_kernel_thread (regcache, regno, tid);
}
}
+/* Store the gp registers into an array of uint32_t or uint64_t. */
+
+static void
+fill_gprs64 (const struct regcache *regcache, uint64_t *vals)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache));
+ 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);
+}
+
+static void
+fill_gprs32 (const struct regcache *regcache, uint32_t *vals)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache));
+ 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);
+}
+
+/* Store the floating point registers into a double array. */
+static void
+fill_fprs (const struct regcache *regcache, double *vals)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ int regno;
+
+ /* This function should never be called on architectures without
+ floating-point registers. */
+ gdb_assert (ppc_floating_point_unit_p (gdbarch));
+
+ 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);
+}
+
/* Store the special registers into the specified 64-bit and 32-bit
- locations. */
+ locations. */
+
+static void
+fill_sprs64 (const struct regcache *regcache,
+ uint64_t *iar, uint64_t *msr, uint32_t *cr,
+ uint64_t *lr, uint64_t *ctr, uint32_t *xer,
+ uint32_t *fpscr)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ /* Verify that the size of the size of the IAR buffer is the
+ same as the raw size of the PC (in the register cache). If
+ they're not, then either GDB has been built incorrectly, or
+ there's some other kind of internal error. To be really safe,
+ we should check all of the sizes. */
+ 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 (tdep->ppc_fpscr_regnum >= 0
+ && REG_VALID == regcache_register_status (regcache,
+ tdep->ppc_fpscr_regnum))
+ regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr);
+}
static void
-fill_sprs64 (uint64_t *iar, uint64_t *msr, uint32_t *cr,
- uint64_t *lr, uint64_t *ctr, uint32_t *xer)
+fill_sprs32 (const struct regcache *regcache,
+ uint32_t *iar, uint32_t *msr, uint32_t *cr,
+ uint32_t *lr, uint32_t *ctr, uint32_t *xer,
+ uint32_t *fpscr)
{
- int regno = FIRST_UISA_SP_REGNUM;
- *iar = read_register (regno);
- *msr = read_register (regno + 1);
- *cr = read_register (regno + 2);
- *lr = read_register (regno + 3);
- *ctr = read_register (regno + 4);
- *xer = read_register (regno + 5);
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ /* Verify that the size of the size of the IAR buffer is the
+ same as the raw size of the PC (in the register cache). If
+ they're not, then either GDB has been built incorrectly, or
+ there's some other kind of internal error. To be really safe,
+ we should check all of the sizes. */
+ 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 (tdep->ppc_fpscr_regnum >= 0
+ && REG_VALID == regcache_register_status (regcache, tdep->ppc_fpscr_regnum))
+ regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr);
}
/* Store all registers into pthread PDTID, which doesn't have a kernel
thread.
- It's possible to store a single register into a non-kernel pthread, but I
- doubt it's worth the effort. */
+ It's possible to store a single register into a non-kernel pthread,
+ but I doubt it's worth the effort. */
static void
-store_regs_lib (pthdb_pthread_t pdtid)
+store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
int status, i;
pthdb_context_t ctx;
+ uint32_t int32;
+ uint64_t int64;
+ double dbl;
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, "store_regs_lib %lx\n", (long)pdtid);
+ fprintf_unfiltered (gdb_stdlog,
+ "store_regs_user_thread %lx\n", (long) pdtid);
- /* Retrieve the thread's current context for its non-register values. */
+ /* Retrieve the thread's current context for its non-register
+ values. */
status = pthdb_pthread_context (pd_session, pdtid, &ctx);
if (status != PTHDB_SUCCESS)
- PD_ERROR ("store_registers: pthdb_pthread_context", status);
-
- /* General-purpose registers. */
-
- for (i = 0; i < 32; i++)
- ctx.gpr[i] = read_register (i);
-
- /* Floating-point registers. */
-
- for (i = 0; i < 32; i++)
- ctx.fpr[i] = *(double *) ®isters[REGISTER_BYTE (FP0_REGNUM + i)];
-
- /* Special registers. */
-
- fill_sprs64 (&ctx.iar, &ctx.msr, &ctx.cr, &ctx.lr, &ctx.ctr, &ctx.xer);
+ error (_("aix-thread: store_registers: pthdb_pthread_context returned %s"),
+ pd_status2str (status));
+
+ /* 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 (arch64)
+ {
+ regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + i,
+ (void *) &int64);
+ ctx.gpr[i] = int64;
+ }
+ else
+ {
+ regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + i,
+ (void *) &int32);
+ ctx.gpr[i] = int32;
+ }
+ }
+
+ /* Collect floating-point register values from the regcache. */
+ if (ppc_floating_point_unit_p (gdbarch))
+ fill_fprs (regcache, ctx.fpr);
+
+ /* Special registers (always kept in ctx as 64 bits). */
+ if (arch64)
+ {
+ fill_sprs64 (regcache, &ctx.iar, &ctx.msr, &ctx.cr, &ctx.lr, &ctx.ctr,
+ &ctx.xer, &ctx.fpscr);
+ }
+ else
+ {
+ /* Problem: ctx.iar etc. are 64 bits, but raw_registers are 32.
+ Solution: use 32-bit temp variables. */
+ uint32_t tmp_iar, tmp_msr, tmp_cr, tmp_lr, tmp_ctr, tmp_xer,
+ tmp_fpscr;
+
+ 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)))
+ ctx.iar = tmp_iar;
+ if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ps_regnum))
+ ctx.msr = tmp_msr;
+ if (REG_VALID == regcache_register_status (regcache, tdep->ppc_cr_regnum))
+ ctx.cr = tmp_cr;
+ if (REG_VALID == regcache_register_status (regcache, tdep->ppc_lr_regnum))
+ ctx.lr = tmp_lr;
+ if (REG_VALID == regcache_register_status (regcache,
+ tdep->ppc_ctr_regnum))
+ ctx.ctr = tmp_ctr;
+ if (REG_VALID == regcache_register_status (regcache,
+ tdep->ppc_xer_regnum))
+ ctx.xer = tmp_xer;
+ if (REG_VALID == regcache_register_status (regcache,
+ tdep->ppc_xer_regnum))
+ ctx.fpscr = tmp_fpscr;
+ }
status = pthdb_pthread_setcontext (pd_session, pdtid, &ctx);
if (status != PTHDB_SUCCESS)
- PD_ERROR ("store_registers: pthdb_pthread_setcontext", status);
+ error (_("aix-thread: store_registers: "
+ "pthdb_pthread_setcontext returned %s"),
+ pd_status2str (status));
}
-/* Store register REGNO if != -1 or all registers otherwise into kernel
- thread TID.
+/* Store register REGNO if != -1 or all registers otherwise into
+ kernel thread TID.
- AIX provides a way to set all of a kernel thread's GPRs, FPRs, or SPRs, but
- there's no way to set individual registers within those groups. Therefore,
- if REGNO != -1, this function stores an entire group. */
+ AIX provides a way to set all of a kernel thread's GPRs, FPRs, or
+ SPRs, but there's no way to set individual registers within those
+ groups. Therefore, if REGNO != -1, this function stores an entire
+ group. */
static void
-store_regs_kern (int regno, pthdb_tid_t tid)
+store_regs_kernel_thread (const struct regcache *regcache, int regno,
+ pthdb_tid_t tid)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ uint64_t gprs64[ppc_num_gprs];
+ uint32_t gprs32[ppc_num_gprs];
+ double fprs[ppc_num_fprs];
struct ptxsprs sprs64;
- struct ptsprs sprs32;
- char *regp;
+ struct ptsprs sprs32;
+ int i;
if (debug_aix_thread)
- fprintf_unfiltered (gdb_stdlog, "store_regs_kern tid=%lx regno=%d\n",
- (long)tid, regno);
-
- /* General-purpose registers. */
- if (regno == -1 || regno < FP0_REGNUM)
+ fprintf_unfiltered (gdb_stdlog,
+ "store_regs_kernel_thread tid=%lx regno=%d\n",
+ (long) tid, regno);
+
+ /* General-purpose registers. */
+ if (regno == -1
+ || (tdep->ppc_gp0_regnum <= regno
+ && regno < tdep->ppc_gp0_regnum + ppc_num_fprs))
{
- regp = ®isters[REGISTER_BYTE (0)];
if (arch64)
- ptrace64aix (PTT_WRITE_GPRS, tid, (unsigned long) regp, 0, NULL);
+ {
+ /* Pre-fetch: some regs may not be in the cache. */
+ ptrace64aix (PTT_READ_GPRS, tid, (unsigned long) gprs64, 0, NULL);
+ fill_gprs64 (regcache, gprs64);
+ ptrace64aix (PTT_WRITE_GPRS, tid, (unsigned long) gprs64, 0, NULL);
+ }
else
- ptrace32 (PTT_WRITE_GPRS, tid, (int *) regp, 0, NULL);
+ {
+ /* Pre-fetch: some regs may not be in the cache. */
+ ptrace32 (PTT_READ_GPRS, tid, (uintptr_t) gprs32, 0, NULL);
+ fill_gprs32 (regcache, gprs32);
+ ptrace32 (PTT_WRITE_GPRS, tid, (uintptr_t) gprs32, 0, NULL);
+ }
}
- /* Floating-point registers. */
+ /* Floating-point registers. */
- if (regno == -1 || (regno >= FP0_REGNUM && regno <= FPLAST_REGNUM))
+ if (ppc_floating_point_unit_p (gdbarch)
+ && (regno == -1
+ || (regno >= tdep->ppc_fp0_regnum
+ && regno < tdep->ppc_fp0_regnum + ppc_num_fprs)))
{
- regp = ®isters[REGISTER_BYTE (FP0_REGNUM)];
- ptrace32 (PTT_WRITE_FPRS, tid, (int *) regp, 0, NULL);
+ /* Pre-fetch: some regs may not be in the cache. */
+ ptrace32 (PTT_READ_FPRS, tid, (uintptr_t) fprs, 0, NULL);
+ fill_fprs (regcache, fprs);
+ ptrace32 (PTT_WRITE_FPRS, tid, (uintptr_t) fprs, 0, NULL);
}
- /* Special-purpose registers. */
+ /* Special-purpose registers. */
- if (regno == -1 || (regno > FPLAST_REGNUM && regno <= LAST_UISA_SP_REGNUM))
+ if (regno == -1 || special_register_p (gdbarch, regno))
{
if (arch64)
{
- ptrace64aix (PTT_READ_SPRS, tid, (unsigned long) &sprs64, 0, NULL);
- fill_sprs64 (&sprs64.pt_iar, &sprs64.pt_msr, &sprs64.pt_cr,
- &sprs64.pt_lr, &sprs64.pt_ctr, &sprs64.pt_xer);
- ptrace64aix (PTT_WRITE_SPRS, tid, (unsigned long) &sprs64, 0, NULL);
+ /* Pre-fetch: some registers won't be in the cache. */
+ ptrace64aix (PTT_READ_SPRS, tid,
+ (unsigned long) &sprs64, 0, NULL);
+ fill_sprs64 (regcache, &sprs64.pt_iar, &sprs64.pt_msr,
+ &sprs64.pt_cr, &sprs64.pt_lr, &sprs64.pt_ctr,
+ &sprs64.pt_xer, &sprs64.pt_fpscr);
+ ptrace64aix (PTT_WRITE_SPRS, tid,
+ (unsigned long) &sprs64, 0, NULL);
}
else
{
- ptrace32 (PTT_READ_SPRS, tid, (int *) &sprs32, 0, NULL);
-
- regno = FIRST_UISA_SP_REGNUM;
- sprs32.pt_iar = read_register (regno);
- sprs32.pt_msr = read_register (regno + 1);
- sprs32.pt_cr = read_register (regno + 2);
- sprs32.pt_lr = read_register (regno + 3);
- sprs32.pt_ctr = read_register (regno + 4);
- sprs32.pt_xer = read_register (regno + 5);
-
- if (REGISTER_RAW_SIZE (LAST_UISA_SP_REGNUM))
- sprs32.pt_mq = read_register (LAST_UISA_SP_REGNUM);
-
- ptrace32 (PTT_WRITE_SPRS, tid, (int *) &sprs32, 0, NULL);
+ /* The contents of "struct ptspr" were declared as "unsigned
+ long" up to AIX 5.2, but are "unsigned int" since 5.3.
+ Use temporaries to work around this problem. Also, add an
+ assert here to make sure we fail if the system header files
+ use "unsigned long", and the size of that type is not what
+ the headers expect. */
+ uint32_t tmp_iar, tmp_msr, tmp_cr, tmp_lr, tmp_ctr, tmp_xer,
+ tmp_fpscr;
+
+ gdb_assert (sizeof (sprs32.pt_iar) == 4);
+
+ /* Pre-fetch: some registers won't be in the cache. */
+ ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL);
+
+ fill_sprs32 (regcache, &tmp_iar, &tmp_msr, &tmp_cr, &tmp_lr,
+ &tmp_ctr, &tmp_xer, &tmp_fpscr);
+
+ sprs32.pt_iar = tmp_iar;
+ sprs32.pt_msr = tmp_msr;
+ sprs32.pt_cr = tmp_cr;
+ sprs32.pt_lr = tmp_lr;
+ sprs32.pt_ctr = tmp_ctr;
+ sprs32.pt_xer = tmp_xer;
+ 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);
+
+ ptrace32 (PTT_WRITE_SPRS, tid, (uintptr_t) &sprs32, 0, NULL);
}
}
}
-/* Store gdb's current view of the register set into the thread/process
- specified by inferior_ptid. */
+/* Store gdb's current view of the register set into the
+ thread/process specified by inferior_ptid. */
static void
-ops_store_registers (int regno)
+aix_thread_store_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
struct thread_info *thread;
pthdb_tid_t tid;
+ struct target_ops *beneath = find_target_beneath (ops);
if (!PD_TID (inferior_ptid))
- base_ops.to_store_registers (regno);
+ beneath->to_store_registers (beneath, regcache, regno);
else
{
- thread = find_thread_pid (inferior_ptid);
+ thread = find_thread_ptid (inferior_ptid);
tid = thread->private->tid;
if (tid == PTHDB_INVALID_TID)
- store_regs_lib (thread->private->pdtid);
+ store_regs_user_thread (regcache, thread->private->pdtid);
else
- store_regs_kern (regno, tid);
+ store_regs_kernel_thread (regcache, regno, tid);
}
}
-/* Prepare to modify the registers array. */
+/* Implement the to_xfer_partial target_ops method. */
-static void
-ops_prepare_to_store (void)
+static enum target_xfer_status
+aix_thread_xfer_partial (struct target_ops *ops, enum target_object object,
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf,
+ ULONGEST offset, ULONGEST len, ULONGEST *xfered_len)
{
- if (!PD_TID (inferior_ptid))
- base_ops.to_prepare_to_store ();
- else
- read_register_bytes (0, NULL, REGISTER_BYTES);
-}
-
-/* Transfer LEN bytes of memory from GDB address MYADDR to target address
- MEMADDR if WRITE and vice versa otherwise. */
+ struct cleanup *old_chain = save_inferior_ptid ();
+ enum target_xfer_status xfer;
+ struct target_ops *beneath = find_target_beneath (ops);
-static int
-ops_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
- struct mem_attrib *attrib,
- struct target_ops *target)
-{
- int n;
+ inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
+ xfer = beneath->to_xfer_partial (beneath, object, annex, readbuf,
+ writebuf, offset, len, xfered_len);
- CALL_BASE (n = base_ops.to_xfer_memory (memaddr, myaddr, len, write,
- attrib, &base_ops));
- return n;
+ do_cleanups (old_chain);
+ return xfer;
}
-/* Kill and forget about the inferior process. */
+/* Clean up after the inferior exits. */
static void
-ops_kill (void)
+aix_thread_mourn_inferior (struct target_ops *ops)
{
- CALL_BASE (base_ops.to_kill ());
-}
-
-/* Clean up after the inferior exits. */
+ struct target_ops *beneath = find_target_beneath (ops);
-static void
-ops_mourn_inferior (void)
-{
pd_deactivate ();
- base_ops.to_mourn_inferior ();
+ beneath->to_mourn_inferior (beneath);
}
-/* Return whether thread PID is still valid. */
+/* Return whether thread PID is still valid. */
static int
-ops_thread_alive (ptid_t ptid)
+aix_thread_thread_alive (struct target_ops *ops, ptid_t ptid)
{
+ struct target_ops *beneath = find_target_beneath (ops);
+
if (!PD_TID (ptid))
- return base_ops.to_thread_alive (ptid);
+ return beneath->to_thread_alive (beneath, ptid);
- /* We update the thread list every time the child stops, so all valid
- threads should be in the thread list. */
+ /* We update the thread list every time the child stops, so all
+ valid threads should be in the thread list. */
return in_thread_list (ptid);
}
-/* Return a printable representation of composite PID for use in "info
- threads" output. */
+/* Return a printable representation of composite PID for use in
+ "info threads" output. */
static char *
-ops_pid_to_str (ptid_t ptid)
+aix_thread_pid_to_str (struct target_ops *ops, ptid_t ptid)
{
static char *ret = NULL;
+ struct target_ops *beneath = find_target_beneath (ops);
if (!PD_TID (ptid))
- return base_ops.to_pid_to_str (ptid);
+ return beneath->to_pid_to_str (beneath, ptid);
/* Free previous return value; a new one will be allocated by
- xasprintf(). */
+ xstrprintf(). */
xfree (ret);
- xasprintf (&ret, "Thread %ld", ptid_get_tid (ptid));
+ ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid));
return ret;
}
-/* Return a printable representation of extra information about THREAD, for
- use in "info threads" output. */
+/* Return a printable representation of extra information about
+ THREAD, for use in "info threads" output. */
static char *
-ops_extra_thread_info (struct thread_info *thread)
+aix_thread_extra_thread_info (struct thread_info *thread)
{
struct ui_file *buf;
int status;
pthdb_suspendstate_t suspendstate;
pthdb_detachstate_t detachstate;
int cancelpend;
- long length;
static char *ret = NULL;
if (!PD_TID (thread->ptid))
tid = thread->private->tid;
if (tid != PTHDB_INVALID_TID)
- fprintf_unfiltered (buf, "tid %d", tid);
+ /* i18n: Like "thread-identifier %d, [state] running, suspended" */
+ fprintf_unfiltered (buf, _("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));
- status = pthdb_pthread_suspendstate (pd_session, pdtid, &suspendstate);
+ status = pthdb_pthread_suspendstate (pd_session, pdtid,
+ &suspendstate);
if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED)
- fprintf_unfiltered (buf, ", suspended");
+ /* i18n: Like "Thread-Id %d, [state] running, suspended" */
+ fprintf_unfiltered (buf, _(", suspended"));
- status = pthdb_pthread_detachstate (pd_session, pdtid, &detachstate);
+ status = pthdb_pthread_detachstate (pd_session, pdtid,
+ &detachstate);
if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED)
- fprintf_unfiltered (buf, ", detached");
+ /* i18n: Like "Thread-Id %d, [state] running, detached" */
+ fprintf_unfiltered (buf, _(", detached"));
pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend);
if (status == PTHDB_SUCCESS && cancelpend)
- fprintf_unfiltered (buf, ", cancel pending");
+ /* i18n: Like "Thread-Id %d, [state] running, cancel pending" */
+ fprintf_unfiltered (buf, _(", cancel pending"));
ui_file_write (buf, "", 1);
xfree (ret); /* Free old buffer. */
- ret = ui_file_xstrdup (buf, &length);
+ ret = ui_file_xstrdup (buf, NULL);
ui_file_delete (buf);
return ret;
}
-/* Initialize target ops. */
+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
-init_ops (void)
+init_aix_thread_ops (void)
{
- ops.to_shortname = "aix-threads";
- ops.to_longname = "AIX pthread support";
- ops.to_doc = "AIX pthread support";
-
- ops.to_attach = ops_attach;
- ops.to_detach = ops_detach;
- ops.to_resume = ops_resume;
- ops.to_wait = ops_wait;
- ops.to_fetch_registers = ops_fetch_registers;
- ops.to_store_registers = ops_store_registers;
- ops.to_prepare_to_store = ops_prepare_to_store;
- ops.to_xfer_memory = ops_xfer_memory;
- /* No need for ops.to_create_inferior, because we activate thread debugging
- when the inferior reaches pd_brk_addr. */
- ops.to_kill = ops_kill;
- ops.to_mourn_inferior = ops_mourn_inferior;
- ops.to_thread_alive = ops_thread_alive;
- ops.to_pid_to_str = ops_pid_to_str;
- ops.to_extra_thread_info = ops_extra_thread_info;
- ops.to_stratum = thread_stratum;
- ops.to_magic = OPS_MAGIC;
+ aix_thread_ops.to_shortname = "aix-threads";
+ 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;
+ 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;
}
/* Module startup initialization function, automagically called by
- init.c. */
+ init.c. */
+
+void _initialize_aix_thread (void);
void
_initialize_aix_thread (void)
{
- init_ops ();
- add_target (&ops);
-
- /* Notice when object files get loaded and unloaded. */
- target_new_objfile_chain = target_new_objfile_hook;
- target_new_objfile_hook = new_objfile;
-
- add_show_from_set (add_set_cmd ("aix-thread", no_class, var_zinteger,
- (char *) &debug_aix_thread,
- "Set debugging of AIX thread module.\n"
- "Enables printf debugging output.\n",
- &setdebuglist),
- &showdebuglist);
+ init_aix_thread_ops ();
+ complete_target_initialization (&aix_thread_ops);
+
+ /* Notice when object files get loaded and unloaded. */
+ observer_attach_new_objfile (new_objfile);
+
+ add_setshow_boolean_cmd ("aix-thread", class_maintenance, &debug_aix_thread,
+ _("Set debugging of AIX thread module."),
+ _("Show debugging of AIX thread module."),
+ _("Enables debugging output (used to debug GDB)."),
+ NULL, NULL,
+ /* FIXME: i18n: Debugging of AIX thread
+ module is \"%d\". */
+ &setdebuglist, &showdebuglist);
}
projects / deliverable / binutils-gdb.git / blobdiff