From: Gary Benson <gbenson@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 09/15] Merge i386_update_inferior_debug_regs
Date: Tue, 17 Jun 2014 14:44:00 -0000 [thread overview]
Message-ID: <1403014378-4349-10-git-send-email-gbenson@redhat.com> (raw)
In-Reply-To: <1403014378-4349-1-git-send-email-gbenson@redhat.com>
This commit synchronizes the i386_update_inferior_debug_regs functions
in i386-nat.c and i386-low.c.
gdb/
2014-06-17 Gary Benson <gbenson@redhat.com>
* i386-nat.c (i386_update_inferior_debug_regs) <state>:
New parameter. All uses updated.
gdb/gdbserver/
2014-06-17 Gary Benson <gbenson@redhat.com>
* i386-low.c (i386_update_inferior_debug_regs) <inf_state>:
Renamed to state.
---
gdb/ChangeLog | 5 +++++
gdb/gdbserver/ChangeLog | 10 ++++++++++
gdb/gdbserver/i386-low.c | 12 ++++++------
gdb/i386-nat.c | 17 ++++++++---------
4 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/gdb/gdbserver/i386-low.c b/gdb/gdbserver/i386-low.c
index 54dd4b8..8c50838 100644
--- a/gdb/gdbserver/i386-low.c
+++ b/gdb/gdbserver/i386-low.c
@@ -417,27 +417,27 @@ Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"),
return retval;
}
-/* Update the inferior debug registers state, in INF_STATE, with the
+/* Update the inferior debug registers state, in STATE, with the
new debug registers state, in NEW_STATE. */
static void
-i386_update_inferior_debug_regs (struct i386_debug_reg_state *inf_state,
+i386_update_inferior_debug_regs (struct i386_debug_reg_state *state,
struct i386_debug_reg_state *new_state)
{
int i;
ALL_DEBUG_REGISTERS (i)
{
- if (I386_DR_VACANT (new_state, i) != I386_DR_VACANT (inf_state, i))
+ if (I386_DR_VACANT (new_state, i) != I386_DR_VACANT (state, i))
i386_dr_low_set_addr (new_state, i);
else
- gdb_assert (new_state->dr_mirror[i] == inf_state->dr_mirror[i]);
+ gdb_assert (new_state->dr_mirror[i] == state->dr_mirror[i]);
}
- if (new_state->dr_control_mirror != inf_state->dr_control_mirror)
+ if (new_state->dr_control_mirror != state->dr_control_mirror)
i386_dr_low_set_control (new_state);
- *inf_state = *new_state;
+ *state = *new_state;
}
/* Insert a watchpoint to watch a memory region which starts at
diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
index 6520549..a64cdab 100644
--- a/gdb/i386-nat.c
+++ b/gdb/i386-nat.c
@@ -526,14 +526,13 @@ Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"),
return retval;
}
-/* Update the inferior's debug registers with the new debug registers
- state, in NEW_STATE, and then update our local mirror to match. */
+/* Update the inferior debug registers state, in STATE, with the
+ new debug registers state, in NEW_STATE. */
static void
-i386_update_inferior_debug_regs (struct i386_debug_reg_state *new_state)
+i386_update_inferior_debug_regs (struct i386_debug_reg_state *state,
+ struct i386_debug_reg_state *new_state)
{
- struct i386_debug_reg_state *state
- = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
int i;
ALL_DEBUG_REGISTERS (i)
@@ -586,7 +585,7 @@ i386_insert_watchpoint (struct target_ops *self,
}
if (retval == 0)
- i386_update_inferior_debug_regs (&local_state);
+ i386_update_inferior_debug_regs (state, &local_state);
if (debug_hw_points)
i386_show_dr (state, "insert_watchpoint", addr, len, type);
@@ -626,7 +625,7 @@ i386_remove_watchpoint (struct target_ops *self,
}
if (retval == 0)
- i386_update_inferior_debug_regs (&local_state);
+ i386_update_inferior_debug_regs (state, &local_state);
if (debug_hw_points)
i386_show_dr (state, "remove_watchpoint", addr, len, type);
@@ -761,7 +760,7 @@ i386_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
addr, len_rw) ? EBUSY : 0;
if (retval == 0)
- i386_update_inferior_debug_regs (&local_state);
+ i386_update_inferior_debug_regs (state, &local_state);
if (debug_hw_points)
i386_show_dr (state, "insert_hwbp", addr, 1, hw_execute);
@@ -787,7 +786,7 @@ i386_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
addr, len_rw);
if (retval == 0)
- i386_update_inferior_debug_regs (&local_state);
+ i386_update_inferior_debug_regs (state, &local_state);
if (debug_hw_points)
i386_show_dr (state, "remove_hwbp", addr, 1, hw_execute);
--
1.7.1
next prev parent reply other threads:[~2014-06-17 14:44 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 14:13 [PATCH 00/15] Refactor shared code in i386-{nat,low}.[ch] Gary Benson
2014-06-17 14:13 ` [PATCH 03/15] Remove unused macro Gary Benson
2014-06-17 15:35 ` Pedro Alves
2014-06-17 14:13 ` [PATCH 04/15] Comment changes Gary Benson
2014-06-17 15:45 ` Pedro Alves
2014-06-17 16:10 ` Gary Benson
2014-06-17 17:11 ` Pedro Alves
2014-06-17 14:13 ` [PATCH 01/15] Whitespace changes Gary Benson
2014-06-17 15:23 ` Pedro Alves
2014-06-17 14:40 ` [PATCH 14/15] Create nat/i386-dregs.c Gary Benson
2014-06-17 16:56 ` Pedro Alves
2014-06-18 13:43 ` Gary Benson
2014-06-17 14:40 ` [PATCH 06/15] Merge printing code Gary Benson
2014-06-17 16:01 ` Pedro Alves
2014-06-17 14:44 ` Gary Benson [this message]
2014-06-17 16:06 ` [PATCH 09/15] Merge i386_update_inferior_debug_regs Pedro Alves
2014-06-17 14:44 ` [PATCH 12/15] Create nat/i386-dregs.h Gary Benson
2014-06-17 16:48 ` Pedro Alves
2014-06-18 11:14 ` Gary Benson
2014-06-17 14:48 ` [PATCH 11/15] Rename functions and make nonstatic as necessary Gary Benson
2014-06-17 16:13 ` Pedro Alves
2014-06-18 10:25 ` Siva Chandra
2014-06-18 13:30 ` Gary Benson
2014-06-18 13:55 ` Pedro Alves
2014-06-18 14:03 ` Siva Chandra
2014-06-18 14:09 ` Gary Benson
2014-06-18 14:18 ` Pedro Alves
2014-06-17 14:48 ` [PATCH 07/15] Merge error handling Gary Benson
2014-06-17 16:02 ` Pedro Alves
2014-06-17 14:53 ` [PATCH 10/15] Abstract i386_dr_low access Gary Benson
2014-06-17 16:10 ` Pedro Alves
2014-06-17 14:53 ` [PATCH 02/15] Remove unnecessary prototypes Gary Benson
2014-06-17 15:26 ` Pedro Alves
2014-06-17 14:53 ` [PATCH 08/15] Rename maint_show_dr to debug_hw_points Gary Benson
2014-06-17 16:03 ` Pedro Alves
2014-06-17 14:53 ` [PATCH 05/15] Add a const Gary Benson
2014-06-17 15:46 ` Pedro Alves
2014-06-17 14:58 ` [PATCH 15/15] Buildsystem changes Gary Benson
2014-06-17 16:41 ` Pedro Alves
2014-06-17 14:58 ` [PATCH 13/15] Move macros from i386-{nat,low}.c to i386-{nat,low}.h Gary Benson
2014-06-17 16:54 ` Pedro Alves
2014-06-18 11:33 ` Gary Benson
2014-06-18 11:50 ` Pedro Alves
2014-06-17 17:00 ` [PATCH 00/15] Refactor shared code in i386-{nat,low}.[ch] Pedro Alves
2014-06-18 10:49 ` Gary Benson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403014378-4349-10-git-send-email-gbenson@redhat.com \
--to=gbenson@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).