gdb: add target_ops methods for displaced stepping

[deliverable/binutils-gdb.git] / gdb / infrun.c

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 284353004d99baa61a6592d2651b5c57544f9761..7a1f9351e833bbc63ba6839d95dfdedc0356230a 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1727,7 +1727,7 @@ displaced_step_prepare_throw (thread_info *tp)
   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)
     {
@@ -1869,8 +1869,8 @@ displaced_step_finish (thread_info *event_thread, enum gdb_signal signal)
   /* 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;