[14/14] Move duplicated Linux x86 code to nat/x86-linux.c
Commit Message
This commit moves two identical functions from gdb/x86-linux-nat.c and
gdb/gdbserver/linux-x86-low.c into the shared file gdb/nat/x86-linux.c.
gdb/ChangeLog:
* nat/x86-linux.h (x86_linux_new_thread): New declaration.
(x86_linux_prepare_to_resume): Likewise.
* x86-linux-nat.c (x86_linux_new_thread):
Moved to nat/x86-linux.c.
(x86_linux_prepare_to_resume): Likewise.
* nat/x86-linux.c (x86_linux_new_thread): New function.
(x86_linux_prepare_to_resume): Likewise.
gdb/gdbserver/ChangeLog:
* linux-x86-low.c (x86_linux_new_thread): Removed.
(x86_linux_prepare_to_resume): Likewise.
---
gdb/ChangeLog | 10 ++++++++++
gdb/gdbserver/ChangeLog | 5 +++++
gdb/gdbserver/linux-x86-low.c | 16 ----------------
gdb/nat/x86-linux.c | 17 +++++++++++++++++
gdb/nat/x86-linux.h | 8 ++++++++
gdb/x86-linux-nat.c | 16 ----------------
6 files changed, 40 insertions(+), 32 deletions(-)
@@ -638,14 +638,6 @@ x86_linux_new_process (void)
return info;
}
-/* Called when a new thread is detected. */
-
-static void
-x86_linux_new_thread (struct lwp_info *lwp)
-{
- lwp_set_debug_registers_changed (lwp, 1);
-}
-
/* See nat/x86-dregs.h. */
struct x86_debug_reg_state *
@@ -655,14 +647,6 @@ x86_debug_reg_state (pid_t pid)
return &proc->private->arch_private->debug_reg_state;
}
-
-/* Called prior to resuming a thread. */
-
-static void
-x86_linux_prepare_to_resume (struct lwp_info *lwp)
-{
- x86_linux_update_debug_registers (lwp);
-}
/* When GDBSERVER is built as a 64-bit application on linux, the
PTRACE_GETSIGINFO data is always presented in 64-bit layout. Since
@@ -19,6 +19,7 @@
#include "common-defs.h"
#include "x86-linux.h"
+#include "x86-linux-dregs.h"
/* Per-thread arch-specific data we want to keep. */
@@ -55,3 +56,19 @@ lwp_debug_registers_changed (struct lwp_info *lwp)
return info->debug_registers_changed;
}
+
+/* See nat/x86-linux.h. */
+
+void
+x86_linux_new_thread (struct lwp_info *lwp)
+{
+ lwp_set_debug_registers_changed (lwp, 1);
+}
+
+/* See nat/x86-linux.h. */
+
+void
+x86_linux_prepare_to_resume (struct lwp_info *lwp)
+{
+ x86_linux_update_debug_registers (lwp);
+}
@@ -35,4 +35,12 @@ extern void lwp_set_debug_registers_changed (struct lwp_info *lwp,
extern int lwp_debug_registers_changed (struct lwp_info *lwp);
+/* Function to call when a new thread is detected. */
+
+extern void x86_linux_new_thread (struct lwp_info *lwp);
+
+/* Function to call prior to resuming a thread. */
+
+extern void x86_linux_prepare_to_resume (struct lwp_info *lwp);
+
#endif /* X86_LINUX_H */
@@ -42,22 +42,6 @@
/* Does the current host support PTRACE_GETREGSET? */
int have_ptrace_getregset = -1;
-
-/* Called prior to resuming a thread. */
-
-static void
-x86_linux_prepare_to_resume (struct lwp_info *lwp)
-{
- x86_linux_update_debug_registers (lwp);
-}
-
-/* Called when a new thread is detected. */
-
-static void
-x86_linux_new_thread (struct lwp_info *lwp)
-{
- lwp_set_debug_registers_changed (lwp, 1);
-}
/* linux_nat_new_fork hook. */