gdbserver: turn target ops 'stopped_by_watchpoint' and 'stopped_data_address' into...

[deliverable/binutils-gdb.git] / gdbserver / remote-utils.cc

diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc
index b5248ab368eadbe7f06f8d90d1aa9c6cda50950a..316f04e32ee34862dfceb7ad24e4d3ee28b3f786 100644 (file)
--- a/gdbserver/remote-utils.cc
+++ b/gdbserver/remote-utils.cc
@@ -1214,8 +1214,7 @@ prepare_resume_reply (char *buf, ptid_t ptid,
 
        regcache = get_thread_regcache (current_thread, 1);
 
-       if (the_target->stopped_by_watchpoint != NULL
-           && (*the_target->stopped_by_watchpoint) ())
+       if (the_target->pt->stopped_by_watchpoint ())
          {
            CORE_ADDR addr;
            int i;
@@ -1223,7 +1222,7 @@ prepare_resume_reply (char *buf, ptid_t ptid,
            memcpy (buf, "watch:", 6);
            buf += 6;
 
-           addr = (*the_target->stopped_data_address) ();
+           addr = the_target->pt->stopped_data_address ();
 
            /* Convert each byte of the address into two hexadecimal
               chars.  Note that we take sizeof (void *) instead of