From f7160e97410b4b65330e5f23d82e8879c908de50 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 6 Aug 2014 14:00:14 +0100 Subject: [PATCH] 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. --- gdb/gdbserver/ChangeLog | 8 ++++++++ gdb/gdbserver/linux-x86-low.c | 4 +--- gdb/gdbserver/win32-i386-low.c | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 778500faed1..ec3fc93a95f 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,11 @@ +2014-08-28 Gary Benson + + * 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 * inferiors.c (get_thread_process): Replace check with gdb_assert. diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index a47fcbe6f69..5175019e83c 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -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); diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c index e89467766f3..39149f37a9e 100644 --- a/gdb/gdbserver/win32-i386-low.c +++ b/gdb/gdbserver/win32-i386-low.c @@ -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 -- 2.30.2