old-cross-binutils/gdb/i386-nat.c

785 lines
25 KiB
C
Raw Normal View History

/* Native-dependent code for the i386.
2011-01-01 15:34:07 +00:00
Copyright (C) 2001, 2004, 2005, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
#include "i386-nat.h"
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
#include "defs.h"
#include "breakpoint.h"
#include "command.h"
#include "gdbcmd.h"
#include "target.h"
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
#include "gdb_assert.h"
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Support for hardware watchpoints and breakpoints using the i386
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
debug registers.
This provides several functions for inserting and removing
hardware-assisted breakpoints and watchpoints, testing if one or
more of the watchpoints triggered and at what address, checking
whether a given region can be watched, etc.
The functions below implement debug registers sharing by reference
counts, and allow to watch regions up to 16 bytes long. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
struct i386_dr_low_type i386_dr_low;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Support for 8-byte wide hw watchpoints. */
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
#define TARGET_HAS_DR_LEN_8 (i386_dr_low.debug_register_length == 8)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Debug registers' indices. */
#define DR_NADDR 4 /* The number of debug address registers. */
#define DR_STATUS 6 /* Index of debug status register (DR6). */
#define DR_CONTROL 7 /* Index of debug control register (DR7). */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* DR7 Debug Control register fields. */
/* How many bits to skip in DR7 to get to R/W and LEN fields. */
#define DR_CONTROL_SHIFT 16
/* How many bits in DR7 per R/W and LEN field for each watchpoint. */
#define DR_CONTROL_SIZE 4
/* Watchpoint/breakpoint read/write fields in DR7. */
#define DR_RW_EXECUTE (0x0) /* Break on instruction execution. */
#define DR_RW_WRITE (0x1) /* Break on data writes. */
#define DR_RW_READ (0x3) /* Break on data reads or writes. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* This is here for completeness. No platform supports this
functionality yet (as of March 2001). Note that the DE flag in the
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
CR4 register needs to be set to support this. */
#ifndef DR_RW_IORW
#define DR_RW_IORW (0x2) /* Break on I/O reads or writes. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
#endif
/* Watchpoint/breakpoint length fields in DR7. The 2-bit left shift
is so we could OR this with the read/write field defined above. */
#define DR_LEN_1 (0x0 << 2) /* 1-byte region watch or breakpoint. */
#define DR_LEN_2 (0x1 << 2) /* 2-byte region watch. */
#define DR_LEN_4 (0x3 << 2) /* 4-byte region watch. */
#define DR_LEN_8 (0x2 << 2) /* 8-byte region watch (AMD64). */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Local and Global Enable flags in DR7.
When the Local Enable flag is set, the breakpoint/watchpoint is
enabled only for the current task; the processor automatically
clears this flag on every task switch. When the Global Enable flag
is set, the breakpoint/watchpoint is enabled for all tasks; the
processor never clears this flag.
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
Currently, all watchpoint are locally enabled. If you need to
enable them globally, read the comment which pertains to this in
i386_insert_aligned_watchpoint below. */
#define DR_LOCAL_ENABLE_SHIFT 0 /* Extra shift to the local enable bit. */
#define DR_GLOBAL_ENABLE_SHIFT 1 /* Extra shift to the global enable bit. */
#define DR_ENABLE_SIZE 2 /* Two enable bits per debug register. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Local and global exact breakpoint enable flags (a.k.a. slowdown
flags). These are only required on i386, to allow detection of the
exact instruction which caused a watchpoint to break; i486 and
later processors do that automatically. We set these flags for
backwards compatibility. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
#define DR_LOCAL_SLOWDOWN (0x100)
#define DR_GLOBAL_SLOWDOWN (0x200)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Fields reserved by Intel. This includes the GD (General Detect
Enable) flag, which causes a debug exception to be generated when a
MOV instruction accesses one of the debug registers.
FIXME: My Intel manual says we should use 0xF800, not 0xFC00. */
#define DR_CONTROL_RESERVED (0xFC00)
/* Auxiliary helper macros. */
/* A value that masks all fields in DR7 that are reserved by Intel. */
#define I386_DR_CONTROL_MASK (~DR_CONTROL_RESERVED)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* The I'th debug register is vacant if its Local and Global Enable
bits are reset in the Debug Control register. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
#define I386_DR_VACANT(state, i) \
(((state)->dr_control_mirror & (3 << (DR_ENABLE_SIZE * (i)))) == 0)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Locally enable the break/watchpoint in the I'th debug register. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
#define I386_DR_LOCAL_ENABLE(state, i) \
do { \
(state)->dr_control_mirror |= \
(1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i))); \
} while (0)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Globally enable the break/watchpoint in the I'th debug register. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
#define I386_DR_GLOBAL_ENABLE(state, i) \
do { \
(state)->dr_control_mirror |= \
(1 << (DR_GLOBAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i))); \
} while (0)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Disable the break/watchpoint in the I'th debug register. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
#define I386_DR_DISABLE(state, i) \
do { \
(state)->dr_control_mirror &= \
~(3 << (DR_ENABLE_SIZE * (i))); \
} while (0)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Set in DR7 the RW and LEN fields for the I'th debug register. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
#define I386_DR_SET_RW_LEN(state, i, rwlen) \
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
do { \
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
(state)->dr_control_mirror &= \
~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
(state)->dr_control_mirror |= \
((rwlen) << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
} while (0)
/* Get from DR7 the RW and LEN fields for the I'th debug register. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
#define I386_DR_GET_RW_LEN(dr7, i) \
(((dr7) \
>> (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))) & 0x0f)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Mask that this I'th watchpoint has triggered. */
#define I386_DR_WATCH_MASK(i) (1 << (i))
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Did the watchpoint whose address is in the I'th register break? */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
#define I386_DR_WATCH_HIT(dr6, i) ((dr6) & (1 << (i)))
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* A macro to loop over all debug registers. */
#define ALL_DEBUG_REGISTERS(i) for (i = 0; i < DR_NADDR; i++)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
/* Global state needed to track h/w watchpoints. */
struct i386_debug_reg_state
{
/* Mirror the inferior's DRi registers. We keep the status and
control registers separated because they don't hold addresses.
Note that since we can change these mirrors while threads are
running, we never trust them to explain a cause of a trap.
For that, we need to peek directly in the inferior registers. */
CORE_ADDR dr_mirror[DR_NADDR];
unsigned dr_status_mirror, dr_control_mirror;
/* Reference counts for each debug register. */
int dr_ref_count[DR_NADDR];
};
/* Clear the reference counts and forget everything we knew about the
debug registers. */
static void
i386_init_dregs (struct i386_debug_reg_state *state)
{
int i;
ALL_DEBUG_REGISTERS (i)
{
state->dr_mirror[i] = 0;
state->dr_ref_count[i] = 0;
}
state->dr_control_mirror = 0;
state->dr_status_mirror = 0;
}
static struct i386_debug_reg_state dr_mirror;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Whether or not to print the mirrored debug registers. */
static int maint_show_dr;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Types of operations supported by i386_handle_nonaligned_watchpoint. */
typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } i386_wp_op_t;
/* Internal functions. */
/* Return the value of a 4-bit field for DR7 suitable for watching a
region of LEN bytes for accesses of type TYPE. LEN is assumed to
have the value of 1, 2, or 4. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
static unsigned i386_length_and_rw_bits (int len, enum target_hw_bp_type type);
/* Insert a watchpoint at address ADDR, which is assumed to be aligned
according to the length of the region to watch. LEN_RW_BITS is the
value of the bit-field from DR7 which describes the length and
access type of the region to be watched by this watchpoint. Return
0 on success, -1 on failure. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
static int i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
CORE_ADDR addr,
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
unsigned len_rw_bits);
/* Remove a watchpoint at address ADDR, which is assumed to be aligned
according to the length of the region to watch. LEN_RW_BITS is the
value of the bits from DR7 which describes the length and access
type of the region watched by this watchpoint. Return 0 on
success, -1 on failure. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
static int i386_remove_aligned_watchpoint (struct i386_debug_reg_state *state,
CORE_ADDR addr,
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
unsigned len_rw_bits);
/* Insert or remove a (possibly non-aligned) watchpoint, or count the
number of debug registers required to watch a region at address
ADDR whose length is LEN for accesses of type TYPE. Return 0 on
successful insertion or removal, a positive number when queried
about the number of registers, or -1 on failure. If WHAT is not a
valid value, bombs through internal_error. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
static int i386_handle_nonaligned_watchpoint (struct i386_debug_reg_state *state,
i386_wp_op_t what,
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
CORE_ADDR addr, int len,
enum target_hw_bp_type type);
/* Implementation. */
/* Clear the reference counts and forget everything we knew about the
debug registers. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
void
i386_cleanup_dregs (void)
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_init_dregs (&dr_mirror);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
/* Print the values of the mirrored debug registers. This is called
when maint_show_dr is non-zero. To set that up, type "maint
show-debug-regs" at GDB's prompt. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
static void
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_show_dr (struct i386_debug_reg_state *state,
const char *func, CORE_ADDR addr,
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
int len, enum target_hw_bp_type type)
{
* defs.h (strlen_paddr, paddr, paddr_nz): Remove. (paddress): Add GDBARCH parameter. * utils.c (strlen_paddr, paddr, paddr_nz): Remove. (paddress): Add GDBARCH parameter, use it instead of current_gdbarch. * ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter. * ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter, use it instead of current_gdbarch. Update calls to ui_out_field_core_addr to pass architecture: * ada-lang.c (print_one_exception): Update. * breakpoint.c (print_one_breakpoint_location, print_one_exception_catchpoint): Update. * disasm.c (dump_insns): Update. * darwin-nat-info.c (darwin_debug_regions_recurse): Update. * mi/mi-main.c (mi_cmd_data_read_memory): Update. * mi/mi-symbol-cmds.c: Include "objfiles.h". (mi_cmd_symbol_list_lines): Update. * stack.c (print_frame_info, print_frame): Update. Update callers of paddress to pass architecture: * ada-tasks.c (info_task): Update. * ada-valprint.c (ada_val_print_1): Update. * annotate.c (annotate_source, annotate_frame_begin): Update. * breakpoint.c (insert_bp_location, describe_other_breakpoints, mention): Update. * cli/cli-cmds.c (edit_command, list_command, print_disassembly): Update. * corefile.c (memory_error): Update. * c-valprint.c (print_function_pointer_address, c_val_print): Update. * disasm.c (dis_asm_print_address): Update. * exec.c (print_section_info): Update. * f-valprint.c (f_val_print): Update. * infcmd.c: Include "arch-utils.h". (jump_command, program_info): Update. * linux-fork.c: Include "arch-utils.h". (info_forks_command): Update. * m2-valprint.c (print_function_pointer_address, print_unpacked_pointer, print_variable_at_address, m2_val_print): Update. * m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command): Update. * printcmd.c (print_address, print_address_demangle, address_info): Update. * p-valprint.c (pascal_val_print): Update. * source.c: Include "arch-utils.h". (line_info): Update. * stack.c (frame_info, print_block_frame_labels): Update. * symfile.c (add_symbol_file_command, list_overlays_command): Update. * symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1, print_symbol, print_partial_symbols, maintenance_info_psymtabs, maintenance_check_symtabs): Update. * symtab.c (find_pc_sect_symtab): Update. * target.c (deprecated_debug_xfer_memory): Update. * tracepoint.c (scope_info): Update. * tui/tui-stack.c (tui_make_status_line): Update. * valprint.c (val_print_string): Update. Update callers of paddr_nz to use paddress instead (keeping user-visible output identical): * alpha-tdep.c (alpha_heuristic_proc_start): Update. * amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn, amd64_displaced_step_fixup): Update. * arch-utils.c (simple_displaced_step_copy_insn): Update. * auxv.c (fprint_target_auxv): Update. * breakpoint.c (insert_single_step_breakpoint): Update. * buildsym.c (finish_block): Update. * cli/cli-dump.c (restore_section_callback): Update. * fbsd-nat.c (fbsd_find_memory_regions): Update. * frame.c (frame_unwind_register_value): Update. * gcore.c (gcore_create_callback): Update. * hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update. * i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm, i386_record_lea_modrm_addr, i386_record_lea_modrm, i386_process_record): Update. * ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id, ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id, ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update. * infrun.c (displaced_step_prepare, displaced_step_fixup, handle_inferior_event, insert_step_resume_breakpoint_at_sal, insert_longjmp_resume_breakpoint): Update. * linux-nat.c (linux_nat_find_memory_regions): Update. * linux-record.c (record_linux_system_call): Update. * mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call, mips_n32n64_push_dummy_call, mips_o32_push_dummy_call, mips_o64_push_dummy_call): Update. * monitor.c (monitor_error, monitor_remove_breakpoint): Update. * record.c (record_arch_list_add_mem, record_wait, record_xfer_partial): Update. * remote-mips.c (mips_fetch_word, mips_check_lsi_error, mips_common_breakpoint): Update. * remote-sim.c (gdbsim_xfer_inferior_memory): Update. * rs6000-tdep.c (ppc_displaced_step_fixup): Update. * solib-som.c (som_current_sos): Update. * symfile.c (load_progress, generic_load): Update. * symfile-mem.c (add_vsyscall_page): Update. * valops.c (value_fetch_lazy): Update. * windows-tdep.c (windows_xfer_shared_library): Update. Update callers of paddr_nz to use paddress instead (changing user-visible output to make it more correct): * dwarf2loc.c (locexpr_describe_location): Update. * ia64-tdep.c (ia64_memory_insert_breakpoint, ia64_memory_remove_breakpoint): Update. * jv-valprint.c (java_value_print): Update. * m32c-tdep.c (m32c_m16c_address_to_pointer): Update. * monitor.c (monitor_read_memory): Update. Update callers of paddr to use paddress instead (changing user-visible output to make it more correct): * arm-tdep.c (arm_push_dummy_call): Update. * breakpoint.c (insert_bp_location, create_thread_event_breakpoint, create_breakpoint): Update. * darwin-nat-info.c (darwin_debug_regions): Update. * dcache.c (dcache_info): Update. * dsrec.c (load_srec, make_srec): Update. * dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program, dwarf2_frame_cache): Update. * gcore.c (gcore_copy_callback): Update. * gnu-nat.c (gnu_xfer_memory): Update. * mips-linux-nat.c (mips_show_dr): Update. * monitor.c (monitor_write_memory, monitor_insert_breakpoint, monitor_remove_breakpoint): Update. * remote.c (compare_sections_command): Update. * remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint, m32r_remove_breakpoint, m32r_insert_watchpoint, m32r_remove_watchpoint): Update. * sol-thread.c (info_cb): Update. * symfile.c (load_progress): Update. Update callers of paddress or paddr_nz to use hex_string instead (changes output of internal/error/debug messages only): * dwarf2read.c (dump_die_shallow): Update. * frame.c (fprint_field, fprint_frame, frame_pc_unwind, get_frame_func, create_new_frame): Update. * hppa-tdep.c (find_unwind_entry, unwind_command): Update. * ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x, ia64_get_dyn_info_list): Update. * maint.c (maintenance_translate_address): Update. * mi/mi-cmd-var.c (mi_cmd_var_create): Update. * target.c (target_flash_erase): Update. Update callers of paddr/paddr_nz to use phex/phex_nz instead, using an appropriate address size. Remove use of strlen_paddr. * exec.c (exec_files_info): Update. * i386-nat.c (i386_show_dr): Update. * remote.c (remote_flash_erase): Update. * m32r-rom.c (m32r_load_section): Update. * monitor.c (monitor_vsprintf, monitor_store_register): Update. * remote.c (remote_check_symbols, remote_search_memory): Update. * remote-mips.c (mips_request, mips_common_breakpoint): Update. * scm-valprint.c (scm_ipruk, scm_scmval_print): Update. * sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update. * sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs, sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs, sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs, sh_dsp_show_regs): Update. * xcoffsolib.c (sharedlibrary_command): Update. * maint.c (maint_print_section_info): Add ADDR_SIZE parameter. Use hex_string_custom instead of paddr. (print_bfd_section_info): Pass address size. (print_objfile_section_info): Likewise. * annotate.h (annotate_source): Add GDBARCH parameter. (annotate_frame_begin): Likewise. * annotate.c (annotate_source): Add GDBARCH parameter. (annotate_frame_begin): Likewise. * source.c (identify_source_line): Update call to annotate_source. * stack.c (print_frame_info, print_frame): Update call to annotate_frame_begin. * breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter. (create_breakpoint, create_ada_exception_breakpoint): Update call. * stack.c (print_block_frame_labels): Add GDBARCH parameter. (print_frame_label_vars): Update call. * symmisc.c (print_partial_symbols): Add GDBARCH parameter. (dump_psymtab): Update call to print_partial_symbols. (struct print_symbol_args): Add GDBARCH member. (dump_symtab_1): Set print_symbol_args architecture member. (print_symbol): Use it. * windows-tdep.h (windows_xfer_shared_library): Add GDBARCH parameter. * windows-tdep.c (windows_xfer_shared_library): Likewise. * i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member. (core_process_module_section): Pass architecture from cpms_data to windows_xfer_shared_library. (windows_core_xfer_shared_libraries): Initialize cmps_data architecture member. * windows-nat.c (windows_xfer_shared_libraries): Pass architecture to windows_xfer_shared_library. * defs.h (print_address): Add GDBARCH parameter. * printcmd.c (print_address): Add GDBARCH parameter. (print_scalar_formatted, do_examine): Update call. * findcmd.c (find_command): Update call. * tracepoint.c: Include "arch-utils.h". (trace_find_line_command): Update call. * tui/tui-disasm.c (tui_disassemble): Update call. * value.h (print_address_demangle): Add GDBARCH parameter. * printcmd.c (print_address_demangle): Add GDBARCH parameter. * c-valprint.c (print_function_pointer_address, c_val_print): Update call. * f-valprint.c (f_val_print): Update call. * gnu-v3-abi.c (gnuv3_print_method_ptr): Update call. * jv-valprint.c (java_val_print): Update call. * m2-valprint.c (print_function_pointer_address, m2_val_print): Update call. * p-valprint.c (pascal_val_print): Update call. * disasm.c (gdb_disassemble_info): Install architecture into di.application_data field. testsuite/ChangeLog: * gdb.threads/tls-shared.exp: Update to locexpr_describe_location change to prefix TLS offset in hex with 0x. doc/ChangeLog: * gdbint.texinfo (Item Output Functions): Update signature for ui_out_field_core_addr.
2009-07-02 17:21:10 +00:00
int addr_size = gdbarch_addr_bit (target_gdbarch) / 8;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
int i;
puts_unfiltered (func);
if (addr || len)
printf_unfiltered (" (addr=%lx, len=%d, type=%s)",
/* This code is for ia32, so casting CORE_ADDR
to unsigned long should be okay. */
(unsigned long)addr, len,
type == hw_write ? "data-write"
: (type == hw_read ? "data-read"
: (type == hw_access ? "data-read/write"
: (type == hw_execute ? "instruction-execute"
/* FIXME: if/when I/O read/write
watchpoints are supported, add them
here. */
: "??unknown??"))));
puts_unfiltered (":\n");
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
printf_unfiltered ("\tCONTROL (DR7): %s STATUS (DR6): %s\n",
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
phex (state->dr_control_mirror, 8),
phex (state->dr_status_mirror, 8));
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
ALL_DEBUG_REGISTERS(i)
{
printf_unfiltered ("\
\tDR%d: addr=0x%s, ref.count=%d DR%d: addr=0x%s, ref.count=%d\n",
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i, phex (state->dr_mirror[i], addr_size),
state->dr_ref_count[i],
i + 1, phex (state->dr_mirror[i + 1], addr_size),
state->dr_ref_count[i+1]);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
i++;
}
}
/* Return the value of a 4-bit field for DR7 suitable for watching a
region of LEN bytes for accesses of type TYPE. LEN is assumed to
have the value of 1, 2, or 4. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
static unsigned
i386_length_and_rw_bits (int len, enum target_hw_bp_type type)
{
unsigned rw;
switch (type)
{
case hw_execute:
rw = DR_RW_EXECUTE;
break;
case hw_write:
rw = DR_RW_WRITE;
break;
case hw_read:
internal_error (__FILE__, __LINE__,
_("The i386 doesn't support "
"data-read watchpoints.\n"));
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
case hw_access:
rw = DR_RW_READ;
break;
#if 0
/* Not yet supported. */
case hw_io_access:
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
rw = DR_RW_IORW;
break;
#endif
default:
2005-02-11 Andrew Cagney <cagney@gnu.org> Mark up error_no_arg, query, perror_with_name, complaint, and internal_error. * breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update. * cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update. * dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update. * dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update. * exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update. * frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update. * gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update. * go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update. * i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update. * i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update. * infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update. * interps.c, language.c, linespec.c, linux-nat.c: Update. * m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update. * m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update. * macrotab.c, maint.c, mdebugread.c, memattr.c: Update. * mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update. * mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update. * objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update. * parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update. * ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update. * regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update. * remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update. * remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update. * s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update. * sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update. * solib-aix5.c, solib-svr4.c, solib.c, source.c: Update. * sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update. * symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update. * utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update. * win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update. * cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update. * cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update. * mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update. * tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
internal_error (__FILE__, __LINE__, _("\
Invalid hardware breakpoint type %d in i386_length_and_rw_bits.\n"),
(int) type);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
switch (len)
{
case 1:
return (DR_LEN_1 | rw);
case 2:
return (DR_LEN_2 | rw);
case 4:
return (DR_LEN_4 | rw);
case 8:
if (TARGET_HAS_DR_LEN_8)
return (DR_LEN_8 | rw);
/* ELSE FALL THROUGH */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
default:
2005-02-11 Andrew Cagney <cagney@gnu.org> Mark up error_no_arg, query, perror_with_name, complaint, and internal_error. * breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update. * cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update. * dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update. * dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update. * exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update. * frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update. * gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update. * go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update. * i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update. * i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update. * infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update. * interps.c, language.c, linespec.c, linux-nat.c: Update. * m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update. * m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update. * macrotab.c, maint.c, mdebugread.c, memattr.c: Update. * mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update. * mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update. * objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update. * parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update. * ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update. * regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update. * remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update. * remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update. * s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update. * sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update. * solib-aix5.c, solib-svr4.c, solib.c, source.c: Update. * sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update. * symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update. * utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update. * win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update. * cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update. * cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update. * mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update. * tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
internal_error (__FILE__, __LINE__, _("\
Invalid hardware breakpoint length %d in i386_length_and_rw_bits.\n"), len);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
}
/* Insert a watchpoint at address ADDR, which is assumed to be aligned
according to the length of the region to watch. LEN_RW_BITS is the
value of the bits from DR7 which describes the length and access
type of the region to be watched by this watchpoint. Return 0 on
success, -1 on failure. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
static int
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
CORE_ADDR addr, unsigned len_rw_bits)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
int i;
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
if (!i386_dr_low.set_addr || !i386_dr_low.set_control)
return -1;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* First, look for an occupied debug register with the same address
and the same RW and LEN definitions. If we find one, we can
reuse it for this watchpoint as well (and save a register). */
ALL_DEBUG_REGISTERS(i)
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (!I386_DR_VACANT (state, i)
&& state->dr_mirror[i] == addr
&& I386_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
state->dr_ref_count[i]++;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
return 0;
}
}
/* Next, look for a vacant debug register. */
ALL_DEBUG_REGISTERS(i)
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (I386_DR_VACANT (state, i))
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
break;
}
/* No more debug registers! */
if (i >= DR_NADDR)
return -1;
/* Now set up the register I to watch our region. */
/* Record the info in our local mirrored array. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
state->dr_mirror[i] = addr;
state->dr_ref_count[i] = 1;
I386_DR_SET_RW_LEN (state, i, len_rw_bits);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Note: we only enable the watchpoint locally, i.e. in the current
task. Currently, no i386 target allows or supports global
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
watchpoints; however, if any target would want that in the
future, GDB should probably provide a command to control whether
to enable watchpoints globally or locally, and the code below
should use global or local enable and slow-down flags as
appropriate. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
I386_DR_LOCAL_ENABLE (state, i);
state->dr_control_mirror |= DR_LOCAL_SLOWDOWN;
state->dr_control_mirror &= I386_DR_CONTROL_MASK;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
return 0;
}
/* Remove a watchpoint at address ADDR, which is assumed to be aligned
according to the length of the region to watch. LEN_RW_BITS is the
value of the bits from DR7 which describes the length and access
type of the region watched by this watchpoint. Return 0 on
success, -1 on failure. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
static int
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_remove_aligned_watchpoint (struct i386_debug_reg_state *state,
CORE_ADDR addr, unsigned len_rw_bits)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
int i, retval = -1;
ALL_DEBUG_REGISTERS(i)
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (!I386_DR_VACANT (state, i)
&& state->dr_mirror[i] == addr
&& I386_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (--state->dr_ref_count[i] == 0) /* no longer in use? */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
/* Reset our mirror. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
state->dr_mirror[i] = 0;
I386_DR_DISABLE (state, i);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
retval = 0;
}
}
return retval;
}
/* Insert or remove a (possibly non-aligned) watchpoint, or count the
number of debug registers required to watch a region at address
ADDR whose length is LEN for accesses of type TYPE. Return 0 on
successful insertion or removal, a positive number when queried
about the number of registers, or -1 on failure. If WHAT is not a
valid value, bombs through internal_error. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
static int
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_handle_nonaligned_watchpoint (struct i386_debug_reg_state *state,
i386_wp_op_t what, CORE_ADDR addr, int len,
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
enum target_hw_bp_type type)
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
int retval = 0;
int max_wp_len = TARGET_HAS_DR_LEN_8 ? 8 : 4;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
static int size_try_array[8][8] =
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
{1, 1, 1, 1, 1, 1, 1, 1}, /* Trying size one. */
{2, 1, 2, 1, 2, 1, 2, 1}, /* Trying size two. */
{2, 1, 2, 1, 2, 1, 2, 1}, /* Trying size three. */
{4, 1, 2, 1, 4, 1, 2, 1}, /* Trying size four. */
{4, 1, 2, 1, 4, 1, 2, 1}, /* Trying size five. */
{4, 1, 2, 1, 4, 1, 2, 1}, /* Trying size six. */
{4, 1, 2, 1, 4, 1, 2, 1}, /* Trying size seven. */
{8, 1, 2, 1, 4, 1, 2, 1}, /* Trying size eight. */
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
};
while (len > 0)
{
int align = addr % max_wp_len;
/* Four (eight on AMD64) is the maximum length a debug register
can watch. */
int try = (len > max_wp_len ? (max_wp_len - 1) : len - 1);
int size = size_try_array[try][align];
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (what == WP_COUNT)
{
/* size_try_array[] is defined such that each iteration
through the loop is guaranteed to produce an address and a
size that can be watched with a single debug register.
Thus, for counting the registers required to watch a
region, we simply need to increment the count on each
iteration. */
retval++;
}
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
else
{
unsigned len_rw = i386_length_and_rw_bits (size, type);
if (what == WP_INSERT)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
retval = i386_insert_aligned_watchpoint (state, addr, len_rw);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
else if (what == WP_REMOVE)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
retval = i386_remove_aligned_watchpoint (state, addr, len_rw);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
else
2005-02-11 Andrew Cagney <cagney@gnu.org> Mark up error_no_arg, query, perror_with_name, complaint, and internal_error. * breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update. * cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update. * dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update. * dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update. * exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update. * frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update. * gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update. * go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update. * i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update. * i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update. * infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update. * interps.c, language.c, linespec.c, linux-nat.c: Update. * m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update. * m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update. * macrotab.c, maint.c, mdebugread.c, memattr.c: Update. * mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update. * mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update. * objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update. * parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update. * ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update. * regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update. * remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update. * remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update. * s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update. * sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update. * solib-aix5.c, solib-svr4.c, solib.c, source.c: Update. * sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update. * symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update. * utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update. * win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update. * cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update. * cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update. * mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update. * tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
internal_error (__FILE__, __LINE__, _("\
Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"),
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
(int)what);
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (retval)
break;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
addr += size;
len -= size;
}
return retval;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
/* Update the inferior's debug registers with the new debug registers
state, in NEW_STATE, and then update our local mirror to match. */
static void
i386_update_inferior_debug_regs (struct i386_debug_reg_state *new_state)
{
int i;
ALL_DEBUG_REGISTERS (i)
{
if (I386_DR_VACANT (new_state, i) != I386_DR_VACANT (&dr_mirror, i))
{
if (!I386_DR_VACANT (new_state, i))
{
i386_dr_low.set_addr (i, new_state->dr_mirror[i]);
/* Only a sanity check for leftover bits (set possibly only
by inferior). */
if (i386_dr_low.unset_status)
i386_dr_low.unset_status (I386_DR_WATCH_MASK (i));
}
else
{
if (i386_dr_low.reset_addr)
i386_dr_low.reset_addr (i);
}
}
else
gdb_assert (new_state->dr_mirror[i] == dr_mirror.dr_mirror[i]);
}
if (new_state->dr_control_mirror != dr_mirror.dr_control_mirror)
i386_dr_low.set_control (new_state->dr_control_mirror);
dr_mirror = *new_state;
}
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Insert a watchpoint to watch a memory region which starts at
address ADDR and whose length is LEN bytes. Watch memory accesses
of the type TYPE. Return 0 on success, -1 on failure. */
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static int
2010-07-07 Sergio Durigan Junior <sergiodj@linux.vnet.ibm.com> Thiago Jung Bauermann <bauerman@br.ibm.com> Support for hw accelerated condition watchpoints in booke powerpc. * breakpoint.c (fetch_watchpoint_value): Rename to fetch_subexp_value and move to eval.c. Change callers. (insert_bp_location): Pass watchpoint condition in target_insert_watchpoint. (remove_breakpoint_1) Pass watchpoint condition in target_remove_watchpoint. (watchpoint_locations_match): Call target_can_accel_watchpoint_condition. * eval.c: Include wrapper.h. (fetch_subexp_value): Moved from breakpoint.c. * ppc-linux-nat.c (ppc_linux_region_ok_for_hw_watchpoint): Formatting fix. (can_use_watchpoint_cond_accel): New function. (calculate_dvc): Likewise. (num_memory_accesses): Likewise. (check_condition): Likewise. (ppc_linux_can_accel_watchpoint_condition): Likewise (ppc_linux_insert_watchpoint): Call can_use_watchpoint_cond_accel, check_condition and calculate_dvc. (ppc_linux_remove_watchpoint): Likewise. (_initialize_ppc_linux_nat): Set to_can_accel_watchpoint_condition to ppc_linux_can_accel_watchpoint_condition * target.c (debug_to_insert_watchpoint): Add argument for watchpoint condition. (debug_to_remove_watchpoint): Likewise. (debug_to_can_accel_watchpoint_condition): New function. (update_current_target): Set to_can_accel_watchpoint_condition. (setup_target_debug): Set to_can_accel_watchpoint_condition. * target.h: Add opaque declaration for struct expression. (struct target_ops) <to_insert_watchpoint>, <to_remove_watchpoint>: Add new arguments to pass the watchpoint <to_can_accel_watchpoint_condition>: New member. condition. Update all callers and implementations. (target_can_accel_watchpoint_condition): New macro. * value.c (free_value_chain): New function. * value.h (fetch_subexp_value): New prototype. (free_value_chain): Likewise.
2010-07-07 16:15:18 +00:00
i386_insert_watchpoint (CORE_ADDR addr, int len, int type,
struct expression *cond)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
int retval;
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
/* Work on a local copy of the debug registers, and on success,
commit the change back to the inferior. */
struct i386_debug_reg_state local_state = dr_mirror;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (type == hw_read)
return 1; /* unsupported */
if (((len != 1 && len !=2 && len !=4) && !(TARGET_HAS_DR_LEN_8 && len == 8))
|| addr % len != 0)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
retval = i386_handle_nonaligned_watchpoint (&local_state,
WP_INSERT, addr, len, type);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
else
{
unsigned len_rw = i386_length_and_rw_bits (len, type);
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
retval = i386_insert_aligned_watchpoint (&local_state,
addr, len_rw);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (retval == 0)
i386_update_inferior_debug_regs (&local_state);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (maint_show_dr)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_show_dr (&dr_mirror, "insert_watchpoint", addr, len, type);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
return retval;
}
/* Remove a watchpoint that watched the memory region which starts at
address ADDR, whose length is LEN bytes, and for accesses of the
type TYPE. Return 0 on success, -1 on failure. */
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static int
2010-07-07 Sergio Durigan Junior <sergiodj@linux.vnet.ibm.com> Thiago Jung Bauermann <bauerman@br.ibm.com> Support for hw accelerated condition watchpoints in booke powerpc. * breakpoint.c (fetch_watchpoint_value): Rename to fetch_subexp_value and move to eval.c. Change callers. (insert_bp_location): Pass watchpoint condition in target_insert_watchpoint. (remove_breakpoint_1) Pass watchpoint condition in target_remove_watchpoint. (watchpoint_locations_match): Call target_can_accel_watchpoint_condition. * eval.c: Include wrapper.h. (fetch_subexp_value): Moved from breakpoint.c. * ppc-linux-nat.c (ppc_linux_region_ok_for_hw_watchpoint): Formatting fix. (can_use_watchpoint_cond_accel): New function. (calculate_dvc): Likewise. (num_memory_accesses): Likewise. (check_condition): Likewise. (ppc_linux_can_accel_watchpoint_condition): Likewise (ppc_linux_insert_watchpoint): Call can_use_watchpoint_cond_accel, check_condition and calculate_dvc. (ppc_linux_remove_watchpoint): Likewise. (_initialize_ppc_linux_nat): Set to_can_accel_watchpoint_condition to ppc_linux_can_accel_watchpoint_condition * target.c (debug_to_insert_watchpoint): Add argument for watchpoint condition. (debug_to_remove_watchpoint): Likewise. (debug_to_can_accel_watchpoint_condition): New function. (update_current_target): Set to_can_accel_watchpoint_condition. (setup_target_debug): Set to_can_accel_watchpoint_condition. * target.h: Add opaque declaration for struct expression. (struct target_ops) <to_insert_watchpoint>, <to_remove_watchpoint>: Add new arguments to pass the watchpoint <to_can_accel_watchpoint_condition>: New member. condition. Update all callers and implementations. (target_can_accel_watchpoint_condition): New macro. * value.c (free_value_chain): New function. * value.h (fetch_subexp_value): New prototype. (free_value_chain): Likewise.
2010-07-07 16:15:18 +00:00
i386_remove_watchpoint (CORE_ADDR addr, int len, int type,
struct expression *cond)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
int retval;
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
/* Work on a local copy of the debug registers, and on success,
commit the change back to the inferior. */
struct i386_debug_reg_state local_state = dr_mirror;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (((len != 1 && len !=2 && len !=4) && !(TARGET_HAS_DR_LEN_8 && len == 8))
|| addr % len != 0)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
retval = i386_handle_nonaligned_watchpoint (&local_state,
WP_REMOVE, addr, len, type);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
else
{
unsigned len_rw = i386_length_and_rw_bits (len, type);
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
retval = i386_remove_aligned_watchpoint (&local_state,
addr, len_rw);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (retval == 0)
i386_update_inferior_debug_regs (&local_state);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (maint_show_dr)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_show_dr (&dr_mirror, "remove_watchpoint", addr, len, type);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
return retval;
}
/* Return non-zero if we can watch a memory region that starts at
address ADDR and whose length is LEN bytes. */
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static int
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
i386_region_ok_for_watchpoint (CORE_ADDR addr, int len)
{
int nregs;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* Compute how many aligned watchpoints we would need to cover this
region. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
nregs = i386_handle_nonaligned_watchpoint (&dr_mirror,
WP_COUNT, addr, len, hw_write);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
return nregs <= DR_NADDR ? 1 : 0;
}
/* If the inferior has some watchpoint that triggered, set the
address associated with that watchpoint and return non-zero.
Otherwise, return zero. */
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static int
i386_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
CORE_ADDR addr = 0;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
int i;
int rc = 0;
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
unsigned status;
unsigned control;
struct i386_debug_reg_state *state = &dr_mirror;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
dr_mirror.dr_status_mirror = i386_dr_low.get_status ();
status = dr_mirror.dr_status_mirror;
control = dr_mirror.dr_control_mirror;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
ALL_DEBUG_REGISTERS(i)
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
if (I386_DR_WATCH_HIT (status, i)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
/* This second condition makes sure DRi is set up for a data
watchpoint, not a hardware breakpoint. The reason is
that GDB doesn't call the target_stopped_data_address
method except for data watchpoints. In other words, I'm
being paranoiac. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
&& I386_DR_GET_RW_LEN (control, i) != 0
/* This third condition makes sure DRi is not vacant, this
avoids false positives in windows-nat.c. */
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
&& !I386_DR_VACANT (state, i))
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
addr = state->dr_mirror[i];
rc = 1;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (maint_show_dr)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_show_dr (&dr_mirror, "watchpoint_hit", addr, -1, hw_write);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
}
if (maint_show_dr && addr == 0)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_show_dr (&dr_mirror, "stopped_data_addr", 0, 0, hw_write);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (rc)
*addr_p = addr;
return rc;
}
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static int
i386_stopped_by_watchpoint (void)
{
CORE_ADDR addr = 0;
return i386_stopped_data_address (&current_target, &addr);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}
gdb/ * breakpoint.c (deprecated_read_memory_nobpt): Update to use shadow_len. (insert_bp_location, reattach_breakpoints, remove_breakpoint) (delete_breakpoint): Update calls to changed methods. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (single_step_breakpoints, insert_single_step_breakpoint) (remove_single_step_breakpoints): New. * breakpoint.h (struct bp_target_info): New. (struct bp_location): Replace shadow_contents with target_info and overlay_target_info. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (insert_single_step_breakpoint, remove_single_step_breakpoints): New prototypes. * gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h. (memory_insert_breakpoint, memory_remove_breakpoint): Update second argument. * mem-break.c (default_memory_insert_breakpoint): Update. Set placed_address, placed_size, and shadow_len. (default_memory_remove_breakpoint): Update. Don't use BREAKPOINT_FROM_PC. (memory_insert_breakpoint, memory_remove_breakpoint): Update. * target.c (update_current_target): Update prototypes for changed functions. (debug_to_insert_breakpoint, debug_to_remove_breakpoint) (debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Update. * target.h: Forward declare struct bp_target_info. (struct target_ops): Use a bp_target_info argument for to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint, and to_remove_hw_breakpoint. (target_insert_breakpoint, target_remove_breakpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint) (memory_insert_breakpoint, memory_remove_breakpoint) (default_memory_insert_breakpoint, default_memory_remove_breakpoint): Update. * config/i386/nm-i386.h: Forward declare struct bp_target_info. (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise. * gdbarch.c, gdbarch.h: Regenerated. * alpha-tdep.c (alpha_software_single_step): Use insert_single_step_breakpoint and remove_single_step_breakpoints. Remove unused statics. * arm-tdep.c (arm_software_single_step): Likewise. Add a note. * cris-tdep.c (cris_software_single_step): Likewise. * mips-tdep.c (mips_software_single_step): Likewise. * rs6000-tdep.c (rs6000_software_single_step): Likewise. * sparc-tdep.c (sparc_software_single_step): Likewise. * wince.c (struct thread_info_struct): Remove step_prev. (undoSStep): Use remove_single_step_breakpoints. (wince_software_single_step): Use insert_single_step_breakpoint. * corelow.c (ignore): Remove unneeded prototype. Update arguments. * exec.c (ignore): Likewise. * sol-thread.c (ignore): Likewise. * procfs.c (dbx_link_shadow_contents): Delete. (dbx_link_bpt): New. (procfs_mourn_inferior): Remove it if necessary. (remove_dbx_link_breakpoint): Use it. (insert_dbx_link_bpt_in_file): Set it. (procfs_init_inferior): Don't update dbx_link_bpt_addr. * rs6000-nat.c (exec_one_dummy_insn): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * solib-irix.c (shadow_contents, breakpoint_addr): Delete. (base_breakpoint): New. (disable_break): Use it. (enable_break): Set it. * i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. * ia64-tdep.c (ia64_memory_insert_breakpoint) (ia64_memory_remove_breakpoint): Likewise. * m32r-tdep.c (m32r_memory_insert_breakpoint) (m32r_memory_remove_breakpoint): Likewise. * monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint): Likewise. Remove unnecessary prototypes. Use placed_address and placed_size. Removed useless read from memory. * nto-procfs.c (procfs_insert_breakpoint) (procfs_remove_breakpoint, procfs_insert_hw_breakpoint) (procfs_remove_hw_breakpoint): Update. * ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise. * ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise. * remote-e7000.c (e7000_insert_breakpoint) (e7000_remove_breakpoint): Likewise. * remote-m32r-sdi.c (m32r_insert_breakpoint) (m32r_remove_breakpoint): Likewise. * remote-mips.c (mips_insert_breakpoint) (mips_remove_breakpoint): Likewise. * remote-rdp.c (remote_rdp_insert_breakpoint) (remote_rdp_remove_breakpoint): Likewise. (rdp_step): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint): Update. * remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint): Delete. (init_gdbsim_ops): Use memory_insert_breakpoint and memory_remove_breakpoint. * remote-st.c (st2000_insert_breakpoint) (st2000_remove_breakpoint): Update. Remove unused BREAKPOINT_FROM_PC. * remote.c (remote_insert_breakpoint, remote_remove_breakpoint): Update. Use placed_address and placed_size. (remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise. gdb/doc/ * gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert and remove breakpoint prototypes. (Watchpoints): Move description of target_insert_hw_breakpoint and target_remove_hw_breakpoint ... (Breakpoints): ... to here. Document target_insert_breakpoint and target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
/* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
Return 0 on success, EBUSY on failure. */
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static int
* breakpoint.h (struct breakpoint): New member GDBARCH. * breakpoint.c: Include "arch-utils.h". (set_raw_breakpoint_without_location): Add GDBARCH parameter. Use it to set breakpoint architecture. (set_raw_breakpoint): Add GDBARCH parameter. (create_internal_breakpoint): Likewise. (create_catchpoint): Likewise. (create_fork_vfork_event_catchpoint): Likewise. (create_breakpoint): Likewise. (create_breakpoints): Likewise. (break_command_really): Likewise. (create_ada_exception_breakpoint): Likewise. Update local callers to pass architecture: (create_internal_breakpoint): Update. (create_overlay_event_breakpoint): Update. (create_longjmp_master_breakpoint): Update. (create_thread_event_breakpoint): Update. (create_solib_event_breakpoint): Update. (create_catchpoint): Update. (create_fork_vfork_event_catchpoint): Update. (set_momentary_breakpoint): Update. (clone_momentary_breakpoint): Update. (create_breakpoint): Update. (create_breakpoints): Update. (break_command_really): Update. (break_command_1): Update. (set_breakpoint): Update. (watch_command_1): Update. (catch_fork_command_1): Update. (catch_exec_commnd_1): Update. (handle_gnu_v3_exceptions): Update. (create_ada_exception_breakpoint): Update. (catch_ada_exception_command): Update. (catch_assert_command): Update. (trace_command): Update. * breakpoint.h (struct bp_location): New member GDBARCH. * breakpoint.c (get_sal_arch): New function. (set_raw_breakpoint): Set location architecture. (add_location_to_breakpoint): Likewise. (clone_momentary_breakpoint): Likewise. (watch_command_1): Likewise. (update_watchpoint): Likewise. (bp_loc_is_permanent): Use location architecture instead of current_gdbarch. (adjust_breakpoint_address): Add GDBARCH parameter; use it instead of current_gdbarch. Update callers of adjust_breakpoint_address to pass breakpoint location architecture: (set_raw_breakpoint): Update. (watch_command_1): Update. * tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead of current_gdbarch. (add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol. (encode_actions): Pass tracepoint architecture to add_local_symbols (encode_actions): Use tracepoint architecture instead of current_gdbarch. Pass it to add_local_symbols and collect_symbol. * breakpoint.h (struct breakpoint_ops): Replace last_addr parameter of print_one callback with last_loc. * breakpoint.c (print_one_breakpoint_location): Replace last_addr parameter with last_loc. (print_one_breakpoint): Likewise. (do_captured_breakpoint_query): Update call. (breakpoint_1): Pass last_loc instead of last_addr to print_one_breakpoint. Pass last location architecture instead of current_gdbarch to set_next_address. Update all implementations of the print_one callback: * breakpoint.c (print_one_catch_fork): Update. (print_one_catch_vfork): Update. (print_one_catch_exec): Update. (print_one_exception_catchpoint): Update. * ada-lang.c (print_one_exception): Update. (print_one_catch_exception): Update. (print_one_catch_exception_unhandled): Update. (print_one_catch_assert): Update. * breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS parameter. Use it instead of gdbarch_addr_bit (current_gdbarch). (print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it to print_one_breakpoint_location. (breakpoint_address_bits): New function. (do_captured_breakpoint_query): Compute number of address bits to print and pass it to print_one_breakpoint. (breakpoint_1): Likewise. Use it instead of current_gdbarch. * breakpoint.h (create_thread_event_breakpoint): Add GDBARCH. * breakpoint.c (create_thread_event_breakpoint): Likewise. Update callers to create_thread_event_breakpoint: * aix-thread.c (pd_enable): Update. * linux-thread-db.c (enable_thread_event): Update. * breakpoint.h (create_solib_event_breakpoint): Add GDBARCH. * breakpoint.c (create_solib_event_breakpoint): Likewise. Update callers to create_solib_event_breakpoint: * solib-frv.c (enable_break, enable_break2): Update. * solib-pa64.c (pa64_solib_create_inferior_hook): Update. * solib-som.c (som_solib_create_inferior_hook): Update. * solib-darwin.c (darwin_solib_create_inferior_hook): Update. * solib-svr4.c (enable_break): Update. * breakpoint.h (insert_single_step_breakpoint): Add GDBARCH. * breakpoint.c (insert_single_step_breakpoint): Likewise. Update callers to insert_single_step_breakpoint: * alpha-tdep.c (alpha_software_single_step): Update. * arm-linux-tdep.c (arm_linux_software_single_step): Update. * arm-tdep.c (arm_software_single_step): Update. * cris-tdep.c (cris_software_single_step): Update. * rs6000-aix-tdep.c (rs6000_software_single_step): Update. * rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update. * sparc-tdep.c (sparc_software_single_step): Update. * spu-tdep.c (spu_software_single_step): Update. * mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter. Pass it to insert_single_step_breakpoint. (mips_software_single_step): Pass architecture to deal_with_atomic_sequence and insert_single_step_breakpoint. * breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH. (deprecated_remove_raw_breakpoint): Likewise. * breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH. (deprecated_remove_raw_breakpoint): Likewise. Update callers to deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint: * breakpoint.c (single_step_gdbarch): New static variable. (insert_single_step_breakpoint): Pass GDBARCH parameter to deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch. (remove_single_step_breakpoints): Pass architecture stored in single_step_gdbarch to deprecated_remove_raw_breakpoint. * rs6000-nat.c (exec_one_dummy_insn): Update. * solib-irix.c (enable_break, disable_break): Update. * procfs.c (procfs_mourn_inferior): Update. (remove_dbx_link_breakpoint): Update. * breakpoint.h (set_breakpoint): Add GDBARCH parameter. (set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise. * breakpoint.c (set_breakpoint): Add GDBARCH parameter. (set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise. Update callers to set_breakpoint, set_momentary_breakpoint and set_momentary_breakpoint_at_pc: * breakpoint.c (set_momentary_breakpoint_at_pc): Update. (until_break_command): Update. * infcall.c (call_function_by_hand): Update. * infcmd.c (finish_backward, finish_forward): Update. * infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH parameter. Pass it to set_momentary_breakpoint. (insert_longjmp_resume_breakpoint): Add GDBARCH parameter. Pass it to set_momentary_breakpoint_at_pc. (handle_inferior_event): Update. (insert_step_resume_breakpoint_at_frame): Update. (insert_step_resume_breakpoint_at_caller): Update.. * mi/mi-cmd-break.c: Include "arch-utils.h". (mi_cmd_break_insert): Update. * target.h (struct target_ops): Add GDBARCH parameter to to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint, and to_remove_hw_breakpoint members. (target_insert_breakpoint, target_remove_breakpoint, target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH parameter, pass to target routine. (memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH parameter. * target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint, debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add GDBARCH parameter, pass to target routine. (update_current_target): Update function signature. * breakpoint.c (insert_bp_location, remove_breakpoint, deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint): Pass architecture to target_ routines. Update all implementations of the target breakpoint routines to take GDBARCH parameter and use it instead of GDBARCH as appropriate: * corelow.c (ignore): Update. * exec.c (ignore): Update. * mem-break.c (memory_insert_breakpoint): Update. (memory_remove_breakpoint): Update. * monitor.c (monitor_insert_breakpoint): Update. (monitor_remove_breakpoint): Update. * record.c (record_insert_breakpoint): Update. (record_beneath_to_insert_breakpoint): Update. (record_remove_breakpoint): Update. (record_beneath_to_remove_breakpoint): Update. * remote.c (remote_insert_breakpoint): Update. (remote_remove_breakpoint): Update. (remote_insert_hw_breakpoint): Update. (remote_remove_hw_breakpoint): Update. * remote-m32r-sdi.c (m32r_insert_breakpoint): Update. (m32r_remove_breakpoint): Update. * remote-mips.c (mips_insert_breakpoint): Update. (mips_remove_breakpoint): Update. * i386-nat.c (i386_insert_hw_breakpoint): Update. (i386_remove_hw_breakpoint): Update. * nto-procfs.c (procfs_insert_breakpoint): Update. (procfs_remove_breakpoint): Update. (procfs_insert_hw_breakpoint): Update. (procfs_remove_hw_breakpoint): Update. doc/ChangeLog: * gdbint.texi (Examples of Use of @code{ui_out} functions): Update example code extrated from breakpoint.c.
2009-07-02 17:12:28 +00:00
i386_insert_hw_breakpoint (struct gdbarch *gdbarch,
struct bp_target_info *bp_tgt)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
unsigned len_rw = i386_length_and_rw_bits (1, hw_execute);
gdb/ * breakpoint.c (deprecated_read_memory_nobpt): Update to use shadow_len. (insert_bp_location, reattach_breakpoints, remove_breakpoint) (delete_breakpoint): Update calls to changed methods. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (single_step_breakpoints, insert_single_step_breakpoint) (remove_single_step_breakpoints): New. * breakpoint.h (struct bp_target_info): New. (struct bp_location): Replace shadow_contents with target_info and overlay_target_info. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (insert_single_step_breakpoint, remove_single_step_breakpoints): New prototypes. * gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h. (memory_insert_breakpoint, memory_remove_breakpoint): Update second argument. * mem-break.c (default_memory_insert_breakpoint): Update. Set placed_address, placed_size, and shadow_len. (default_memory_remove_breakpoint): Update. Don't use BREAKPOINT_FROM_PC. (memory_insert_breakpoint, memory_remove_breakpoint): Update. * target.c (update_current_target): Update prototypes for changed functions. (debug_to_insert_breakpoint, debug_to_remove_breakpoint) (debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Update. * target.h: Forward declare struct bp_target_info. (struct target_ops): Use a bp_target_info argument for to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint, and to_remove_hw_breakpoint. (target_insert_breakpoint, target_remove_breakpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint) (memory_insert_breakpoint, memory_remove_breakpoint) (default_memory_insert_breakpoint, default_memory_remove_breakpoint): Update. * config/i386/nm-i386.h: Forward declare struct bp_target_info. (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise. * gdbarch.c, gdbarch.h: Regenerated. * alpha-tdep.c (alpha_software_single_step): Use insert_single_step_breakpoint and remove_single_step_breakpoints. Remove unused statics. * arm-tdep.c (arm_software_single_step): Likewise. Add a note. * cris-tdep.c (cris_software_single_step): Likewise. * mips-tdep.c (mips_software_single_step): Likewise. * rs6000-tdep.c (rs6000_software_single_step): Likewise. * sparc-tdep.c (sparc_software_single_step): Likewise. * wince.c (struct thread_info_struct): Remove step_prev. (undoSStep): Use remove_single_step_breakpoints. (wince_software_single_step): Use insert_single_step_breakpoint. * corelow.c (ignore): Remove unneeded prototype. Update arguments. * exec.c (ignore): Likewise. * sol-thread.c (ignore): Likewise. * procfs.c (dbx_link_shadow_contents): Delete. (dbx_link_bpt): New. (procfs_mourn_inferior): Remove it if necessary. (remove_dbx_link_breakpoint): Use it. (insert_dbx_link_bpt_in_file): Set it. (procfs_init_inferior): Don't update dbx_link_bpt_addr. * rs6000-nat.c (exec_one_dummy_insn): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * solib-irix.c (shadow_contents, breakpoint_addr): Delete. (base_breakpoint): New. (disable_break): Use it. (enable_break): Set it. * i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. * ia64-tdep.c (ia64_memory_insert_breakpoint) (ia64_memory_remove_breakpoint): Likewise. * m32r-tdep.c (m32r_memory_insert_breakpoint) (m32r_memory_remove_breakpoint): Likewise. * monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint): Likewise. Remove unnecessary prototypes. Use placed_address and placed_size. Removed useless read from memory. * nto-procfs.c (procfs_insert_breakpoint) (procfs_remove_breakpoint, procfs_insert_hw_breakpoint) (procfs_remove_hw_breakpoint): Update. * ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise. * ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise. * remote-e7000.c (e7000_insert_breakpoint) (e7000_remove_breakpoint): Likewise. * remote-m32r-sdi.c (m32r_insert_breakpoint) (m32r_remove_breakpoint): Likewise. * remote-mips.c (mips_insert_breakpoint) (mips_remove_breakpoint): Likewise. * remote-rdp.c (remote_rdp_insert_breakpoint) (remote_rdp_remove_breakpoint): Likewise. (rdp_step): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint): Update. * remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint): Delete. (init_gdbsim_ops): Use memory_insert_breakpoint and memory_remove_breakpoint. * remote-st.c (st2000_insert_breakpoint) (st2000_remove_breakpoint): Update. Remove unused BREAKPOINT_FROM_PC. * remote.c (remote_insert_breakpoint, remote_remove_breakpoint): Update. Use placed_address and placed_size. (remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise. gdb/doc/ * gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert and remove breakpoint prototypes. (Watchpoints): Move description of target_insert_hw_breakpoint and target_remove_hw_breakpoint ... (Breakpoints): ... to here. Document target_insert_breakpoint and target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
CORE_ADDR addr = bp_tgt->placed_address;
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
int retval = i386_insert_aligned_watchpoint (&dr_mirror,
addr, len_rw) ? EBUSY : 0;
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (maint_show_dr)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_show_dr (&dr_mirror, "insert_hwbp", addr, 1, hw_execute);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
return retval;
}
gdb/ * breakpoint.c (deprecated_read_memory_nobpt): Update to use shadow_len. (insert_bp_location, reattach_breakpoints, remove_breakpoint) (delete_breakpoint): Update calls to changed methods. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (single_step_breakpoints, insert_single_step_breakpoint) (remove_single_step_breakpoints): New. * breakpoint.h (struct bp_target_info): New. (struct bp_location): Replace shadow_contents with target_info and overlay_target_info. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (insert_single_step_breakpoint, remove_single_step_breakpoints): New prototypes. * gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h. (memory_insert_breakpoint, memory_remove_breakpoint): Update second argument. * mem-break.c (default_memory_insert_breakpoint): Update. Set placed_address, placed_size, and shadow_len. (default_memory_remove_breakpoint): Update. Don't use BREAKPOINT_FROM_PC. (memory_insert_breakpoint, memory_remove_breakpoint): Update. * target.c (update_current_target): Update prototypes for changed functions. (debug_to_insert_breakpoint, debug_to_remove_breakpoint) (debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Update. * target.h: Forward declare struct bp_target_info. (struct target_ops): Use a bp_target_info argument for to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint, and to_remove_hw_breakpoint. (target_insert_breakpoint, target_remove_breakpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint) (memory_insert_breakpoint, memory_remove_breakpoint) (default_memory_insert_breakpoint, default_memory_remove_breakpoint): Update. * config/i386/nm-i386.h: Forward declare struct bp_target_info. (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise. * gdbarch.c, gdbarch.h: Regenerated. * alpha-tdep.c (alpha_software_single_step): Use insert_single_step_breakpoint and remove_single_step_breakpoints. Remove unused statics. * arm-tdep.c (arm_software_single_step): Likewise. Add a note. * cris-tdep.c (cris_software_single_step): Likewise. * mips-tdep.c (mips_software_single_step): Likewise. * rs6000-tdep.c (rs6000_software_single_step): Likewise. * sparc-tdep.c (sparc_software_single_step): Likewise. * wince.c (struct thread_info_struct): Remove step_prev. (undoSStep): Use remove_single_step_breakpoints. (wince_software_single_step): Use insert_single_step_breakpoint. * corelow.c (ignore): Remove unneeded prototype. Update arguments. * exec.c (ignore): Likewise. * sol-thread.c (ignore): Likewise. * procfs.c (dbx_link_shadow_contents): Delete. (dbx_link_bpt): New. (procfs_mourn_inferior): Remove it if necessary. (remove_dbx_link_breakpoint): Use it. (insert_dbx_link_bpt_in_file): Set it. (procfs_init_inferior): Don't update dbx_link_bpt_addr. * rs6000-nat.c (exec_one_dummy_insn): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * solib-irix.c (shadow_contents, breakpoint_addr): Delete. (base_breakpoint): New. (disable_break): Use it. (enable_break): Set it. * i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. * ia64-tdep.c (ia64_memory_insert_breakpoint) (ia64_memory_remove_breakpoint): Likewise. * m32r-tdep.c (m32r_memory_insert_breakpoint) (m32r_memory_remove_breakpoint): Likewise. * monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint): Likewise. Remove unnecessary prototypes. Use placed_address and placed_size. Removed useless read from memory. * nto-procfs.c (procfs_insert_breakpoint) (procfs_remove_breakpoint, procfs_insert_hw_breakpoint) (procfs_remove_hw_breakpoint): Update. * ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise. * ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise. * remote-e7000.c (e7000_insert_breakpoint) (e7000_remove_breakpoint): Likewise. * remote-m32r-sdi.c (m32r_insert_breakpoint) (m32r_remove_breakpoint): Likewise. * remote-mips.c (mips_insert_breakpoint) (mips_remove_breakpoint): Likewise. * remote-rdp.c (remote_rdp_insert_breakpoint) (remote_rdp_remove_breakpoint): Likewise. (rdp_step): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint): Update. * remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint): Delete. (init_gdbsim_ops): Use memory_insert_breakpoint and memory_remove_breakpoint. * remote-st.c (st2000_insert_breakpoint) (st2000_remove_breakpoint): Update. Remove unused BREAKPOINT_FROM_PC. * remote.c (remote_insert_breakpoint, remote_remove_breakpoint): Update. Use placed_address and placed_size. (remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise. gdb/doc/ * gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert and remove breakpoint prototypes. (Watchpoints): Move description of target_insert_hw_breakpoint and target_remove_hw_breakpoint ... (Breakpoints): ... to here. Document target_insert_breakpoint and target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
/* Remove a hardware-assisted breakpoint at BP_TGT->placed_address.
Return 0 on success, -1 on failure. */
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static int
* breakpoint.h (struct breakpoint): New member GDBARCH. * breakpoint.c: Include "arch-utils.h". (set_raw_breakpoint_without_location): Add GDBARCH parameter. Use it to set breakpoint architecture. (set_raw_breakpoint): Add GDBARCH parameter. (create_internal_breakpoint): Likewise. (create_catchpoint): Likewise. (create_fork_vfork_event_catchpoint): Likewise. (create_breakpoint): Likewise. (create_breakpoints): Likewise. (break_command_really): Likewise. (create_ada_exception_breakpoint): Likewise. Update local callers to pass architecture: (create_internal_breakpoint): Update. (create_overlay_event_breakpoint): Update. (create_longjmp_master_breakpoint): Update. (create_thread_event_breakpoint): Update. (create_solib_event_breakpoint): Update. (create_catchpoint): Update. (create_fork_vfork_event_catchpoint): Update. (set_momentary_breakpoint): Update. (clone_momentary_breakpoint): Update. (create_breakpoint): Update. (create_breakpoints): Update. (break_command_really): Update. (break_command_1): Update. (set_breakpoint): Update. (watch_command_1): Update. (catch_fork_command_1): Update. (catch_exec_commnd_1): Update. (handle_gnu_v3_exceptions): Update. (create_ada_exception_breakpoint): Update. (catch_ada_exception_command): Update. (catch_assert_command): Update. (trace_command): Update. * breakpoint.h (struct bp_location): New member GDBARCH. * breakpoint.c (get_sal_arch): New function. (set_raw_breakpoint): Set location architecture. (add_location_to_breakpoint): Likewise. (clone_momentary_breakpoint): Likewise. (watch_command_1): Likewise. (update_watchpoint): Likewise. (bp_loc_is_permanent): Use location architecture instead of current_gdbarch. (adjust_breakpoint_address): Add GDBARCH parameter; use it instead of current_gdbarch. Update callers of adjust_breakpoint_address to pass breakpoint location architecture: (set_raw_breakpoint): Update. (watch_command_1): Update. * tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead of current_gdbarch. (add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol. (encode_actions): Pass tracepoint architecture to add_local_symbols (encode_actions): Use tracepoint architecture instead of current_gdbarch. Pass it to add_local_symbols and collect_symbol. * breakpoint.h (struct breakpoint_ops): Replace last_addr parameter of print_one callback with last_loc. * breakpoint.c (print_one_breakpoint_location): Replace last_addr parameter with last_loc. (print_one_breakpoint): Likewise. (do_captured_breakpoint_query): Update call. (breakpoint_1): Pass last_loc instead of last_addr to print_one_breakpoint. Pass last location architecture instead of current_gdbarch to set_next_address. Update all implementations of the print_one callback: * breakpoint.c (print_one_catch_fork): Update. (print_one_catch_vfork): Update. (print_one_catch_exec): Update. (print_one_exception_catchpoint): Update. * ada-lang.c (print_one_exception): Update. (print_one_catch_exception): Update. (print_one_catch_exception_unhandled): Update. (print_one_catch_assert): Update. * breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS parameter. Use it instead of gdbarch_addr_bit (current_gdbarch). (print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it to print_one_breakpoint_location. (breakpoint_address_bits): New function. (do_captured_breakpoint_query): Compute number of address bits to print and pass it to print_one_breakpoint. (breakpoint_1): Likewise. Use it instead of current_gdbarch. * breakpoint.h (create_thread_event_breakpoint): Add GDBARCH. * breakpoint.c (create_thread_event_breakpoint): Likewise. Update callers to create_thread_event_breakpoint: * aix-thread.c (pd_enable): Update. * linux-thread-db.c (enable_thread_event): Update. * breakpoint.h (create_solib_event_breakpoint): Add GDBARCH. * breakpoint.c (create_solib_event_breakpoint): Likewise. Update callers to create_solib_event_breakpoint: * solib-frv.c (enable_break, enable_break2): Update. * solib-pa64.c (pa64_solib_create_inferior_hook): Update. * solib-som.c (som_solib_create_inferior_hook): Update. * solib-darwin.c (darwin_solib_create_inferior_hook): Update. * solib-svr4.c (enable_break): Update. * breakpoint.h (insert_single_step_breakpoint): Add GDBARCH. * breakpoint.c (insert_single_step_breakpoint): Likewise. Update callers to insert_single_step_breakpoint: * alpha-tdep.c (alpha_software_single_step): Update. * arm-linux-tdep.c (arm_linux_software_single_step): Update. * arm-tdep.c (arm_software_single_step): Update. * cris-tdep.c (cris_software_single_step): Update. * rs6000-aix-tdep.c (rs6000_software_single_step): Update. * rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update. * sparc-tdep.c (sparc_software_single_step): Update. * spu-tdep.c (spu_software_single_step): Update. * mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter. Pass it to insert_single_step_breakpoint. (mips_software_single_step): Pass architecture to deal_with_atomic_sequence and insert_single_step_breakpoint. * breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH. (deprecated_remove_raw_breakpoint): Likewise. * breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH. (deprecated_remove_raw_breakpoint): Likewise. Update callers to deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint: * breakpoint.c (single_step_gdbarch): New static variable. (insert_single_step_breakpoint): Pass GDBARCH parameter to deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch. (remove_single_step_breakpoints): Pass architecture stored in single_step_gdbarch to deprecated_remove_raw_breakpoint. * rs6000-nat.c (exec_one_dummy_insn): Update. * solib-irix.c (enable_break, disable_break): Update. * procfs.c (procfs_mourn_inferior): Update. (remove_dbx_link_breakpoint): Update. * breakpoint.h (set_breakpoint): Add GDBARCH parameter. (set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise. * breakpoint.c (set_breakpoint): Add GDBARCH parameter. (set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise. Update callers to set_breakpoint, set_momentary_breakpoint and set_momentary_breakpoint_at_pc: * breakpoint.c (set_momentary_breakpoint_at_pc): Update. (until_break_command): Update. * infcall.c (call_function_by_hand): Update. * infcmd.c (finish_backward, finish_forward): Update. * infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH parameter. Pass it to set_momentary_breakpoint. (insert_longjmp_resume_breakpoint): Add GDBARCH parameter. Pass it to set_momentary_breakpoint_at_pc. (handle_inferior_event): Update. (insert_step_resume_breakpoint_at_frame): Update. (insert_step_resume_breakpoint_at_caller): Update.. * mi/mi-cmd-break.c: Include "arch-utils.h". (mi_cmd_break_insert): Update. * target.h (struct target_ops): Add GDBARCH parameter to to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint, and to_remove_hw_breakpoint members. (target_insert_breakpoint, target_remove_breakpoint, target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH parameter, pass to target routine. (memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH parameter. * target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint, debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add GDBARCH parameter, pass to target routine. (update_current_target): Update function signature. * breakpoint.c (insert_bp_location, remove_breakpoint, deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint): Pass architecture to target_ routines. Update all implementations of the target breakpoint routines to take GDBARCH parameter and use it instead of GDBARCH as appropriate: * corelow.c (ignore): Update. * exec.c (ignore): Update. * mem-break.c (memory_insert_breakpoint): Update. (memory_remove_breakpoint): Update. * monitor.c (monitor_insert_breakpoint): Update. (monitor_remove_breakpoint): Update. * record.c (record_insert_breakpoint): Update. (record_beneath_to_insert_breakpoint): Update. (record_remove_breakpoint): Update. (record_beneath_to_remove_breakpoint): Update. * remote.c (remote_insert_breakpoint): Update. (remote_remove_breakpoint): Update. (remote_insert_hw_breakpoint): Update. (remote_remove_hw_breakpoint): Update. * remote-m32r-sdi.c (m32r_insert_breakpoint): Update. (m32r_remove_breakpoint): Update. * remote-mips.c (mips_insert_breakpoint): Update. (mips_remove_breakpoint): Update. * i386-nat.c (i386_insert_hw_breakpoint): Update. (i386_remove_hw_breakpoint): Update. * nto-procfs.c (procfs_insert_breakpoint): Update. (procfs_remove_breakpoint): Update. (procfs_insert_hw_breakpoint): Update. (procfs_remove_hw_breakpoint): Update. doc/ChangeLog: * gdbint.texi (Examples of Use of @code{ui_out} functions): Update example code extrated from breakpoint.c.
2009-07-02 17:12:28 +00:00
i386_remove_hw_breakpoint (struct gdbarch *gdbarch,
struct bp_target_info *bp_tgt)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
unsigned len_rw = i386_length_and_rw_bits (1, hw_execute);
gdb/ * breakpoint.c (deprecated_read_memory_nobpt): Update to use shadow_len. (insert_bp_location, reattach_breakpoints, remove_breakpoint) (delete_breakpoint): Update calls to changed methods. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (single_step_breakpoints, insert_single_step_breakpoint) (remove_single_step_breakpoints): New. * breakpoint.h (struct bp_target_info): New. (struct bp_location): Replace shadow_contents with target_info and overlay_target_info. (deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint) (insert_single_step_breakpoint, remove_single_step_breakpoints): New prototypes. * gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h. (memory_insert_breakpoint, memory_remove_breakpoint): Update second argument. * mem-break.c (default_memory_insert_breakpoint): Update. Set placed_address, placed_size, and shadow_len. (default_memory_remove_breakpoint): Update. Don't use BREAKPOINT_FROM_PC. (memory_insert_breakpoint, memory_remove_breakpoint): Update. * target.c (update_current_target): Update prototypes for changed functions. (debug_to_insert_breakpoint, debug_to_remove_breakpoint) (debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Update. * target.h: Forward declare struct bp_target_info. (struct target_ops): Use a bp_target_info argument for to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint, and to_remove_hw_breakpoint. (target_insert_breakpoint, target_remove_breakpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint) (memory_insert_breakpoint, memory_remove_breakpoint) (default_memory_insert_breakpoint, default_memory_remove_breakpoint): Update. * config/i386/nm-i386.h: Forward declare struct bp_target_info. (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise. * gdbarch.c, gdbarch.h: Regenerated. * alpha-tdep.c (alpha_software_single_step): Use insert_single_step_breakpoint and remove_single_step_breakpoints. Remove unused statics. * arm-tdep.c (arm_software_single_step): Likewise. Add a note. * cris-tdep.c (cris_software_single_step): Likewise. * mips-tdep.c (mips_software_single_step): Likewise. * rs6000-tdep.c (rs6000_software_single_step): Likewise. * sparc-tdep.c (sparc_software_single_step): Likewise. * wince.c (struct thread_info_struct): Remove step_prev. (undoSStep): Use remove_single_step_breakpoints. (wince_software_single_step): Use insert_single_step_breakpoint. * corelow.c (ignore): Remove unneeded prototype. Update arguments. * exec.c (ignore): Likewise. * sol-thread.c (ignore): Likewise. * procfs.c (dbx_link_shadow_contents): Delete. (dbx_link_bpt): New. (procfs_mourn_inferior): Remove it if necessary. (remove_dbx_link_breakpoint): Use it. (insert_dbx_link_bpt_in_file): Set it. (procfs_init_inferior): Don't update dbx_link_bpt_addr. * rs6000-nat.c (exec_one_dummy_insn): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * solib-irix.c (shadow_contents, breakpoint_addr): Delete. (base_breakpoint): New. (disable_break): Use it. (enable_break): Set it. * i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update. * ia64-tdep.c (ia64_memory_insert_breakpoint) (ia64_memory_remove_breakpoint): Likewise. * m32r-tdep.c (m32r_memory_insert_breakpoint) (m32r_memory_remove_breakpoint): Likewise. * monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint): Likewise. Remove unnecessary prototypes. Use placed_address and placed_size. Removed useless read from memory. * nto-procfs.c (procfs_insert_breakpoint) (procfs_remove_breakpoint, procfs_insert_hw_breakpoint) (procfs_remove_hw_breakpoint): Update. * ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise. * ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise. * ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise. * remote-e7000.c (e7000_insert_breakpoint) (e7000_remove_breakpoint): Likewise. * remote-m32r-sdi.c (m32r_insert_breakpoint) (m32r_remove_breakpoint): Likewise. * remote-mips.c (mips_insert_breakpoint) (mips_remove_breakpoint): Likewise. * remote-rdp.c (remote_rdp_insert_breakpoint) (remote_rdp_remove_breakpoint): Likewise. (rdp_step): Use deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint. * remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint): Update. * remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint): Delete. (init_gdbsim_ops): Use memory_insert_breakpoint and memory_remove_breakpoint. * remote-st.c (st2000_insert_breakpoint) (st2000_remove_breakpoint): Update. Remove unused BREAKPOINT_FROM_PC. * remote.c (remote_insert_breakpoint, remote_remove_breakpoint): Update. Use placed_address and placed_size. (remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise. gdb/doc/ * gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert and remove breakpoint prototypes. (Watchpoints): Move description of target_insert_hw_breakpoint and target_remove_hw_breakpoint ... (Breakpoints): ... to here. Document target_insert_breakpoint and target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
CORE_ADDR addr = bp_tgt->placed_address;
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
int retval = i386_remove_aligned_watchpoint (&dr_mirror,
addr, len_rw);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
if (maint_show_dr)
2011-07-22 Pedro Alves <pedro@codesourcery.com> gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp: Test that the i386 watchpoints backend doesn't leave used debug registers behind. gdb/gdbserver/ * i386-low.c (i386_insert_aligned_watchpoint): Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Ditto. (i386_handle_nonaligned_watchpoint): Return immediate on fail to fit part of the watchpoint in the debug registers. (i386_update_inferior_debug_regs): New. (i386_low_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_low_remove_watchpoint): Ditto. gdb/ * i386-nat.c (I386_DR_VACANT, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): Add state parameter and adjust. (dr_mirror, dr_status_mirror, dr_control_mirror): Delete. (struct i386_debug_reg_state): New. (i386_init_dregs): New. (dr_mirror): New. (i386_cleanup_dregs): Use i386_init_dregs. (i386_show_dr): Add state parameter and adjust. (i386_insert_aligned_watchpoint): Ditto. Don't pass the info to the inferior here. (i386_remove_aligned_watchpoint): Likewise. (i386_handle_nonaligned_watchpoint): Add state parameter and adjust. (i386_update_inferior_debug_regs): New. (i386_insert_watchpoint): Work on a local mirror of the debug registers, and only update the inferior on success. (i386_remove_watchpoint): Ditto. (i386_region_ok_for_watchpoint): Adjust. (i386_stopped_data_address): Adjust. (i386_insert_hw_breakpoint): Adjust. (i386_remove_hw_breakpoint): Adjust.
2011-07-22 16:58:32 +00:00
i386_show_dr (&dr_mirror, "remove_hwbp", addr, 1, hw_execute);
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
return retval;
}
/* Returns the number of hardware watchpoints of type TYPE that we can
set. Value is positive if we can set CNT watchpoints, zero if
setting watchpoints of type TYPE is not supported, and negative if
CNT is more than the maximum number of watchpoints of type TYPE
that we can support. TYPE is one of bp_hardware_watchpoint,
bp_read_watchpoint, bp_write_watchpoint, or bp_hardware_breakpoint.
CNT is the number of such watchpoints used so far (including this
one). OTHERTYPE is non-zero if other types of watchpoints are
currently enabled.
We always return 1 here because we don't have enough information
about possible overlap of addresses that they want to watch. As an
extreme example, consider the case where all the watchpoints watch
the same address and the same region length: then we can handle a
virtually unlimited number of watchpoints, due to debug register
sharing implemented via reference counts in i386-nat.c. */
static int
i386_can_use_hw_breakpoint (int type, int cnt, int othertype)
{
return 1;
}
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
static void
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, _("\
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\
If enabled, the debug registers values are shown when GDB inserts\n\
or removes a hardware breakpoint or watchpoint, and when the inferior\n\
triggers a breakpoint or watchpoint."),
NULL,
NULL,
&maintenance_set_cmdlist,
&maintenance_show_cmdlist);
}
/* There are only two global functions left. */
void
i386_use_watchpoints (struct target_ops *t)
{
/* After a watchpoint trap, the PC points to the instruction after the
one that caused the trap. Therefore we don't need to step over it.
But we do need to reset the status register to avoid another trap. */
t->to_have_continuable_watchpoint = 1;
t->to_can_use_hw_breakpoint = i386_can_use_hw_breakpoint;
t->to_region_ok_for_hw_watchpoint = i386_region_ok_for_watchpoint;
t->to_stopped_by_watchpoint = i386_stopped_by_watchpoint;
t->to_stopped_data_address = i386_stopped_data_address;
t->to_insert_watchpoint = i386_insert_watchpoint;
t->to_remove_watchpoint = i386_remove_watchpoint;
t->to_insert_hw_breakpoint = i386_insert_hw_breakpoint;
t->to_remove_hw_breakpoint = i386_remove_hw_breakpoint;
}
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
void
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
i386_set_debug_register_length (int len)
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
{
Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h.
2009-05-14 09:37:00 +00:00
/* This function should be called only once for each native target. */
gdb_assert (i386_dr_low.debug_register_length == 0);
gdb_assert (len == 4 || len == 8);
i386_dr_low.debug_register_length = len;
add_show_debug_regs_command ();
Unified support for hardware breakpoints and watchpoints on x86 targets: * config/i386/nm-i386.h: New file. * config/i386/nm-i386.h: (i386_cleanup_dregs) (i386_insert_watchpoint, i386_remove_watchpoint) (i386_region_ok_for_watchpoint, i386_stopped_by_hwbp) (i386_stopped_data_address, i386_insert_hw_breakpoint) (i386_remove_hw_breakpoint): Declare prototypes. [I386_USE_GENERIC_WATCHPOINTS] (TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define if not already defined. (TARGET_REGION_OK_FOR_HW_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT) (STOPPED_BY_WATCHPOINT, target_stopped_data_address) (target_insert_watchpoint, target_remove_watchpoint) (target_insert_hw_breakpoint, target_remove_hw_breakpoint): Define to call the appropriate i386_* functions. * i386-nat.c: New file. * i386-nat.c (I386_DR_CONTROL_MASK, I386_DR_LOCAL_ENABLE) (I386_DR_GLOBAL_ENABLE, I386_DR_DISABLE, I386_DR_SET_RW_LEN) (I386_DR_GET_RW_LEN, I386_DR_WATCH_HIT): New macros. (dr_mirror, dr_status_mirror, dr_control_mirror, dr_ref_count) (maint_show_dr): New variables. (i386_cleanup_dregs, i386_show_dr, i386_length_and_rw_bits) (i386_insert_aligned_watchpoint, i386_remove_aligned_watchpoint) (i386_handle_nonaligned_watchpoint, i386_insert_watchpoint) (i386_remove_watchpoint, i386_region_ok_for_watchpoint) (i386_stopped_data_address, i386_stopped_by_hwbp) (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): New functions. (_initialize_i386_nat): New function. [I386_USE_GENERIC_WATCHPOINTS]: Add new maint command `show-debug-regs', sets maint_show_dr to non-zero value and activates debugging print-outs in functions which insert, remove, and test watchpoints and hardware breakpoints. * Makefile.in (i386-nat.o): New target. (ALLDEPFILES): Add i386-nat.o.
2001-03-21 11:36:58 +00:00
}