sim: don't rely on inferior_ptid in gdbsim_target::wait

When running a program with the simulator target, I get:

    /home/simark/src/binutils-gdb/gdb/inferior.c:279: internal-error: inferior* find_inferior_pid(process_stratum_target*, int): Assertion `pid != 0' failed.

This can be reproduced by building a GDB for --target=arm-none-gnueabi,
and running with

    $ ./gdb -nx --data-directory=data-directory a.out -ex "target sim" -ex load -ex "b main" -ex r

Where a.out is any program with a main.

The problem is that gdbsim_target::wait assumes that inferior_ptid has
the value of the thread it wants to report an event for.

Actually, it's the target's responsibility to come up with the ptid of
the thread the event is for.  In the sim target, that ptid is stored in
sim_inferior_data::remote_sim_ptid, so return that instead of
inferior_ptid.

ChangeLog:

	* remote-sim.c (gdbsim_target::wait): Return
	sim_data->remote_sim_ptid instead of inferior_ptid.
This commit is contained in:
Simon Marchi 2020-01-19 19:47:49 -05:00
parent b760fb3a1c
commit cf1d9e092f
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2020-01-19 Simon Marchi <simon.marchi@polymtl.ca>
* remote-sim.c (gdbsim_target::wait): Return
sim_data->remote_sim_ptid instead of inferior_ptid.
2020-01-18 Nick Clifton <nickc@redhat.com>
Binutils 2.34 branch created.

View File

@ -1022,7 +1022,7 @@ gdbsim_target::wait (ptid_t ptid, struct target_waitstatus *status, int options)
break;
}
return inferior_ptid;
return sim_data->remote_sim_ptid;
}
/* Get ready to modify the registers array. On machines which store