target: don't implicitly include "breakpoint.h"

Most files in the tree seem to have ended up including this,
and *quite* needlessly ... only code implementing or using
breakpoints actually needs these declarations.

So take it out of the header files which included it, and put
it in files which use it ... reduce needless interdependencies.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 4151ec7932bd0a563ed584e94c25861b4ef45a4d..21db2965ad151a005d0bb82fe2238846e9865b25 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "gdb_server.h"
+#include "breakpoints.h"
 #include "target_request.h"
 #include "register.h"
 #include "server.h"

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 348dd8755f61c4e2a049a5605f98638a049a68ed..f4e2c0d56a1e777b82e1d9b07db6914b39813315 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -27,6 +27,7 @@
 #endif
 
 #include "arm11.h"
+#include "breakpoints.h"
 #include "arm11_dbgtap.h"
 #include "armv4_5.h"
 #include "arm_simulator.h"

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index c35c8252b6a392e9913f86f8830765565d0ab36e..b07111eb8f37959bd72decb7078086491faba6db 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -30,6 +30,7 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "embeddedice.h"
 #include "target_request.h"
 #include "arm7_9_common.h"

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index d70bae265fad931c5edd61d023e81ff839203624..e5a2bb71385542b76f61e1bcd0b835b8a8927004 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -29,7 +29,6 @@
 #ifndef ARM7_9_COMMON_H
 #define ARM7_9_COMMON_H
 
-#include "breakpoints.h"
 #include "armv4_5.h"
 
 #define        ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index f9b22b940e374c5a111aa97c442c3a8f6dae0269..47b32added3839bc53ca23c6b76d15cfc53c30d5 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "armv4_5.h"
+#include "breakpoints.h"
 #include "arm_disassembler.h"
 #include "binarybuffer.h"
 

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index ff97a4cb7264c55281b0d8c8a0ab5489762d0079..6c6a9ec60bcce66dfa1d17a0536084b5899f5246 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -34,6 +34,7 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "armv7m.h"
 
 #define ARRAY_SIZE(x)  ((int)(sizeof(x)/sizeof((x)[0])))

diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 0d00b3aa783d58c0c5aba567643766e77ae7601d..832efe92fa095b322c3cb2a06a91261a56c9fad6 100644 (file)
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -33,6 +33,7 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "cortex_a8.h"
 #include "armv7a.h"
 #include "armv4_5.h"

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index e236df2d51bd957b6e940d04dcde1cbbcc6ac501..35ca5a5c125f4359872dc27053725020db30c135 100644 (file)
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "cortex_m3.h"
 #include "target_request.h"
 #include "target_type.h"

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 6dd00ad5c1e1a1baf6476d09e10e5437be7d45fa..fff401c1621a63ae5d6753be8ff9bb8f6020c239 100644 (file)
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "mips32.h"
 #include "mips_m4k.h"
 #include "mips32_dmaacc.h"

diff --git a/src/target/target.c b/src/target/target.c
index f7e2ad64881e49e731ad968737b65ef3a2882ee7..f5a092a707ed1b5e764a9531a72b17524abbf6f7 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -36,6 +36,7 @@
 #include "target.h"
 #include "target_type.h"
 #include "target_request.h"
+#include "breakpoints.h"
 #include "time_support.h"
 #include "register.h"
 #include "trace.h"

diff --git a/src/target/target.h b/src/target/target.h
index e4de2c7c5ff57bf3b80d4463fbec175bc83be289..06105ee6d60128d84452de6ebea5afd79b19c6d3 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -28,13 +28,14 @@
 
 #include <stddef.h>
 
-#include "breakpoints.h"
 #include "algorithm.h"
 #include "command.h"
 
 struct reg;
 struct trace;
 struct command_context;
+struct breakpoint;
+struct watchpoint;
 
 
 /**

diff --git a/src/target/xscale.c b/src/target/xscale.c
index 0b5b26b3c795f87819a660eeeba884542bcd417e..d8977e2189e77804ea7e1dfa59be7a8559a49ff2 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -27,6 +27,7 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "xscale.h"
 #include "target_type.h"
 #include "arm7_9_common.h"