mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-13 13:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't write to inferior_ptid in gdbarch-selftests.c, mock address_space too

Browse Source 
Use switch_to_thread instead of writing to inferior_ptid.  This
requires a couple of improvements to the mocking environment.  One is
to mock a pspace too, and assigning it to the inferior.  In turn, this
requires heap-allocating the address space, so that the regular
program_space dtor destroys the address space correctly.

(Note that new the mock program_space is allocated on the stack, and
thus depends on the previous patch that eliminated
delete_program_space.)

gdb/ChangeLog:
2020-06-18  Pedro Alves  <palves@redhat.com>

	* gdbarch-selftests.c: Include "progspace-and-thread.h".
	(register_to_value_test): Mock a program_space too.  Heap-allocate
	the address space.  Don't write to inferior_ptid.  Use
	switch_to_thread instead.
This commit is contained in:
Pedro Alves 2020-06-18 21:28:19 +01:00
parent 8df017996f
commit c5316fc6e6
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2020-06-18 Pedro Alves <palves@redhat.com>
* gdbarch-selftests.c: Include "progspace-and-thread.h".
(register_to_value_test): Mock a program_space too. Heap-allocate
the address space. Don't write to inferior_ptid. Use
switch_to_thread instead.
2020-06-18 Pedro Alves <palves@redhat.com>
* linux-tdep.c (find_signalled_thread(thread_info *,void *)):

17
gdb/gdbarch-selftests.c
View File

@ -27,6 +27,7 @@
#include "target-float.h"
#include "gdbsupport/def-vector.h"
#include "gdbarch.h"
#include "progspace-and-thread.h"
namespace selftests {
@ -75,24 +76,25 @@ register_to_value_test (struct gdbarch *gdbarch)
test_target_ops mock_target;
ptid_t mock_ptid (1, 1);
program_space mock_pspace (new_address_space ());
inferior mock_inferior (mock_ptid.pid ());
address_space mock_aspace {};
mock_inferior.gdbarch = gdbarch;
mock_inferior.aspace = &mock_aspace;
mock_inferior.aspace = mock_pspace.aspace;
mock_inferior.pspace = &mock_pspace;
thread_info mock_thread (&mock_inferior, mock_ptid);
scoped_restore_current_pspace_and_thread restore_pspace_thread;
scoped_restore restore_thread_list
= make_scoped_restore (&mock_inferior.thread_list, &mock_thread);
/* Add the mock inferior to the inferior list so that look ups by
target+ptid can find it. */
scoped_restore restore_inferior_list
= make_scoped_restore (&inferior_list);
inferior_list = &mock_inferior;
= make_scoped_restore (&inferior_list, &mock_inferior);
/* Switch to the mock inferior. */
scoped_restore_current_inferior restore_current_inferior;
set_current_inferior (&mock_inferior);
switch_to_inferior_no_thread (&mock_inferior);
/* Push the process_stratum target so we can mock accessing
registers. */
@ -102,8 +104,7 @@ register_to_value_test (struct gdbarch *gdbarch)
SCOPE_EXIT { pop_all_targets_at_and_above (process_stratum); };
/* Switch to the mock thread. */
scoped_restore restore_inferior_ptid
= make_scoped_restore (&inferior_ptid, mock_ptid);
switch_to_thread (&mock_thread);
struct frame_info *frame = get_current_frame ();
const int num_regs = gdbarch_num_cooked_regs (gdbarch);