* breakpoint.c: Move defaults of watchpoint related macros into

	target.h.
	* target.h:  Macros from breakpoint.c.  Conditionalize based on
	TARGET_HAS_HARDWARE_WATCHPOINTS.
	* i386v-nat.c procfs.c:  Use TARGET_HAS_HARDWARE_WATCHPOINTS
	instead of TARGET_CAN_USE_HARDWARE_WATCHPOINT to enable watchpoint
	code.
	* config/i386/nm-linux.h, config/mips/nm-irix4.h,
	config/pa/nm-hppab.h, config/sparc/tm-sparclite.h:  #define
	TARGET_HAS_HARDWARE_WATCHPOINTS to enable watchpoint code.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cdb74229b89d8bb1ae1a4f6d6524c6de62a23401..b066e57c2895e8f6e8c56177b0ce10ea8d6a9025 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+Mon May 22 15:38:25 1995  Stu Grossman  (grossman@cygnus.com)
+
+       * breakpoint.c:  Move defaults of watchpoint related macros into
+       target.h.
+       * target.h:  Macros from breakpoint.c.  Conditionalize based on
+       TARGET_HAS_HARDWARE_WATCHPOINTS.
+       * i386v-nat.c procfs.c:  Use TARGET_HAS_HARDWARE_WATCHPOINTS
+       instead of TARGET_CAN_USE_HARDWARE_WATCHPOINT to enable watchpoint
+       code.
+       * config/i386/nm-linux.h, config/mips/nm-irix4.h,
+       config/pa/nm-hppab.h, config/sparc/tm-sparclite.h:  #define
+       TARGET_HAS_HARDWARE_WATCHPOINTS to enable watchpoint code.
+
 Mon May 22 06:47:30 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * breakpoint.c, target.h: Move defaults of watchpoint related

diff --git a/gdb/config/mips/nm-irix4.h b/gdb/config/mips/nm-irix4.h
index 07851e971365f11659539dc3e603d6bdaecea889..da27b111383cfc0806e2bdef5e3957c8b577dd9c 100644 (file)
--- a/gdb/config/mips/nm-irix4.h
+++ b/gdb/config/mips/nm-irix4.h
@@ -35,6 +35,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define        ONE_PROCESS_WRITETEXT
 
+#define TARGET_HAS_HARDWARE_WATCHPOINTS
+
 /* Temporary new watchpoint stuff */
 #define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
        ((type) == bp_hardware_watchpoint)

diff --git a/gdb/config/pa/nm-hppab.h b/gdb/config/pa/nm-hppab.h
index 421dfd7802108a8dfa4ee1a8996eb7cd0505574a..01bc5d4dc29a1e3a81ecbe8b167bbbf8164e24e3 100644 (file)
--- a/gdb/config/pa/nm-hppab.h
+++ b/gdb/config/pa/nm-hppab.h
@@ -97,6 +97,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    fired because of a write to an address on the same page as a watchpoint,
    but no write to the watched address occured).  */
 
+#define TARGET_HAS_HARDWARE_WATCHPOINTS        /* Enable the code in procfs.c */
+
 /* The PA can watch any number of locations, there's no need for it to reject
    anything (generic routines already check that all intermediates are
    in memory).  */

diff --git a/gdb/config/sparc/tm-sparclite.h b/gdb/config/sparc/tm-sparclite.h
index 3b2956be24012b88985f067c0258b8f4cc1e73b2..8dd22a8aaa6207e397bb94e16a1a44afe2b0fa93 100644 (file)
--- a/gdb/config/sparc/tm-sparclite.h
+++ b/gdb/config/sparc/tm-sparclite.h
@@ -60,6 +60,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define TARGET_HW_BREAK_LIMIT 2
 #define TARGET_HW_WATCH_LIMIT 2
 
+/* Enable watchpoint macro's */
+
+#define TARGET_HAS_HARDWARE_WATCHPOINTS
+
 #define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
        sparclite_check_watch_resources (type, cnt, ot)
 

diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c
index 1dfda613bd3cb352dada8a24a838bdbe1a65f88e..8ecbad99d760a0491d7b3aacb7656345edba87b0 100644 (file)
--- a/gdb/i386v-nat.c
+++ b/gdb/i386v-nat.c
@@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT
+#ifdef TARGET_HAS_HARDWARE_WATCHPOINTS
 #include <sys/debugreg.h>
 #endif
 
@@ -88,7 +88,7 @@ i386_register_u_addr (blockend, regnum)
   
 }
 \f
-#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT
+#ifdef TARGET_HAS_HARDWARE_WATCHPOINTS
 
 #if !defined (offsetof)
 #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
@@ -272,7 +272,7 @@ i386_stopped_by_watchpoint (pid)
   return 0;
 }
 
-#endif /* TARGET_CAN_USE_HARDWARE_WATCHPOINT */
+#endif /* TARGET_HAS_HARDWARE_WATCHPOINTS */
 
 #if 0
 /* using FLOAT_INFO as is would be a problem.  FLOAT_INFO is called

diff --git a/gdb/procfs.c b/gdb/procfs.c
index dba7599cdea1e8ec3a07c035a404dd70b64b6958..c2605d573857d616160e92354396a3d085e714e5 100644 (file)
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -3659,7 +3659,7 @@ procfs_can_run ()
 {
   return(1);
 }
-#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT
+#ifdef TARGET_HAS_HARDWARE_WATCHPOINTS
 \f
 /* Insert a watchpoint */
 int