From 84e8e361dd3a3dd7314759f7f07927dac401d0e6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 24 Dec 2015 17:01:21 -0500 Subject: [PATCH] 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. --- sim/common/ChangeLog | 5 +++++ sim/common/sim-module.c | 2 -- sim/frv/ChangeLog | 4 ++++ sim/frv/tconfig.h | 5 ----- sim/iq2000/ChangeLog | 4 ++++ sim/iq2000/tconfig.h | 5 ----- sim/m32r/ChangeLog | 4 ++++ sim/m32r/tconfig.h | 5 ----- sim/m68hc11/ChangeLog | 4 ++++ sim/m68hc11/sim-main.h | 1 - sim/mips/ChangeLog | 4 ++++ sim/mips/sim-main.h | 4 ---- sim/mn10300/ChangeLog | 4 ++++ sim/mn10300/sim-main.h | 3 --- sim/sh64/ChangeLog | 4 ++++ sim/sh64/tconfig.h | 5 ----- sim/v850/ChangeLog | 4 ++++ sim/v850/sim-main.h | 5 ----- 18 files changed, 37 insertions(+), 35 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 80fc1644c6..b740a17487 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2015-12-24 Mike Frysinger + + * sim-module.c [WITH_WATCHPOINTS] (modules): Always call + sim_watchpoint_install. + 2015-12-24 Mike Frysinger * 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 afadb07b79..8498f8019c 100644 --- 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 3ce4963b26..329d6fc8b4 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * tconfig.h (WITH_WATCHPOINTS): Delete. + 2015-12-24 Mike Frysinger * tconfig.h (SIM_HAVE_MEM_SIZE): Delete. diff --git a/sim/frv/tconfig.h b/sim/frv/tconfig.h index 370cacc018..06ec4a04f5 100644 --- 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 df477d2f17..7a2aeb9794 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * tconfig.h (WITH_WATCHPOINTS): Delete. + 2015-12-24 Mike Frysinger * tconfig.h (SIM_HAVE_MEM_SIZE): Delete. diff --git a/sim/iq2000/tconfig.h b/sim/iq2000/tconfig.h index 4e4978d886..f8635fd4b2 100644 --- 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 ac2efcb4cd..cd821a3b07 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * tconfig.h (WITH_WATCHPOINTS): Delete. + 2015-12-24 Mike Frysinger * tconfig.h (SIM_HAVE_MEM_SIZE): Delete. diff --git a/sim/m32r/tconfig.h b/sim/m32r/tconfig.h index e06d2cfe8a..00ca73f731 100644 --- 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 8e2d1a509c..7ba16fa1e2 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * sim-main.h (WITH_WATCHPOINTS): Delete. + 2015-11-17 Mike Frysinger * sim-main.h (WITH_MODULO_MEMORY): Delete. diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index be33b48f53..144095ac5f 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -20,7 +20,6 @@ along with this program. If not, see . */ #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 34ab06d044..93c1814e4e 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * sim-main.h (WITH_WATCHPOINTS): Delete. + 2015-12-24 Mike Frysinger * 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 bb64dcb6ab..b1045a00dc 100644 --- a/sim/mips/sim-main.h +++ b/sim/mips/sim-main.h @@ -20,10 +20,6 @@ along with this program. If not, see . */ #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 920625ed54..0034efcd41 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * sim-main.h (WITH_WATCHPOINTS): Delete. + 2015-11-21 Mike Frysinger * interp.c (mn10300_callback): Delete. diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h index 2b06de0016..b489ad0a0a 100644 --- 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 f4c6aa4383..c56cd987b9 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * tconfig.h (WITH_WATCHPOINTS): Delete. + 2015-12-24 Mike Frysinger * tconfig.h (SIM_HAVE_MEM_SIZE): Delete. diff --git a/sim/sh64/tconfig.h b/sim/sh64/tconfig.h index 4b700aeb22..6f8d7ffc49 100644 --- 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 9b23e42947..82652f009b 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,7 @@ +2015-12-24 Mike Frysinger + + * sim-main.h (WITH_WATCHPOINTS): Delete. + 2015-12-15 Dominik Vogt * 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 23b23cbf02..e7276a68f8 100644 --- 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 -- 2.34.1