struct gdbarch *gdbarch = get_regcache_arch (regcache);
struct bsd_uthread_ops *uthread_ops
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
- CORE_ADDR addr = ptid_get_tid (inferior_ptid);
+ ptid_t ptid = regcache_get_ptid (regcache);
+ CORE_ADDR addr = ptid_get_tid (ptid);
struct target_ops *beneath = find_target_beneath (ops);
CORE_ADDR active_addr;
+ struct cleanup *cleanup = save_inferior_ptid ();
+
+ /* We are doing operations (e.g. reading memory) that rely on
+ inferior_ptid. */
+ inferior_ptid = ptid;
/* Always fetch the appropriate registers from the layer beneath. */
beneath->to_fetch_registers (beneath, regcache, regnum);
uthread_ops->supply_uthread (regcache, regnum,
addr + bsd_uthread_thread_ctx_offset);
}
+
+ do_cleanups (cleanup);
}
static void
struct bsd_uthread_ops *uthread_ops
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
struct target_ops *beneath = find_target_beneath (ops);
- CORE_ADDR addr = ptid_get_tid (inferior_ptid);
+ ptid_t ptid = regcache_get_ptid (regcache);
+ CORE_ADDR addr = ptid_get_tid (ptid);
CORE_ADDR active_addr;
+ struct cleanup *cleanup = save_inferior_ptid ();
+
+ /* We are doing operations (e.g. reading memory) that rely on
+ inferior_ptid. */
+ inferior_ptid = ptid;
active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr);
if (addr != 0 && addr != active_addr)
request to the layer beneath. */
beneath->to_store_registers (beneath, regcache, regnum);
}
+
+ do_cleanups (cleanup);
}
static ptid_t
}
/* Possible states a thread can be in. */
-static char *bsd_uthread_state[] =
+static const char *bsd_uthread_state[] =
{
"RUNNING",
"SIGTHREAD",
/* Return a string describing th state of the thread specified by
INFO. */
-static char *
+static const char *
bsd_uthread_extra_thread_info (struct target_ops *self,
struct thread_info *info)
{
return NULL;
}
-static char *
+static const char *
bsd_uthread_pid_to_str (struct target_ops *ops, ptid_t ptid)
{
if (ptid_get_tid (ptid) != 0)