From 369f6daa21bf33a09ef67b002e4cec3595eddfe7 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Tue, 24 Mar 2015 14:05:45 +0000 Subject: [PATCH] Move duplicated Linux x86 code to nat/x86-linux.c 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): Moved to nat/x86-linux.c. (x86_linux_prepare_to_resume): Likewise. --- gdb/ChangeLog | 10 ++++++++++ gdb/gdbserver/ChangeLog | 6 ++++++ 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, 41 insertions(+), 32 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7dcec1fdbe2..62a8a449d71 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2015-03-24 Gary Benson + + * 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. + 2015-03-24 Gary Benson * nat/x86-linux-dregs.h: New file. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 8d1d84464dd..d9bc729789b 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2015-03-24 Gary Benson + + * linux-x86-low.c (x86_linux_new_thread): Moved to + nat/x86-linux.c. + (x86_linux_prepare_to_resume): Likewise. + 2015-03-24 Gary Benson * Makefile.in (x86-linux-dregs.o): New rule. diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 8a3b5a81ebe..e293ba4ffdc 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -640,14 +640,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 * @@ -657,14 +649,6 @@ x86_debug_reg_state (pid_t pid) return &proc->priv->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 diff --git a/gdb/nat/x86-linux.c b/gdb/nat/x86-linux.c index a2bd36895c4..e78315625c3 100644 --- a/gdb/nat/x86-linux.c +++ b/gdb/nat/x86-linux.c @@ -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); +} diff --git a/gdb/nat/x86-linux.h b/gdb/nat/x86-linux.h index 8dd66e4b49f..327a005a465 100644 --- a/gdb/nat/x86-linux.h +++ b/gdb/nat/x86-linux.h @@ -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 */ diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 84021fb9cfd..f8eb236fc86 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -52,22 +52,6 @@ struct arch_lwp_info /* 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. */ -- 2.30.2