sim: enable watchpoint module everywhere

We build & bundle the watchpoint module everywhere, but we don't make
the command line flags available by default.  A few targets opted in,
but most did not.  Just enable the flag for everyone.  Not all targets
will respect the flags (making them nops), but shouldn't be a big deal.
This is how we handle other common modules already.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 80fc1644c6afba4661962a677e21fe8c8adc3032..b740a1748771827ab84639bc02422259534e60c8 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-module.c [WITH_WATCHPOINTS] (modules): Always call
+       sim_watchpoint_install.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-base.h [SIM_HAVE_FLATMEM] (sim_state_base): Delete flatmem code.

diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index afadb07b79659a1e1b26daa46173991c6c6beb59..8498f8019cedfefe241d5f9403dbd2910bf4328c 100644 (file)
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -54,9 +54,7 @@ static MODULE_INSTALL_FN * const modules[] = {
 #endif
   sim_core_install,
   sim_memopt_install,
-#if WITH_WATCHPOINTS
   sim_watchpoint_install,
-#endif
 #if WITH_SCACHE
   scache_install,
 #endif

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 3ce4963b26f9e03c77bf9dfd9ffc0df469b996b7..329d6fc8b40192f39cc52c8102b55432d0c750a7 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * tconfig.h (WITH_WATCHPOINTS): Delete.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * tconfig.h (SIM_HAVE_MEM_SIZE): Delete.

diff --git a/sim/frv/tconfig.h b/sim/frv/tconfig.h
index 370cacc018da4ddc5b1a49331cce199619b89f08..06ec4a04f52024947ff16d7971a4a79646576b7c 100644 (file)
--- a/sim/frv/tconfig.h
+++ b/sim/frv/tconfig.h
@@ -6,11 +6,6 @@
 /* For MSPR support.  FIXME: revisit.  */
 #define WITH_DEVICES 1
 
-#if 0
-/* Enable watchpoints.  */
-#define WITH_WATCHPOINTS 1
-#endif
-
 /* ??? Temporary hack until model support unified.  */
 #define SIM_HAVE_MODEL
 

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index df477d2f17f20a9b5fc5ab745bac1a5307c5033a..7a2aeb9794ff4c5651204b9485349c5ae90962a8 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * tconfig.h (WITH_WATCHPOINTS): Delete.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * tconfig.h (SIM_HAVE_MEM_SIZE): Delete.

diff --git a/sim/iq2000/tconfig.h b/sim/iq2000/tconfig.h
index 4e4978d88620b6bdaeaec71553ee8d021baed85a..f8635fd4b238d867ba1b294f165f3b8290352fa7 100644 (file)
--- a/sim/iq2000/tconfig.h
+++ b/sim/iq2000/tconfig.h
@@ -6,11 +6,6 @@
 /* For MSPR support.  FIXME: revisit.  */
 #define WITH_DEVICES 0
 
-#if 0
-/* Enable watchpoints.  */
-#define WITH_WATCHPOINTS 1
-#endif
-
 /* ??? Temporary hack until model support unified.  */
 #define SIM_HAVE_MODEL
 

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index ac2efcb4cd5e16fc566397fd1b1d08d1a8368b65..cd821a3b07ac6aa38aadddbe28f34307400620c1 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * tconfig.h (WITH_WATCHPOINTS): Delete.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * tconfig.h (SIM_HAVE_MEM_SIZE): Delete.

diff --git a/sim/m32r/tconfig.h b/sim/m32r/tconfig.h
index e06d2cfe8aca394f198c84dd1b01ff74f2b18473..00ca73f731e4b389301ddaf371cc70d1b459c07f 100644 (file)
--- a/sim/m32r/tconfig.h
+++ b/sim/m32r/tconfig.h
@@ -9,11 +9,6 @@
 /* For MSPR support.  FIXME: revisit.  */
 #define WITH_DEVICES 1
 
-#if 0
-/* Enable watchpoints.  */
-#define WITH_WATCHPOINTS 1
-#endif
-
 /* Define this to enable the intrinsic breakpoint mechanism. */
 /* FIXME: may be able to remove SIM_HAVE_BREAKPOINT since it essentially
    duplicates ifdef SIM_BREAKPOINT (right?) */

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 8e2d1a509cf57c501f88add0ce1201e272e12c68..7ba16fa1e2e3ce2a053d8e755e91fc7cd2b39620 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_WATCHPOINTS): Delete.
+
 2015-11-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (WITH_MODULO_MEMORY): Delete.

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index be33b48f531f28cdc94ef0902034ca7f2f4fb5ba..144095ac5f444e71b6ff90222a57820e991a5833 100644 (file)
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef _SIM_MAIN_H
 #define _SIM_MAIN_H
 
-#define WITH_WATCHPOINTS 1
 #define SIM_HANDLES_LMA 1
 
 #include "sim-basics.h"

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 34ab06d0442b1a52528d70544456a093846bfdbd..93c1814e4ee5a62cb3f45fa4a5c4a4b5200446ac 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_WATCHPOINTS): Delete.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c [SIM_HAVE_FLATMEM] (sim_open): Delete flatmem code.

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index bb64dcb6ab1458d131f9eeb46d92f5bad9751743..b1045a00dc2ca107f6d119c80a7d5b21c1799bbd 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-/* hobble some common features for moment */
-#define WITH_WATCHPOINTS 1
-
-
 #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \
 mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
 

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 920625ed54bbc1c9cb088360b5619359d4f4b81c..0034efcd4185aa0e41a371d7c3cb9c1764a9dbe5 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_WATCHPOINTS): Delete.
+
 2015-11-21  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (mn10300_callback): Delete.

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 2b06de0016b135ff63ea67806955da40eff93eca..b489ad0a0a160e8001926cceb5b2e96992526c8f 100644 (file)
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -22,7 +22,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define WITH_WATCHPOINTS 1
 #define SIM_HANDLES_LMA 1
 
 #define SIM_ENGINE_HALT_HOOK(SD,LAST_CPU,CIA) 0 /* disable this hook */
@@ -41,8 +40,6 @@
 #include "itable.h"
 #include "idecode.h"
 
-#define WITH_WATCHPOINTS 1
-
 #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR)  \
 mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
 

diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index f4c6aa4383ca4cea6e5f3c9c671dcfd3d1fcff08..c56cd987b9ccae77b8ce2ee950c8039a2254fc93 100644 (file)
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * tconfig.h (WITH_WATCHPOINTS): Delete.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * tconfig.h (SIM_HAVE_MEM_SIZE): Delete.

diff --git a/sim/sh64/tconfig.h b/sim/sh64/tconfig.h
index 4b700aeb22efe573be6942f68185d93102d043a2..6f8d7ffc49e2eac341e3ea180aa31ec068e328ab 100644 (file)
--- a/sim/sh64/tconfig.h
+++ b/sim/sh64/tconfig.h
@@ -6,11 +6,6 @@
 /* For MSPR support.  FIXME: revisit.  */
 #define WITH_DEVICES 0
 
-#if 0
-/* Enable watchpoints.  */
-#define WITH_WATCHPOINTS 1
-#endif
-
 /* ??? Temporary hack until model support unified.  */
 #define SIM_HAVE_MODEL
 

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 9b23e4294722e9ef7ca2baa3452caeccbc488d85..82652f009b0dced5077281f8ccedca141f5efc89 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_WATCHPOINTS): Delete.
+
 2015-12-15  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
        * simops.c (v850_bins): Fix left shift of negative value.

diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index 23b23cbf02331f34c245d9fb268ff2b254352b90..e7276a68f8f6728afd4f487c2162f1754bfd578d 100644 (file)
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -1,11 +1,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-/* General config options */
-
-#define WITH_WATCHPOINTS 1
-
-
 /* The v850 has 32bit words, numbered 31 (MSB) to 0 (LSB) */
 
 #define WITH_TARGET_WORD_MSB 31