From ea008da432a185fccb9ef967b32092eea98d3c9e Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 11 Jun 2014 15:30:50 +0100 Subject: [PATCH] Rename maint_show_dr to debug_hw_points This commit renames maint_show_dr to debug_hw_points in i386-nat.c. gdb/ 2014-06-18 Gary Benson * i386-nat.c (maint_show_dr): Renamed to debug_hw_points. All uses updated. --- gdb/ChangeLog | 5 +++++ gdb/i386-nat.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2754c61..54a573e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2014-06-18 Gary Benson + * i386-nat.c (maint_show_dr): Renamed to debug_hw_points. + All uses updated. + +2014-06-18 Gary Benson + * i386-nat.c (debug_printf): New macro. (i386_get_debug_register_length): Likewise. (TARGET_HAS_DR_LEN_8): Use above macro. diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c index 91d868d..6520549 100644 --- a/gdb/i386-nat.c +++ b/gdb/i386-nat.c @@ -37,6 +37,9 @@ The functions below implement debug registers sharing by reference counts, and allow to watch regions up to 16 bytes long. */ +/* Whether or not to print the mirrored debug registers. */ +static int debug_hw_points; + /* Function used for printing mirrored debug registers. */ #define debug_printf(fmt, args...) \ fprintf_unfiltered (gdb_stdlog, fmt, ##args); @@ -256,9 +259,6 @@ i386_forget_process (pid_t pid) } } -/* Whether or not to print the mirrored debug registers. */ -static int maint_show_dr; - /* Types of operations supported by i386_handle_nonaligned_watchpoint. */ typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } i386_wp_op_t; @@ -588,7 +588,7 @@ i386_insert_watchpoint (struct target_ops *self, if (retval == 0) i386_update_inferior_debug_regs (&local_state); - if (maint_show_dr) + if (debug_hw_points) i386_show_dr (state, "insert_watchpoint", addr, len, type); return retval; @@ -628,7 +628,7 @@ i386_remove_watchpoint (struct target_ops *self, if (retval == 0) i386_update_inferior_debug_regs (&local_state); - if (maint_show_dr) + if (debug_hw_points) i386_show_dr (state, "remove_watchpoint", addr, len, type); return retval; @@ -721,12 +721,12 @@ i386_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p) { addr = i386_dr_low.get_addr (i); rc = 1; - if (maint_show_dr) + if (debug_hw_points) i386_show_dr (state, "watchpoint_hit", addr, -1, hw_write); } } - if (maint_show_dr && addr == 0) + if (debug_hw_points && addr == 0) i386_show_dr (state, "stopped_data_addr", 0, 0, hw_write); if (rc) @@ -763,7 +763,7 @@ i386_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch, if (retval == 0) i386_update_inferior_debug_regs (&local_state); - if (maint_show_dr) + if (debug_hw_points) i386_show_dr (state, "insert_hwbp", addr, 1, hw_execute); return retval; @@ -789,7 +789,7 @@ i386_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch, if (retval == 0) i386_update_inferior_debug_regs (&local_state); - if (maint_show_dr) + if (debug_hw_points) i386_show_dr (state, "remove_hwbp", addr, 1, hw_execute); return retval; @@ -825,7 +825,7 @@ add_show_debug_regs_command (void) /* A maintenance command to enable printing the internal DRi mirror variables. */ add_setshow_boolean_cmd ("show-debug-regs", class_maintenance, - &maint_show_dr, _("\ + &debug_hw_points, _("\ Set whether to show variables that mirror the x86 debug registers."), _("\ Show whether to show variables that mirror the x86 debug registers."), _("\ Use \"on\" to enable, \"off\" to disable.\n\ -- 2.7.4