target: no implicit #includes of "register.h"

Same deal:  "register.h" got needlessly included all over the
place because of being in a few widely included headers.

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

Also, don't need that extra "types.h" inclusion.

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

diff --git a/src/target/arm11.c b/src/target/arm11.c
index cdeb420039718dc947ea0ce73e8f7945c37ebc00..46f332e1a54b2e3a49b549528cc2008cb7dbbb30 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -34,6 +34,7 @@
 #include "time_support.h"
 #include "target_type.h"
 #include "algorithm.h"
+#include "register.h"
 
 
 #if 0

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 7bfb97dce38e894f25a7a69c2da30fc58dbe6fbe..5d83517b1ea57e09fb46271140e98fdfa97444a2 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -27,6 +27,7 @@
 #include "arm720t.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 76c79c3abd2d89f591dc4f9575c4d86fcccfe2ff..780ccf9273d9616ffd0899f2209a5c8b96d54f50 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -37,6 +37,7 @@
 #include "time_support.h"
 #include "arm_simulator.h"
 #include "algorithm.h"
+#include "register.h"
 
 
 /**

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 51fbddfe9a7d094e542f1103ea246ee41559779d..ba993ee467af0538fde7976bc62ed7da4342c9f0 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -29,6 +29,7 @@
 
 #include "arm7tdmi.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index fd61020de4bba9eab04cdd83183eff0471c3594f..fca3743d18cf8746fc00e18244d8de9126854e23 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -24,6 +24,7 @@
 #include "arm920t.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*

diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 00b78652b99f267db5fd757953b9a2eac2300207..f305390b28624cd09e69edaf11f5e3486c6e73cc 100644 (file)
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -27,6 +27,7 @@
 #include "arm926ejs.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 1b7b64529eb878fde6e93b5620175473c506779f..8e8f4d63db3ac175f8c0a35e491b82513c38e65f 100644 (file)
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -29,6 +29,7 @@
 
 #include "arm9tdmi.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*

diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 56b6206da9619a1e02a2fd7e7e067721bc7378b7..9aac806ecf54545f0217e47911556891ddf822c1 100644 (file)
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -24,7 +24,6 @@
 #define ARM_ADI_V5_H
 
 #include "target.h"
-#include "register.h"
 #include "arm_jtag.h"
 
 #define DAP_IR_DPACC   0xA

diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c
index 120d5b927331e300aa7588d6512579fc86451d67..a353c132a3223a68cc754ba202542c7b17a42ac6 100644 (file)
--- a/src/target/arm_simulator.c
+++ b/src/target/arm_simulator.c
@@ -28,6 +28,7 @@
 #include "arm_disassembler.h"
 #include "arm_simulator.h"
 #include "binarybuffer.h"
+#include "register.h"
 
 
 static uint32_t arm_shift(uint8_t shift, uint32_t Rm,

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index e6e0bd7e355c53752452e5c4c7af26e9f1f6419f..884f8f65336d6b25577d0a405960d71cc49ab5c6 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -32,6 +32,7 @@
 #include "arm_disassembler.h"
 #include "binarybuffer.h"
 #include "algorithm.h"
+#include "register.h"
 
 
 char* armv4_5_core_reg_list[] =

diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index 6c0b881ad69041446f19b0b369cb9df82c64eb31..ea46488c90e838a4cd3a7523e53b232af522c3c7 100644 (file)
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -26,7 +26,6 @@
 #ifndef ARMV4_5_H
 #define ARMV4_5_H
 
-#include "register.h"
 #include "target.h"
 #include "etm.h"
 

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 625c3a9ae92666038933a8b3877617b31280e01c..facd15054b72bdfc630abdca9b623f9ae1f524f0 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -19,7 +19,6 @@
 #ifndef ARMV7A_H
 #define ARMV7A_H
 
-#include "register.h"
 #include "target.h"
 #include "arm_adi_v5.h"
 #include "armv4_5.h"

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 3f9e7f55ac40c5ec2a43d437f6860919da2d8cbf..7ccdf546ca0f70cf0ac3c5d13bc8c2a246cce914 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -37,6 +37,7 @@
 #include "breakpoints.h"
 #include "armv7m.h"
 #include "algorithm.h"
+#include "register.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 832efe92fa095b322c3cb2a06a91261a56c9fad6..f099be94485e880519959800178560442afd3390 100644 (file)
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -35,9 +35,8 @@
 
 #include "breakpoints.h"
 #include "cortex_a8.h"
-#include "armv7a.h"
 #include "armv4_5.h"
-
+#include "register.h"
 #include "target_request.h"
 #include "target_type.h"
 

diff --git a/src/target/cortex_a8.h b/src/target/cortex_a8.h
index f11d9ddafcdc1ce8922fa9f356e47245264116aa..230008a556513f6f060063bcf226df4f68368dde 100644 (file)
--- a/src/target/cortex_a8.h
+++ b/src/target/cortex_a8.h
@@ -29,7 +29,6 @@
 #ifndef CORTEX_A8_H
 #define CORTEX_A8_H
 
-#include "register.h"
 #include "target.h"
 #include "armv7a.h"
 

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 35ca5a5c125f4359872dc27053725020db30c135..e4949d20fa1e03f2dd06353096662e5573773b8f 100644 (file)
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -36,6 +36,7 @@
 #include "target_request.h"
 #include "target_type.h"
 #include "arm_disassembler.h"
+#include "register.h"
 
 
 /* NOTE:  most of this should work fine for the Cortex-M1 and

diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index ed08323758d8ab279bd0de191f4cccc6ea94f16d..759c2bc711c34b4f25e89c0a01328cf210c58f9a 100644 (file)
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -26,7 +26,6 @@
 #ifndef CORTEX_M3_H
 #define CORTEX_M3_H
 
-#include "register.h"
 #include "target.h"
 #include "armv7m.h"
 

diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index 292504beb032aea0f4d0695a0796b040a7b36c95..4a7cf12feaed180a319a42c8828ee8bb686e7b6e 100644 (file)
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "embeddedice.h"
+#include "register.h"
 
 #define ARRAY_SIZE(x)  ((int)(sizeof(x)/sizeof((x)[0])))
 

diff --git a/src/target/etb.c b/src/target/etb.c
index e65cd5a35689ebd80a0616337567bb1ed46e447b..72474cd09f8faaeff120e8b87e1996a9aa5d6eae 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -23,6 +23,7 @@
 
 #include "armv4_5.h"
 #include "etb.h"
+#include "register.h"
 
 
 static char* etb_reg_list[] =

diff --git a/src/target/etm.c b/src/target/etm.c
index 4c94e6bf051117c356a0109a94a9252ed384dd44..e70df10751cf9b22c3c42c74c7c1ae9302e2c2c3 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -25,6 +25,7 @@
 #include "etb.h"
 #include "image.h"
 #include "arm_disassembler.h"
+#include "register.h"
 
 
 /*

diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index 03a5afcaefd32d25e6087aed8f892f206e5dfd75..8c05276692ffd2c1384a528164def955c89cf956 100644 (file)
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -55,6 +55,8 @@
 #include "arm926ejs.h"
 #include "arm966e.h"
 #include "target_type.h"
+#include "register.h"
+
 
 int feroceon_assert_reset(struct target *target)
 {

diff --git a/src/target/mips32.c b/src/target/mips32.c
index 6432a9034353f64a9fc25b056019cf267f626c0c..6ba433c38b2d4a498c323b63d124ce51705bc2d6 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -27,6 +27,7 @@
 #endif
 
 #include "mips32.h"
+#include "register.h"
 
 
 char* mips32_core_reg_list[] =

diff --git a/src/target/mips32.h b/src/target/mips32.h
index 7a4ba57561fb6e75c90a884f66e6fd11c4492140..1ac682b88ac644d327c1c7c21c954db0ac3c2f5f 100644 (file)
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -24,7 +24,6 @@
 #define MIPS32_H
 
 #include "target.h"
-#include "register.h"
 #include "mips32_pracc.h"
 
 

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index fff401c1621a63ae5d6753be8ff9bb8f6020c239..d1d34810d8368caf823ed4426f092ea7c3b628d9 100644 (file)
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -28,6 +28,7 @@
 #include "mips_m4k.h"
 #include "mips32_dmaacc.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /* cli handling */

diff --git a/src/target/register.c b/src/target/register.c
index f26835bdea0815e9b5beb0ae4eb39a0745f2242c..bb046a1c69176de403551762aa5fd89f826a874e 100644 (file)
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include "types.h"
 #include "register.h"
 #include "log.h"
 

diff --git a/src/target/register.h b/src/target/register.h
index c21edf64982815ee03009dd8b6d5798ef4a63224..84d2aaaddee340fc3d2a356d33eb54925dab2225 100644 (file)
--- a/src/target/register.h
+++ b/src/target/register.h
@@ -23,8 +23,6 @@
 #ifndef REGISTER_H
 #define REGISTER_H
 
-#include "types.h"
-
 struct target;
 
 struct reg

diff --git a/src/target/xscale.c b/src/target/xscale.c
index d8977e2189e77804ea7e1dfa59be7a8559a49ff2..30ca3bf3287697e53418e2b18bf07a67944534a4 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -34,6 +34,7 @@
 #include "arm_simulator.h"
 #include "arm_disassembler.h"
 #include "time_support.h"
+#include "register.h"
 #include "image.h"