diff options
| author | Pedro Alves <palves@redhat.com> | 2014-10-22 13:51:07 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-02-27 17:30:09 +0000 |
| commit | 4180215b9db1549b88da2da2fcc320fe28233481 (patch) | |
| tree | d9be89fd130a2c8c727f8e091753ee3567bff668 | |
| parent | 2f56f7c302c8d4012cc47d8bd261b151b2ddfa22 (diff) | |
| download | gdb-4180215b9db1549b88da2da2fcc320fe28233481.zip gdb-4180215b9db1549b88da2da2fcc320fe28233481.tar.gz gdb-4180215b9db1549b88da2da2fcc320fe28233481.tar.bz2 | |
x86 Linux/ptrace: fix offsetof usage in C++ mode
In C++ mode, we get:
gdb/gdbserver/linux-x86-low.c: In function ‘void x86_linux_dr_set(ptid_t, int, long unsigned int)’:
gdb/gdbserver/linux-x86-low.c:558:38: error: ‘regnum’ cannot appear in a constant-expression
offsetof (struct user, u_debugreg[regnum]), value);
^
gdb/gdbserver/ChangeLog:
2015-02-27 Pedro Alves <palves@redhat.com>
* linux-x86-low.c (u_debugreg_offset): New function.
(x86_linux_dr_get, x86_linux_dr_set): Use it.
gdb/ChangeLog:
2015-02-27 Pedro Alves <palves@redhat.com>
* x86-linux-nat.c (u_debugreg_offset): New function.
(x86_linux_dr_get, x86_linux_dr_set): Use it.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-x86-low.c | 18 | ||||
| -rw-r--r-- | gdb/x86-linux-nat.c | 17 |
4 files changed, 37 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 92f85f4..cd43e5a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2015-02-27 Pedro Alves <palves@redhat.com> + * x86-linux-nat.c (u_debugreg_offset): New function. + (x86_linux_dr_get, x86_linux_dr_set): Use it. + +2015-02-27 Pedro Alves <palves@redhat.com> + * nat/x86-dregs.h (enum target_hw_bp_type): Remove forward declaration. Include break-common.h. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 7ba137b..c420c06 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2015-02-27 Pedro Alves <palves@redhat.com> + * linux-x86-low.c (u_debugreg_offset): New function. + (x86_linux_dr_get, x86_linux_dr_set): Use it. + +2015-02-27 Pedro Alves <palves@redhat.com> + * gdb_proc_service.h: Wrap with EXTERN_C_PUSH/EXTERN_C_POP. [!HAVE_PROC_SERVICE_H] (struct ps_prochandle): Forward declare. [!HAVE_PROC_SERVICE_H] (ps_pdread, ps_pdwrite, ps_ptread) diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 171735c..c376cab 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -530,6 +530,18 @@ x86_breakpoint_at (CORE_ADDR pc) return 0; } + +/* Return the offset of REGNUM in the u_debugreg field of struct + user. */ + +static int +u_debugreg_offset (int regnum) +{ + return (offsetof (struct user, u_debugreg) + + sizeof (((struct user *) 0)->u_debugreg[0]) * regnum); +} + + /* Support for debug registers. */ static unsigned long @@ -541,8 +553,7 @@ x86_linux_dr_get (ptid_t ptid, int regnum) tid = ptid_get_lwp (ptid); errno = 0; - value = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user, u_debugreg[regnum]), 0); + value = ptrace (PTRACE_PEEKUSER, tid, u_debugreg_offset (regnum), 0); if (errno != 0) error ("Couldn't read debug register"); @@ -557,8 +568,7 @@ x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) tid = ptid_get_lwp (ptid); errno = 0; - ptrace (PTRACE_POKEUSER, tid, - offsetof (struct user, u_debugreg[regnum]), value); + ptrace (PTRACE_POKEUSER, tid, u_debugreg_offset (regnum), value); if (errno != 0) error ("Couldn't write debug register"); } diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 9d82be2..c58c01a 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -51,6 +51,16 @@ struct arch_lwp_info int have_ptrace_getregset = -1; +/* Return the offset of REGNUM in the u_debugreg field of struct + user. */ + +static int +u_debugreg_offset (int regnum) +{ + return (offsetof (struct user, u_debugreg) + + sizeof (((struct user *) 0)->u_debugreg[0]) * regnum); +} + /* Support for debug registers. */ /* Get debug register REGNUM value from only the one LWP of PTID. */ @@ -65,8 +75,8 @@ x86_linux_dr_get (ptid_t ptid, int regnum) tid = ptid_get_lwp (ptid); errno = 0; - value = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user, u_debugreg[regnum]), 0); + value = ptrace (PTRACE_PEEKUSER, tid, u_debugreg_offset (regnum), 0); + if (errno != 0) perror_with_name (_("Couldn't read debug register")); @@ -84,8 +94,7 @@ x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) tid = ptid_get_lwp (ptid); errno = 0; - ptrace (PTRACE_POKEUSER, tid, - offsetof (struct user, u_debugreg[regnum]), value); + ptrace (PTRACE_POKEUSER, tid, u_debugreg_offset (regnum), value); if (errno != 0) perror_with_name (_("Couldn't write debug register")); } |