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 82aef283a6d2cd288522f73e1e709280ec36c2ef..be60e2c375b191f3a8003aa0086be543608a86d6 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1710,7 +1710,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)
     {
@@ -1852,8 +1852,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;