OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert fatal to gdb_assert in both i386_dr_low_set_addr 

This commit converts if..fatal checks in both i386_dr_low_set_addr
implementations to gdb_asserts.  It's not obvious from the context,
but the conditional in both cases is changed to match the equivalent
conditional in the i386_dr_low_get_addr implementations.  Nothing
fundamental has changed because DR_FIRSTADDR is zero.  This commit
also removes a vague comment in Linux i386_dr_low_get_addr.  I could
have reworded the comment (and replicated it three times for the other
identical assertions) but I think the existence of specific functions
for the status and control registers makes it fairly obvious what is
going on.

gdb/gdbserver/ChangeLog:

	* linux-x86-low.c (i386_dr_low_set_addr): Replace check with
	gdb_assert.
	(i386_dr_low_get_addr): Remove vague comment.
	* win32-i386-low.c (i386_dr_low_set_addr): Replace check with
	gdb_assert.
This commit is contained in:
Gary Benson 2014-08-06 14:00:14 +01:00
parent 38e08fcac0
commit f7160e9741
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,11 @@
2014-08-28 Gary Benson <gbenson@redhat.com>
* linux-x86-low.c (i386_dr_low_set_addr): Replace check with
gdb_assert.
(i386_dr_low_get_addr): Remove vague comment.
* win32-i386-low.c (i386_dr_low_set_addr): Replace check with
gdb_assert.
2014-08-28 Gary Benson <gbenson@redhat.com>
* inferiors.c (get_thread_process): Replace check with gdb_assert.

4
gdb/gdbserver/linux-x86-low.c
View File

@ -592,8 +592,7 @@ i386_dr_low_set_addr (int regnum, CORE_ADDR addr)
/* Only update the threads of this process. */
int pid = pid_of (current_inferior);
if (! (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR))
fatal ("Invalid debug register %d", regnum);
gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
find_inferior (&all_threads, update_debug_registers_callback, &pid);
}
@ -605,7 +604,6 @@ i386_dr_low_get_addr (int regnum)
{
ptid_t ptid = ptid_of (current_inferior);
/* DR6 and DR7 are retrieved with some other way. */
gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
return x86_linux_dr_get (ptid, regnum);

3
gdb/gdbserver/win32-i386-low.c
View File

@ -48,8 +48,7 @@ static int debug_registers_used = 0;
static void
i386_dr_low_set_addr (int regnum, CORE_ADDR addr)
{
if (! (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR))
fatal ("Invalid debug register %d", regnum);
gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
/* debug_reg_state.dr_mirror is already set.
Just notify i386_set_thread_context, i386_thread_added