diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2017-03-17 13:55:51 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2017-03-17 13:55:51 -0400 |
| commit | 317cd4925a9d6ef6f8752a771cb56e85ddfb30f0 (patch) | |
| tree | fb451fec75153cccd235d52388123c96791e734f /gdb/bsd-uthread.c | |
| parent | 9ac8a7c281aa949cf588cccb9977ea51eaff8130 (diff) | |
bsd-uthread: Use ptid from regcache instead of inferior_ptid
This is one of the rare to_fetch/store_registers implementations that will
still rely (for now) on inferior_ptid (because of the memory read/write
operations). We therefore have to add a save/restore of inferior_ptid. We'll
be able to remove it when we make the memory operations accept the ptid as a
parameter.
gdb/ChangeLog:
* bsd-uthread.c (bsd_uthread_fetch_registers,
bsd_uthread_store_registers): Use ptid from regcache, set and
restore inferior_ptid.
Diffstat (limited to 'gdb/bsd-uthread.c')
| -rw-r--r-- | gdb/bsd-uthread.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c index 20eecd3879..08b8f36969 100644 --- a/gdb/bsd-uthread.c +++ b/gdb/bsd-uthread.c @@ -290,9 +290,15 @@ bsd_uthread_fetch_registers (struct target_ops *ops, 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); @@ -309,6 +315,8 @@ bsd_uthread_fetch_registers (struct target_ops *ops, uthread_ops->supply_uthread (regcache, regnum, addr + bsd_uthread_thread_ctx_offset); } + + do_cleanups (cleanup); } static void @@ -319,8 +327,14 @@ bsd_uthread_store_registers (struct target_ops *ops, 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) @@ -335,6 +349,8 @@ bsd_uthread_store_registers (struct target_ops *ops, request to the layer beneath. */ beneath->to_store_registers (beneath, regcache, regnum); } + + do_cleanups (cleanup); } static ptid_t |