gdbserver: Update win32_target_ops to new stopped_data_addresses interface

It will be used by the aarch64 port.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc
index e5149c1acc6c314e6b77cfd30c52ee991149bf95..dfdbbf872dd7ea97f1d95525a1200d63bd958837 100644 (file)
--- a/gdbserver/win32-i386-low.cc
+++ b/gdbserver/win32-i386-low.cc
@@ -209,13 +209,13 @@ x86_stopped_by_watchpoint (void)
   return x86_dr_stopped_by_watchpoint (&debug_reg_state);
 }
 
-static CORE_ADDR
-x86_stopped_data_address (void)
+static std::vector<CORE_ADDR>
+x86_stopped_data_addresses ()
 {
   CORE_ADDR addr;
   if (x86_dr_stopped_data_address (&debug_reg_state, &addr))
-    return addr;
-  return 0;
+    return { addr };
+  return {};
 }
 
 static void
@@ -637,5 +637,5 @@ struct win32_target_ops the_low_target = {
   i386_insert_point,
   i386_remove_point,
   x86_stopped_by_watchpoint,
-  x86_stopped_data_address
+  x86_stopped_data_addresses,
 };

diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index d75bdc0fde46b03caedd9a037fa6f8748ee0805d..fb4da6488db62e77f4c3196801cd549b7d2fbf23 100644 (file)
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -243,8 +243,8 @@ win32_process_target::stopped_by_watchpoint ()
 std::vector<CORE_ADDR>
 win32_process_target::stopped_data_addresses ()
 {
-  if (the_low_target.stopped_data_address != NULL)
-    return { the_low_target.stopped_data_address () };
+  if (the_low_target.stopped_data_addresses != nullptr)
+    return the_low_target.stopped_data_addresses ();
   else
     return {};
 }

diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index bc7246576da709d8e5d5e8d0764a21d015dfa558..2196376fccbb21cce5487a5011846b72978beeb1 100644 (file)
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -90,7 +90,7 @@ struct win32_target_ops
   int (*remove_point) (enum raw_bkpt_type type, CORE_ADDR addr,
                       int size, struct raw_breakpoint *bp);
   int (*stopped_by_watchpoint) (void);
-  CORE_ADDR (*stopped_data_address) (void);
+  std::vector<CORE_ADDR> (*stopped_data_addresses) ();
 };
 
 extern struct win32_target_ops the_low_target;