ps_get_thread_area receives as a parameter the lwpid it must work on.
It then calls is_64bit_tdesc, which uses the current_thread as the
thread to work on. However, it is not said that both are the same.
This became a problem when working in a following patch that makes
find_one_thread switch to a process but to no thread (current_thread ==
nullptr). When libthread_db needed to get the thread area,
is_64bit_tdesc would try to get the regcache of a nullptr thread.
Fix that by making is_64bit_tdesc accept the thread to work on as a
parameter. Find the right thread from the context, when possible (when
we know the lwpid to work on). Otherwise, pass "current_thread", to
retain the existing behavior.
Reviewed-By: Andrew Burgess <aburgess@redhat.com>
Change-Id: I44394d6be92392fa28de71982fd04517ce8a3007
-/* Returns true if the current inferior belongs to a x86-64 process,
- per the tdesc. */
+/* Returns true if THREAD belongs to a x86-64 process, per the tdesc. */
+is_64bit_tdesc (thread_info *thread)
- struct regcache *regcache = get_thread_regcache (current_thread, 0);
+ struct regcache *regcache = get_thread_regcache (thread, 0);
return register_size (regcache->tdesc, 0) == 8;
}
return register_size (regcache->tdesc, 0) == 8;
}
lwpid_t lwpid, int idx, void **base)
{
#ifdef __x86_64__
lwpid_t lwpid, int idx, void **base)
{
#ifdef __x86_64__
- int use_64bit = is_64bit_tdesc ();
+ lwp_info *lwp = find_lwp_pid (ptid_t (lwpid));
+ gdb_assert (lwp != nullptr);
+ int use_64bit = is_64bit_tdesc (get_lwp_thread (lwp));
x86_target::low_get_thread_area (int lwpid, CORE_ADDR *addr)
{
#ifdef __x86_64__
x86_target::low_get_thread_area (int lwpid, CORE_ADDR *addr)
{
#ifdef __x86_64__
- int use_64bit = is_64bit_tdesc ();
+ lwp_info *lwp = find_lwp_pid (ptid_t (lwpid));
+ gdb_assert (lwp != nullptr);
+ int use_64bit = is_64bit_tdesc (get_lwp_thread (lwp));
- struct lwp_info *lwp = find_lwp_pid (ptid_t (lwpid));
struct thread_info *thr = get_lwp_thread (lwp);
struct regcache *regcache = get_thread_regcache (thr, 1);
unsigned int desc[4];
struct thread_info *thr = get_lwp_thread (lwp);
struct regcache *regcache = get_thread_regcache (thr, 1);
unsigned int desc[4];
x86_target::low_cannot_store_register (int regno)
{
#ifdef __x86_64__
x86_target::low_cannot_store_register (int regno)
{
#ifdef __x86_64__
+ if (is_64bit_tdesc (current_thread))
x86_target::low_cannot_fetch_register (int regno)
{
#ifdef __x86_64__
x86_target::low_cannot_fetch_register (int regno)
{
#ifdef __x86_64__
+ if (is_64bit_tdesc (current_thread))
int is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
/* Is the inferior 32-bit? If so, then fixup the siginfo object. */
int is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
/* Is the inferior 32-bit? If so, then fixup the siginfo object. */
- if (!is_64bit_tdesc ())
+ if (!is_64bit_tdesc (current_thread))
return amd64_linux_siginfo_fixup_common (ptrace, inf, direction,
FIXUP_32);
/* No fixup for native x32 GDB. */
return amd64_linux_siginfo_fixup_common (ptrace, inf, direction,
FIXUP_32);
/* No fixup for native x32 GDB. */
x86_target::get_regs_info ()
{
#ifdef __x86_64__
x86_target::get_regs_info ()
{
#ifdef __x86_64__
+ if (is_64bit_tdesc (current_thread))
return &amd64_linux_regs_info;
else
#endif
return &amd64_linux_regs_info;
else
#endif
char *err)
{
#ifdef __x86_64__
char *err)
{
#ifdef __x86_64__
+ if (is_64bit_tdesc (current_thread))
return amd64_install_fast_tracepoint_jump_pad (tpoint, tpaddr,
collector, lockaddr,
orig_size, jump_entry,
return amd64_install_fast_tracepoint_jump_pad (tpoint, tpaddr,
collector, lockaddr,
orig_size, jump_entry,
#ifdef __x86_64__
/* On x86-64, 5-byte jump instructions with a 4-byte offset are always
used for fast tracepoints. */
#ifdef __x86_64__
/* On x86-64, 5-byte jump instructions with a 4-byte offset are always
used for fast tracepoints. */
+ if (is_64bit_tdesc (current_thread))
x86_target::emit_ops ()
{
#ifdef __x86_64__
x86_target::emit_ops ()
{
#ifdef __x86_64__
+ if (is_64bit_tdesc (current_thread))
return &amd64_emit_ops;
else
#endif
return &amd64_emit_ops;
else
#endif