#include "defs.h"
#include "gdbsupport/selftest.h"
#include "selftest-arch.h"
-#include "inferior.h"
-#include "gdbthread.h"
#include "target.h"
#include "test-target.h"
#include "target-float.h"
#include "gdbsupport/def-vector.h"
#include "gdbarch.h"
-#include "progspace-and-thread.h"
+#include "scoped-mock-context.h"
namespace selftests {
builtin->builtin_char32,
};
- /* Create a mock environment. An inferior with a thread, with a
- process_stratum target pushed. */
-
- test_target_ops mock_target;
- ptid_t mock_ptid (1, 1);
- program_space mock_pspace (new_address_space ());
- inferior mock_inferior (mock_ptid.pid ());
- mock_inferior.gdbarch = gdbarch;
- 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, &mock_inferior);
-
- /* Switch to the mock inferior. */
- switch_to_inferior_no_thread (&mock_inferior);
-
- /* Push the process_stratum target so we can mock accessing
- registers. */
- push_target (&mock_target);
-
- /* Pop it again on exit (return/exception). */
- SCOPE_EXIT { pop_all_targets_at_and_above (process_stratum); };
-
- /* Switch to the mock thread. */
- switch_to_thread (&mock_thread);
+ scoped_mock_context<test_target_ops> mockctx (gdbarch);
struct frame_info *frame = get_current_frame ();
const int num_regs = gdbarch_num_cooked_regs (gdbarch);