diff options
| author | Gary Benson <gbenson@redhat.com> | 2014-06-12 12:01:11 +0100 |
|---|---|---|
| committer | Gary Benson <gbenson@redhat.com> | 2014-06-18 10:15:23 +0100 |
| commit | d9305f7fef566159dd940a11155107407f43ec15 (patch) | |
| tree | 1eb4652a1ae3c2a393fbe66add08d5bf5286e48a /gdb/gdbserver | |
| parent | ea008da432a185fccb9ef967b32092eea98d3c9e (diff) | |
| download | gdb-d9305f7fef566159dd940a11155107407f43ec15.zip gdb-d9305f7fef566159dd940a11155107407f43ec15.tar.gz gdb-d9305f7fef566159dd940a11155107407f43ec15.tar.bz2 | |
Merge i386_update_inferior_debug_regs
This commit synchronizes the i386_update_inferior_debug_regs functions
in i386-nat.c and i386-low.c.
gdb/
2014-06-18 Gary Benson <gbenson@redhat.com>
* i386-nat.c (i386_update_inferior_debug_regs) <state>:
New parameter. All uses updated.
gdb/gdbserver/
2014-06-18 Gary Benson <gbenson@redhat.com>
* i386-low.c (i386_update_inferior_debug_regs) <inf_state>:
Renamed to state.
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/i386-low.c | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 91dc498..7c72043 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2014-06-18 Gary Benson <gbenson@redhat.com> + * i386-low.c (i386_update_inferior_debug_regs) <inf_state>: + Renamed to state. + +2014-06-18 Gary Benson <gbenson@redhat.com> + * i386-low.c (i386_length_and_rw_bits): Use internal_error instead of fatal and error. (i386_handle_nonaligned_watchpoint): Likewise. 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 |