From 191f02e59316d8ff15684d24e1c8f4d07b2dd582 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 18 Jun 2020 21:28:25 +0100 Subject: [PATCH] Don't write to inferior_ptid in remote-sim.c gdb/ChangeLog: 2020-06-18 Pedro Alves * remote-sim.c (gdbsim_target::create_inferior): Switch to thread after creating it, instead of writing to inferior_ptid. (gdbsim_target_open): Use switch_to_no_thread instead of writing to inferior_ptid directly. (gdbsim_target::wait): Don't write to inferior_ptid. --- gdb/ChangeLog | 8 ++++++++ gdb/remote-sim.c | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 334c227574..2d99bf3f22 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2020-06-18 Pedro Alves + + * remote-sim.c (gdbsim_target::create_inferior): Switch to thread + after creating it, instead of writing to inferior_ptid. + (gdbsim_target_open): Use switch_to_no_thread instead of writing + to inferior_ptid directly. + (gdbsim_target::wait): Don't write to inferior_ptid. + 2020-06-18 Pedro Alves * remote.c (remote_target::remote_notice_new_inferior): Use diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 347dfd7013..9af6486bca 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -653,9 +653,10 @@ gdbsim_target::create_inferior (const char *exec_file, != SIM_RC_OK) error (_("Unable to create sim inferior.")); - inferior_ptid = sim_data->remote_sim_ptid; - inferior_appeared (current_inferior (), inferior_ptid.pid ()); - add_thread_silent (this, inferior_ptid); + inferior_appeared (current_inferior (), + sim_data->remote_sim_ptid.pid ()); + thread_info *thr = add_thread_silent (this, sim_data->remote_sim_ptid); + switch_to_thread (thr); insert_breakpoints (); /* Needed to get correct instruction in cache. */ @@ -761,7 +762,7 @@ gdbsim_target_open (const char *args, int from_tty) /* There's nothing running after "target sim" or "load"; not until "run". */ - inferior_ptid = null_ptid; + switch_to_no_thread (); gdbsim_is_open = 1; } @@ -945,7 +946,6 @@ gdbsim_target::wait (ptid_t ptid, struct target_waitstatus *status, int options) if (sim_data == NULL) error (_("Unable to wait for pid %d. Inferior not found."), ptid.pid ()); - inferior_ptid = ptid; } if (remote_debug)