diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/bsd-uthread.c | 20 |
2 files changed, 24 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2cd9e6d..e128c66 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2017-03-17 Simon Marchi <simon.marchi@polymtl.ca> + * bsd-uthread.c (bsd_uthread_fetch_registers, + bsd_uthread_store_registers): Use ptid from regcache, set and + restore inferior_ptid. + +2017-03-17 Simon Marchi <simon.marchi@polymtl.ca> + * arm-nbsd-nat.c (fetch_register, fetch_regs, fetch_fp_register, fetch_fp_regs, store_register, store_regs, store_fp_register, store_fp_regs): Use ptid from regcache. diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c index 20eecd3..08b8f36 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 |