From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30597 invoked by alias); 13 Mar 2009 08:50:39 -0000 Received: (qmail 30583 invoked by uid 22791); 13 Mar 2009 08:50:38 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.152) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 13 Mar 2009 08:50:25 +0000 Received: from baal.u-strasbg.fr (baal.u-strasbg.fr [IPv6:2001:660:2402::41]) by mailhost.u-strasbg.fr (8.14.2/jtpda-5.5pre1) with ESMTP id n2D8oK0g036642 for ; Fri, 13 Mar 2009 09:50:20 +0100 (CET) Received: from mailserver.u-strasbg.fr (ms3.u-strasbg.fr [IPv6:2001:660:2402:d::12]) by baal.u-strasbg.fr (8.14.0/jtpda-5.5pre1) with ESMTP id n2D8oJqx054909 for ; Fri, 13 Mar 2009 09:50:19 +0100 (CET) (envelope-from muller@ics.u-strasbg.fr) Received: from d620muller (www-ics.u-strasbg.fr [130.79.210.225]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id n2D8oJFh071633 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) for ; Fri, 13 Mar 2009 09:50:19 +0100 (CET) (envelope-from muller@ics.u-strasbg.fr) From: "Pierre Muller" To: Subject: [RFA] config/i386: Remove I386_WATCHPOINTS_IN_TARGET_VECTOR macro Date: Fri, 13 Mar 2009 09:46:00 -0000 Message-ID: <000701c9a3b8$bd7cc330$38764990$@u-strasbg.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-03/txt/msg00198.txt.bz2 As suggested by Pedro, see the previous thread: http://sourceware.org/ml/gdb-patches/2009-03/msg00180.html Pierre Muller Pascal language support maintainer for GDB Tested on x86_64-*-linux, no regressions. ChangeLog entry: 2009-03-13 Pierre Muller * config/i386/nm-i386.h: Remove code within I386_WATCHPOINTS_IN_TARGET_VECTOR conditional. * config/i386/nm-cygwin.h: Remove I386_WATCHPOINTS_IN_TARGET_VECTOR macro. * config/i386/nm-cygwin64.h: Ditto. * config/i386/nm-fbsd.h: Ditto. * config/i386/nm-go32.h: Ditto. * config/i386/nm-linux.h: Ditto. * config/i386/nm-linux64.h: Ditto. Index: src/gdb/config/i386/nm-cygwin.h =================================================================== RCS file: /cvs/src/src/gdb/config/i386/nm-cygwin.h,v retrieving revision 1.9 diff -u -p -r1.9 nm-cygwin.h --- src/gdb/config/i386/nm-cygwin.h 20 Feb 2009 10:52:24 -0000 1.9 +++ src/gdb/config/i386/nm-cygwin.h 13 Mar 2009 08:21:21 -0000 @@ -20,7 +20,6 @@ void dll_symbol_command (char *, int); #define I386_USE_GENERIC_WATCHPOINTS -#define I386_WATCHPOINTS_IN_TARGET_VECTOR #include "i386/nm-i386.h" Index: src/gdb/config/i386/nm-cygwin64.h =================================================================== RCS file: /cvs/src/src/gdb/config/i386/nm-cygwin64.h,v retrieving revision 1.2 diff -u -p -r1.2 nm-cygwin64.h --- src/gdb/config/i386/nm-cygwin64.h 20 Feb 2009 10:52:24 -0000 1.2 +++ src/gdb/config/i386/nm-cygwin64.h 13 Mar 2009 08:21:21 -0000 @@ -19,7 +19,6 @@ void dll_symbol_command (char *, int); #define I386_USE_GENERIC_WATCHPOINTS -#define I386_WATCHPOINTS_IN_TARGET_VECTOR #include "i386/nm-i386.h" Index: src/gdb/config/i386/nm-fbsd.h =================================================================== RCS file: /cvs/src/src/gdb/config/i386/nm-fbsd.h,v retrieving revision 1.19 diff -u -p -r1.19 nm-fbsd.h --- src/gdb/config/i386/nm-fbsd.h 20 Feb 2009 10:52:24 -0000 1.19 +++ src/gdb/config/i386/nm-fbsd.h 13 Mar 2009 08:21:21 -0000 @@ -23,7 +23,6 @@ #ifdef HAVE_PT_GETDBREGS #define I386_USE_GENERIC_WATCHPOINTS -#define I386_WATCHPOINTS_IN_TARGET_VECTOR #endif #include "i386/nm-i386.h" Index: src/gdb/config/i386/nm-go32.h =================================================================== RCS file: /cvs/src/src/gdb/config/i386/nm-go32.h,v retrieving revision 1.9 diff -u -p -r1.9 nm-go32.h --- src/gdb/config/i386/nm-go32.h 20 Feb 2009 10:52:24 -0000 1.9 +++ src/gdb/config/i386/nm-go32.h 13 Mar 2009 08:21:21 -0000 @@ -18,7 +18,6 @@ along with this program. If not, see . */ #define I386_USE_GENERIC_WATCHPOINTS -#define I386_WATCHPOINTS_IN_TARGET_VECTOR #include "i386/nm-i386.h" Index: src/gdb/config/i386/nm-i386.h =================================================================== RCS file: /cvs/src/src/gdb/config/i386/nm-i386.h,v retrieving revision 1.14 diff -u -p -r1.14 nm-i386.h --- src/gdb/config/i386/nm-i386.h 3 Jan 2009 05:57:54 -0000 1.14 +++ src/gdb/config/i386/nm-i386.h 13 Mar 2009 08:21:21 -0000 @@ -24,8 +24,9 @@ /* Targets should define this to use the generic x86 watchpoint support. */ #ifdef I386_USE_GENERIC_WATCHPOINTS -/* Add watchpoint methods to the provided target_ops. Targets which call - this should also define I386_WATCHPOINTS_IN_TARGET_VECTOR. */ +/* Add watchpoint methods to the provided target_ops. + Targets which define I386_USE_GENERIC_WATCHPOINTS must + call this function. */ struct target_ops; void i386_use_watchpoints (struct target_ops *); @@ -66,60 +67,6 @@ extern int i386_remove_hw_breakpoint (s extern int i386_stopped_by_watchpoint (void); -#ifndef I386_WATCHPOINTS_IN_TARGET_VECTOR - -/* 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. */ - -#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) 1 - -/* Returns non-zero if we can use hardware watchpoints to watch a - region whose address is ADDR and whose length is LEN. */ - -#define TARGET_REGION_OK_FOR_HW_WATCHPOINT(addr, len) \ - i386_region_ok_for_watchpoint (addr, len) - -/* 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. */ - -#define HAVE_CONTINUABLE_WATCHPOINT 1 - -#define STOPPED_BY_WATCHPOINT(W) (i386_stopped_by_watchpoint () != 0) - -#define target_stopped_data_address(target, x) \ - i386_stopped_data_address(target, x) - -/* Use these macros for watchpoint insertion/removal. */ - -#define target_insert_watchpoint(addr, len, type) \ - i386_insert_watchpoint (addr, len, type) - -#define target_remove_watchpoint(addr, len, type) \ - i386_remove_watchpoint (addr, len, type) - -#define target_insert_hw_breakpoint(bp_tgt) \ - i386_insert_hw_breakpoint (bp_tgt) - -#define target_remove_hw_breakpoint(bp_tgt) \ - i386_remove_hw_breakpoint (bp_tgt) - -#endif /* I386_WATCHPOINTS_IN_TARGET_VECTOR */ - #endif /* I386_USE_GENERIC_WATCHPOINTS */ #endif /* NM_I386_H */ Index: src/gdb/config/i386/nm-linux.h =================================================================== RCS file: /cvs/src/src/gdb/config/i386/nm-linux.h,v retrieving revision 1.29 diff -u -p -r1.29 nm-linux.h --- src/gdb/config/i386/nm-linux.h 3 Jan 2009 05:57:54 -0000 1.29 +++ src/gdb/config/i386/nm-linux.h 13 Mar 2009 08:21:21 -0000 @@ -24,7 +24,6 @@ /* GNU/Linux supports the i386 hardware debugging registers. */ #define I386_USE_GENERIC_WATCHPOINTS -#define I386_WATCHPOINTS_IN_TARGET_VECTOR #include "i386/nm-i386.h" #include "config/nm-linux.h" Index: src/gdb/config/i386/nm-linux64.h =================================================================== RCS file: /cvs/src/src/gdb/config/i386/nm-linux64.h,v retrieving revision 1.9 diff -u -p -r1.9 nm-linux64.h --- src/gdb/config/i386/nm-linux64.h 3 Jan 2009 05:57:54 -0000 1.9 +++ src/gdb/config/i386/nm-linux64.h 13 Mar 2009 08:21:21 -0000 @@ -25,7 +25,6 @@ /* GNU/Linux supports the i386 hardware debugging registers. */ #define I386_USE_GENERIC_WATCHPOINTS -#define I386_WATCHPOINTS_IN_TARGET_VECTOR #include "i386/nm-i386.h" #include "config/nm-linux.h"