From 4b134ca10812e550d8d012cd6096f5229d59f7c6 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Tue, 24 Mar 2015 14:05:44 +0000 Subject: [PATCH] Make lwp_info.arch_private handling shared This commit moves the code to handle lwp_info.arch_private for Linux x86 into a new shared file, nat/x86-linux.c. gdb/ChangeLog: * nat/x86-linux.h: New file. * nat/x86-linux.c: Likewise. * Makefile.in (HFILES_NO_SRCDIR): Add nat/x86-linux.h. (x86-linux.o): New rule. * config/i386/linux.mh (NATDEPFILES): Add x86-linux.o. * config/i386/linux64.mh (NATDEPFILES): Likewise. * nat/linux-nat.h (struct arch_lwp_info): New forward declaration. (lwp_set_arch_private_info): New declaration. (lwp_arch_private_info): Likewise. * linux-nat.c (lwp_set_arch_private_info): New function. (lwp_arch_private_info): Likewise. * x86-linux-nat.c: Include nat/x86-linux.h. (arch_lwp_info): Removed structure. (update_debug_registers_callback): Use lwp_set_debug_registers_changed. (x86_linux_prepare_to_resume): Use lwp_debug_registers_changed and lwp_set_debug_registers_changed. (x86_linux_new_thread): Use lwp_set_debug_registers_changed. gdb/gdbserver/ChangeLog: * Makefile.in (x86-linux.o): New rule. * configure.srv: Add x86-linux.o to relevant targets. * linux-low.c (lwp_set_arch_private_info): New function. (lwp_arch_private_info): Likewise. * linux-x86-low.c: Include nat/x86-linux.h. (arch_lwp_info): Removed structure. (update_debug_registers_callback): Use lwp_set_debug_registers_changed. (x86_linux_prepare_to_resume): Use lwp_debug_registers_changed and lwp_set_debug_registers_changed. (x86_linux_new_thread): Use lwp_set_debug_registers_changed. --- gdb/ChangeLog | 21 +++++++++++++ gdb/Makefile.in | 6 +++- gdb/config/i386/linux.mh | 2 +- gdb/config/i386/linux64.mh | 2 +- gdb/gdbserver/ChangeLog | 14 +++++++++ gdb/gdbserver/Makefile.in | 3 ++ gdb/gdbserver/configure.srv | 4 +-- gdb/gdbserver/linux-low.c | 17 +++++++++++ gdb/gdbserver/linux-x86-low.c | 21 +++---------- gdb/linux-nat.c | 17 +++++++++++ gdb/nat/linux-nat.h | 12 ++++++++ gdb/nat/x86-linux.c | 57 +++++++++++++++++++++++++++++++++++ gdb/nat/x86-linux.h | 38 +++++++++++++++++++++++ gdb/x86-linux-nat.c | 22 +++----------- 14 files changed, 198 insertions(+), 38 deletions(-) create mode 100644 gdb/nat/x86-linux.c create mode 100644 gdb/nat/x86-linux.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fd5c10ba4f3..9ea144661c8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,24 @@ +2015-03-24 Gary Benson + + * nat/x86-linux.h: New file. + * nat/x86-linux.c: Likewise. + * Makefile.in (HFILES_NO_SRCDIR): Add nat/x86-linux.h. + (x86-linux.o): New rule. + * config/i386/linux.mh (NATDEPFILES): Add x86-linux.o. + * config/i386/linux64.mh (NATDEPFILES): Likewise. + * nat/linux-nat.h (struct arch_lwp_info): New forward declaration. + (lwp_set_arch_private_info): New declaration. + (lwp_arch_private_info): Likewise. + * linux-nat.c (lwp_set_arch_private_info): New function. + (lwp_arch_private_info): Likewise. + * x86-linux-nat.c: Include nat/x86-linux.h. + (arch_lwp_info): Removed structure. + (update_debug_registers_callback): + Use lwp_set_debug_registers_changed. + (x86_linux_prepare_to_resume): Use lwp_debug_registers_changed + and lwp_set_debug_registers_changed. + (x86_linux_new_thread): Use lwp_set_debug_registers_changed. + 2015-03-24 Gary Benson * nat/linux-nat.h (ptid_of_lwp): New declaration. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index dbace2df995..6cc41ffd34f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -968,7 +968,7 @@ i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h \ common/common-debug.h common/cleanups.h common/gdb_setjmp.h \ common/common-exceptions.h target/target.h common/symbol.h \ common/common-regcache.h fbsd-tdep.h nat/linux-personality.h \ -common/common-remote-fileio.h +common/common-remote-fileio.h nat/x86-linux.h # Header files that already have srcdir in them, or which are in objdir. @@ -2299,6 +2299,10 @@ linux-personality.o: ${srcdir}/nat/linux-personality.c $(COMPILE) $(srcdir)/nat/linux-personality.c $(POSTCOMPILE) +x86-linux.o: ${srcdir}/nat/x86-linux.c + $(COMPILE) $(srcdir)/nat/x86-linux.c + $(POSTCOMPILE) + # # gdb/tui/ dependencies # diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh index 33fb2812c64..ae19f962654 100644 --- a/gdb/config/i386/linux.mh +++ b/gdb/config/i386/linux.mh @@ -5,7 +5,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \ x86-nat.o x86-dregs.o i386-linux-nat.o x86-linux-nat.o \ proc-service.o linux-thread-db.o \ linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \ - linux-btrace.o linux-waitpid.o linux-personality.o + linux-btrace.o linux-waitpid.o linux-personality.o x86-linux.o NAT_CDEPS = $(srcdir)/proc-service.list # The dynamically loaded libthread_db needs access to symbols in the diff --git a/gdb/config/i386/linux64.mh b/gdb/config/i386/linux64.mh index d52eb5269b4..4a05f9116b4 100644 --- a/gdb/config/i386/linux64.mh +++ b/gdb/config/i386/linux64.mh @@ -5,7 +5,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \ linux-nat.o linux-osdata.o \ proc-service.o linux-thread-db.o linux-fork.o \ linux-procfs.o linux-ptrace.o linux-btrace.o \ - linux-waitpid.o linux-personality.o + linux-waitpid.o linux-personality.o x86-linux.o NAT_FILE= config/nm-linux.h NAT_CDEPS = $(srcdir)/proc-service.list diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 1f5e4c12ca6..cf858edceed 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,17 @@ +2015-03-24 Gary Benson + + * Makefile.in (x86-linux.o): New rule. + * configure.srv: Add x86-linux.o to relevant targets. + * linux-low.c (lwp_set_arch_private_info): New function. + (lwp_arch_private_info): Likewise. + * linux-x86-low.c: Include nat/x86-linux.h. + (arch_lwp_info): Removed structure. + (update_debug_registers_callback): + Use lwp_set_debug_registers_changed. + (x86_linux_prepare_to_resume): Use lwp_debug_registers_changed + and lwp_set_debug_registers_changed. + (x86_linux_new_thread): Use lwp_set_debug_registers_changed. + 2015-03-24 Gary Benson * linux-low.h (linux_target_ops) : Changed signature. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index b425ee23e1b..7b1e52c02a8 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -609,6 +609,9 @@ linux-personality.o: ../nat/linux-personality.c btrace-common.o: ../common/btrace-common.c $(COMPILE) $< $(POSTCOMPILE) +x86-linux.o: ../nat/x86-linux.c + $(COMPILE) $< + $(POSTCOMPILE) aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64.dat aarch64.c diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 98dd0d94c50..fcb29ff7fb9 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -109,7 +109,7 @@ case "${target}" in srv_xmlfiles="${srv_xmlfiles} $srv_amd64_linux_xmlfiles" fi srv_tgtobj="$srv_linux_obj linux-x86-low.o x86-low.o x86-dregs.o i387-fp.o" - srv_tgtobj="${srv_tgtobj} linux-btrace.o" + srv_tgtobj="${srv_tgtobj} linux-btrace.o x86-linux.o" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes @@ -325,7 +325,7 @@ case "${target}" in ;; x86_64-*-linux*) srv_regobj="$srv_amd64_linux_regobj $srv_i386_linux_regobj" srv_tgtobj="$srv_linux_obj linux-x86-low.o x86-low.o x86-dregs.o i387-fp.o" - srv_tgtobj="${srv_tgtobj} linux-btrace.o" + srv_tgtobj="${srv_tgtobj} linux-btrace.o x86-linux.o" srv_xmlfiles="$srv_i386_linux_xmlfiles $srv_amd64_linux_xmlfiles" srv_linux_usrregs=yes # This is for i386 progs. srv_linux_regsets=yes diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 93656c0b4c8..4743f7b96dd 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -148,6 +148,23 @@ ptid_of_lwp (struct lwp_info *lwp) /* See nat/linux-nat.h. */ +void +lwp_set_arch_private_info (struct lwp_info *lwp, + struct arch_lwp_info *info) +{ + lwp->arch_private = info; +} + +/* See nat/linux-nat.h. */ + +struct arch_lwp_info * +lwp_arch_private_info (struct lwp_info *lwp) +{ + return lwp->arch_private; +} + +/* See nat/linux-nat.h. */ + int lwp_is_stopped (struct lwp_info *lwp) { diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 4a7cf42fa6b..7f072a711d5 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -38,6 +38,7 @@ #include "tracepoint.h" #include "ax.h" #include "nat/linux-nat.h" +#include "nat/x86-linux.h" #ifdef __x86_64__ /* Defined in auto-generated file amd64-linux.c. */ @@ -152,14 +153,6 @@ struct arch_process_info struct x86_debug_reg_state debug_reg_state; }; -/* Per-thread arch-specific data we want to keep. */ - -struct arch_lwp_info -{ - /* Non-zero if our copy differs from what's recorded in the thread. */ - int debug_registers_changed; -}; - #ifdef __x86_64__ /* Mapping between the general-purpose registers in `struct user' @@ -579,7 +572,7 @@ update_debug_registers_callback (struct lwp_info *lwp, void *arg) { /* The actual update is done later just before resuming the lwp, we just mark that the registers need updating. */ - lwp->arch_private->debug_registers_changed = 1; + lwp_set_debug_registers_changed (lwp, 1); /* If the lwp isn't stopped, force it to momentarily pause, so we can update its debug registers. */ @@ -760,11 +753,7 @@ x86_linux_new_process (void) static void x86_linux_new_thread (struct lwp_info *lwp) { - struct arch_lwp_info *info = XCNEW (struct arch_lwp_info); - - info->debug_registers_changed = 1; - - lwp->arch_private = info; + lwp_set_debug_registers_changed (lwp, 1); } /* See nat/x86-dregs.h. */ @@ -786,7 +775,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp) ptid_t ptid = ptid_of_lwp (lwp); int clear_status = 0; - if (lwp->arch_private->debug_registers_changed) + if (lwp_debug_registers_changed (lwp)) { struct x86_debug_reg_state *state = x86_debug_reg_state (ptid_get_pid (ptid)); @@ -809,7 +798,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp) if (state->dr_control_mirror != 0) x86_linux_dr_set (ptid, DR_CONTROL, state->dr_control_mirror); - lwp->arch_private->debug_registers_changed = 0; + lwp_set_debug_registers_changed (lwp, 0); } if (clear_status diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 283a12bc712..803bdf6b1e2 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -294,6 +294,23 @@ ptid_of_lwp (struct lwp_info *lwp) /* See nat/linux-nat.h. */ +void +lwp_set_arch_private_info (struct lwp_info *lwp, + struct arch_lwp_info *info) +{ + lwp->arch_private = info; +} + +/* See nat/linux-nat.h. */ + +struct arch_lwp_info * +lwp_arch_private_info (struct lwp_info *lwp) +{ + return lwp->arch_private; +} + +/* See nat/linux-nat.h. */ + int lwp_is_stopped (struct lwp_info *lwp) { diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h index 51d9ead21b8..7cdaf4075cc 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h @@ -21,6 +21,7 @@ #define LINUX_NAT_H struct lwp_info; +struct arch_lwp_info; /* Unlike other extended result codes, WSTOPSIG (status) on PTRACE_O_TRACESYSGOOD syscall events doesn't return SIGTRAP, but @@ -51,6 +52,17 @@ extern struct lwp_info *iterate_over_lwps (ptid_t filter, extern ptid_t ptid_of_lwp (struct lwp_info *lwp); +/* Set the architecture-specific data of LWP. This function must be + provided by the client. */ + +extern void lwp_set_arch_private_info (struct lwp_info *lwp, + struct arch_lwp_info *info); + +/* Return the architecture-specific data of LWP. This function must + be provided by the client. */ + +extern struct arch_lwp_info *lwp_arch_private_info (struct lwp_info *lwp); + /* Return nonzero if LWP is stopped, zero otherwise. This function must be provided by the client. */ diff --git a/gdb/nat/x86-linux.c b/gdb/nat/x86-linux.c new file mode 100644 index 00000000000..a2bd36895c4 --- /dev/null +++ b/gdb/nat/x86-linux.c @@ -0,0 +1,57 @@ +/* Native-dependent code for GNU/Linux x86 (i386 and x86-64). + + Copyright (C) 1999-2015 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "common-defs.h" +#include "x86-linux.h" + +/* Per-thread arch-specific data we want to keep. */ + +struct arch_lwp_info +{ + /* Non-zero if our copy differs from what's recorded in the + thread. */ + int debug_registers_changed; +}; + +/* See nat/x86-linux.h. */ + +void +lwp_set_debug_registers_changed (struct lwp_info *lwp, int value) +{ + if (lwp_arch_private_info (lwp) == NULL) + lwp_set_arch_private_info (lwp, XCNEW (struct arch_lwp_info)); + + lwp_arch_private_info (lwp)->debug_registers_changed = value; +} + +/* See nat/x86-linux.h. */ + +int +lwp_debug_registers_changed (struct lwp_info *lwp) +{ + struct arch_lwp_info *info = lwp_arch_private_info (lwp); + + /* NULL means either that this is the main thread still going + through the shell, or that no watchpoint has been set yet. + The debug registers are unchanged in either case. */ + if (info == NULL) + return 0; + + return info->debug_registers_changed; +} diff --git a/gdb/nat/x86-linux.h b/gdb/nat/x86-linux.h new file mode 100644 index 00000000000..8dd66e4b49f --- /dev/null +++ b/gdb/nat/x86-linux.h @@ -0,0 +1,38 @@ +/* Native-dependent code for GNU/Linux x86 (i386 and x86-64). + + Copyright (C) 1999-2015 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef X86_LINUX_H +#define X86_LINUX_H + +#include "nat/linux-nat.h" + +/* Set whether our local mirror of LWP's debug registers has been + changed since the values were last written to the thread. Nonzero + indicates that a change has been made, zero indicates no change. */ + +extern void lwp_set_debug_registers_changed (struct lwp_info *lwp, + int value); + +/* Return nonzero if our local mirror of LWP's debug registers has + been changed since the values were last written to the thread, + zero otherwise. */ + +extern int lwp_debug_registers_changed (struct lwp_info *lwp); + +#endif /* X86_LINUX_H */ diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 74b48e378ee..10ccbd67968 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -39,6 +39,7 @@ #include "x86-xstate.h" #include "nat/linux-btrace.h" #include "nat/linux-nat.h" +#include "nat/x86-linux.h" /* Per-thread arch-specific data we want to keep. */ @@ -133,12 +134,9 @@ x86_linux_dr_get_status (void) static int update_debug_registers_callback (struct lwp_info *lwp, void *arg) { - if (lwp->arch_private == NULL) - lwp->arch_private = XCNEW (struct arch_lwp_info); - /* The actual update is done later just before resuming the lwp, we just mark that the registers need updating. */ - lwp->arch_private->debug_registers_changed = 1; + lwp_set_debug_registers_changed (lwp, 1); /* If the lwp isn't stopped, force it to momentarily pause, so we can update its debug registers. */ @@ -181,13 +179,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp) ptid_t ptid = ptid_of_lwp (lwp); int clear_status = 0; - /* NULL means this is the main thread still going through the shell, - or, no watchpoint has been set yet. In that case, there's - nothing to do. */ - if (lwp->arch_private == NULL) - return; - - if (lwp->arch_private->debug_registers_changed) + if (lwp_debug_registers_changed (lwp)) { struct x86_debug_reg_state *state = x86_debug_reg_state (ptid_get_pid (ptid)); @@ -222,7 +214,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp) if (state->dr_control_mirror != 0) x86_linux_dr_set (ptid, DR_CONTROL, state->dr_control_mirror); - lwp->arch_private->debug_registers_changed = 0; + lwp_set_debug_registers_changed (lwp, 0); } if (clear_status @@ -233,11 +225,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp) static void x86_linux_new_thread (struct lwp_info *lp) { - struct arch_lwp_info *info = XCNEW (struct arch_lwp_info); - - info->debug_registers_changed = 1; - - lp->arch_private = info; + lwp_set_debug_registers_changed (lp, 1); } -- 2.30.2