CORE_ADDR original_pc = regcache_read_pc (regcache);
displaced_step_prepare_status status =
- gdbarch_displaced_step_prepare (gdbarch, tp);
+ tp->inf->top_target ()->displaced_step_prepare (tp);
if (status == DISPLACED_STEP_PREPARE_STATUS_ERROR)
{
/* Do the fixup, and release the resources acquired to do the displaced
step. */
displaced_step_finish_status finish_status =
- gdbarch_displaced_step_finish (displaced->get_original_gdbarch (),
- event_thread, signal);
+ event_thread->inf->top_target ()->displaced_step_finish (event_thread,
+ signal);
if (finish_status == DISPLACED_STEP_FINISH_STATUS_OK)
return 1;