Make aarch64_linux_prepare_to_resume the same on GDB and GDBserver

gdb:

2015-08-25  Yao Qi  <yao.qi@linaro.org>

	* aarch64-linux-nat.c (aarch64_linux_prepare_to_resume): Use
	lwp_arch_private_info and ptid_of_lwp.

gdb/gdbserver:

2015-08-25  Yao Qi  <yao.qi@linaro.org>

	* linux-aarch64-low.c (aarch64_linux_prepare_to_resume): Use
	lwp_arch_private_info and ptid_of_lwp.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4945f773a788fa9be383bb0a19b39da7b9cc6974..6ffaaca6676465a04490c3116e3806867b7d08ca 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-25  Yao Qi  <yao.qi@linaro.org>
+
+       * aarch64-linux-nat.c (aarch64_linux_prepare_to_resume): Use
+       lwp_arch_private_info and ptid_of_lwp.
+
 2015-08-25  Yao Qi  <yao.qi@linaro.org>
 
        * aarch64-linux-nat.c (struct arch64_dr_update_callback_param):

diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index 9bae9ce324c56f964daf08a588ed5a18984cff2a..b23026aae091d7335e30aa7007634d06f175f221 100644 (file)
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -431,7 +431,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
 static void
 aarch64_linux_prepare_to_resume (struct lwp_info *lwp)
 {
-  struct arch_lwp_info *info = lwp->arch_private;
+  struct arch_lwp_info *info = lwp_arch_private_info (lwp);
 
   /* NULL means this is the main thread still going through the shell,
      or, no watchpoint has been set yet.  In that case, there's
@@ -442,9 +442,10 @@ aarch64_linux_prepare_to_resume (struct lwp_info *lwp)
   if (DR_HAS_CHANGED (info->dr_changed_bp)
       || DR_HAS_CHANGED (info->dr_changed_wp))
     {
-      int tid = ptid_get_lwp (lwp->ptid);
+      ptid_t ptid = ptid_of_lwp (lwp);
+      int tid = ptid_get_lwp (ptid);
       struct aarch64_debug_reg_state *state
-       = aarch64_get_debug_reg_state (ptid_get_pid (lwp->ptid));
+       = aarch64_get_debug_reg_state (ptid_get_pid (ptid));
 
       if (show_debug_regs)
        fprintf_unfiltered (gdb_stdlog, "prepare_to_resume thread %d\n", tid);

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 39966b8a170876ce6d269ac750c027639232c718..6fdc29c8616331d7ca00e4427290d8d932aa9341 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-25  Yao Qi  <yao.qi@linaro.org>
+
+       * linux-aarch64-low.c (aarch64_linux_prepare_to_resume): Use
+       lwp_arch_private_info and ptid_of_lwp.
+
 2015-08-25  Yao Qi  <yao.qi@linaro.org>
 
        * linux-aarch64-low.c (aarch64_get_debug_reg_state): Add argument pid.

diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index 421dcb9ea2672e3f199a8aa8fec9348d3381f3d9..4b1d7d58534349b6ffdd20cb01e64707a67a128e 100644 (file)
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -489,20 +489,18 @@ aarch64_linux_new_fork (struct process_info *parent,
 static void
 aarch64_linux_prepare_to_resume (struct lwp_info *lwp)
 {
-  struct thread_info *thread = get_lwp_thread (lwp);
-  ptid_t ptid = ptid_of (thread);
-  struct arch_lwp_info *info = lwp->arch_private;
+  struct arch_lwp_info *info = lwp_arch_private_info (lwp);
 
   if (DR_HAS_CHANGED (info->dr_changed_bp)
       || DR_HAS_CHANGED (info->dr_changed_wp))
     {
+      ptid_t ptid = ptid_of_lwp (lwp);
       int tid = ptid_get_lwp (ptid);
-      struct process_info *proc = find_process_pid (ptid_get_pid (ptid));
       struct aarch64_debug_reg_state *state
-       = &proc->priv->arch_private->debug_reg_state;
+       = aarch64_get_debug_reg_state (ptid_get_pid (ptid));
 
       if (show_debug_regs)
-       fprintf (stderr, "prepare_to_resume thread %ld\n", lwpid_of (thread));
+       fprintf (stderr, "prepare_to_resume thread %d\n", tid);
 
       /* Watchpoints.  */
       if (DR_HAS_CHANGED (info->dr_changed_wp))