Menu
▾
▴
[Openocd-svn] r1714 - trunk/src/target
|
From: <zw...@ma...> - 2009-05-11 06:47:30
|
Author: zwelch
Date: 2009-05-11 06:46:21 +0200 (Mon, 11 May 2009)
New Revision: 1714
Modified:
trunk/src/target/arm11.c
trunk/src/target/arm11.h
trunk/src/target/arm11_dbgtap.c
trunk/src/target/arm720t.c
trunk/src/target/arm720t.h
trunk/src/target/arm7_9_common.c
trunk/src/target/arm7_9_common.h
trunk/src/target/arm7tdmi.c
trunk/src/target/arm7tdmi.h
trunk/src/target/arm920t.c
trunk/src/target/arm920t.h
trunk/src/target/arm926ejs.c
trunk/src/target/arm926ejs.h
trunk/src/target/arm966e.c
trunk/src/target/arm966e.h
trunk/src/target/arm9tdmi.c
trunk/src/target/arm9tdmi.h
trunk/src/target/arm_adi_v5.c
trunk/src/target/arm_disassembler.c
trunk/src/target/arm_jtag.c
trunk/src/target/arm_jtag.h
trunk/src/target/arm_simulator.c
trunk/src/target/arm_simulator.h
trunk/src/target/armv4_5.c
trunk/src/target/armv4_5_cache.c
trunk/src/target/armv4_5_cache.h
trunk/src/target/armv4_5_mmu.c
trunk/src/target/armv4_5_mmu.h
trunk/src/target/armv7m.c
trunk/src/target/armv7m.h
Log:
Audit and eliminate redundant #include directives in arm target files.
Modified: trunk/src/target/arm11.c
===================================================================
--- trunk/src/target/arm11.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm11.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,11 +26,7 @@
#endif
#include "arm11.h"
-#include "jtag.h"
-#include "log.h"
-#include <stdlib.h>
-#include <string.h>
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
Modified: trunk/src/target/arm11.h
===================================================================
--- trunk/src/target/arm11.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm11.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,11 +22,7 @@
#ifndef ARM11_H
#define ARM11_H
-#include "target.h"
-#include "register.h"
#include "embeddedice.h"
-#include "arm_jtag.h"
-#include "types.h"
#define asizeof(x) (sizeof(x) / sizeof((x)[0]))
Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm11_dbgtap.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -24,11 +24,7 @@
#endif
#include "arm11.h"
-#include "jtag.h"
-#include "log.h"
-#include <stdlib.h>
-#include <string.h>
#if 0
#define JTAG_DEBUG(expr ...) DEBUG(expr)
Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm720t.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,12 +22,8 @@
#endif
#include "arm720t.h"
-#include "jtag.h"
-#include "log.h"
#include "time_support.h"
-#include <stdlib.h>
-#include <string.h>
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
Modified: trunk/src/target/arm720t.h
===================================================================
--- trunk/src/target/arm720t.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm720t.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,13 +20,8 @@
#ifndef ARM720T_H
#define ARM720T_H
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
#include "arm7tdmi.h"
#include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
#define ARM720T_COMMON_MAGIC 0xa720a720
Modified: trunk/src/target/arm7_9_common.c
===================================================================
--- trunk/src/target/arm7_9_common.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7_9_common.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -30,28 +30,13 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "embeddedice.h"
-#include "target.h"
#include "target_request.h"
-#include "armv4_5.h"
-#include "arm_jtag.h"
-#include "jtag.h"
-#include "log.h"
#include "arm7_9_common.h"
-#include "breakpoints.h"
#include "time_support.h"
#include "arm_simulator.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <errno.h>
-
int arm7_9_debug_entry(target_t *target);
int arm7_9_enable_sw_bkpts(struct target_s *target);
Modified: trunk/src/target/arm7_9_common.h
===================================================================
--- trunk/src/target/arm7_9_common.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7_9_common.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -29,11 +29,7 @@
#ifndef ARM7_9_COMMON_H
#define ARM7_9_COMMON_H
-#include "armv4_5.h"
-#include "arm_jtag.h"
#include "breakpoints.h"
-#include "target.h"
-
#include "etm.h"
#define ARM7_9_COMMON_MAGIC 0x0a790a79
Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7tdmi.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -29,19 +29,7 @@
#include "arm7tdmi.h"
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "etm.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-#include <stdlib.h>
-#include <string.h>
-
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
#endif
Modified: trunk/src/target/arm7tdmi.h
===================================================================
--- trunk/src/target/arm7tdmi.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm7tdmi.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,12 +23,7 @@
#ifndef ARM7TDMI_H
#define ARM7TDMI_H
-#include "target.h"
-#include "register.h"
-#include "armv4_5.h"
#include "embeddedice.h"
-#include "arm_jtag.h"
-#include "arm7_9_common.h"
#define ARM7TDMI_COMMON_MAGIC 0x00a700a7
Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm920t.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,12 +22,8 @@
#endif
#include "arm920t.h"
-#include "jtag.h"
-#include "log.h"
#include "time_support.h"
-#include <stdlib.h>
-#include <string.h>
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
Modified: trunk/src/target/arm920t.h
===================================================================
--- trunk/src/target/arm920t.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm920t.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,13 +20,8 @@
#ifndef ARM920T_H
#define ARM920T_H
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
#include "arm9tdmi.h"
#include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
#define ARM920T_COMMON_MAGIC 0xa920a920
Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm926ejs.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,12 +22,8 @@
#endif
#include "arm926ejs.h"
-#include "jtag.h"
-#include "log.h"
#include "time_support.h"
-#include <stdlib.h>
-#include <string.h>
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
Modified: trunk/src/target/arm926ejs.h
===================================================================
--- trunk/src/target/arm926ejs.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm926ejs.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,13 +20,8 @@
#ifndef ARM926EJS_H
#define ARM926EJS_H
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
#include "arm9tdmi.h"
#include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
#define ARM926EJS_COMMON_MAGIC 0xa926a926
Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm966e.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,18 +26,7 @@
#include "arm966e.h"
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-#include <stdlib.h>
-#include <string.h>
-
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
#endif
Modified: trunk/src/target/arm966e.h
===================================================================
--- trunk/src/target/arm966e.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm966e.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,10 +23,6 @@
#ifndef ARM966E_H
#define ARM966E_H
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
#include "arm9tdmi.h"
#define ARM966E_COMMON_MAGIC 0x20f920f9
Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm9tdmi.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -29,20 +29,7 @@
#include "arm9tdmi.h"
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "etm.h"
-#include "etb.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-#include <stdlib.h>
-#include <string.h>
-
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
#endif
Modified: trunk/src/target/arm9tdmi.h
===================================================================
--- trunk/src/target/arm9tdmi.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm9tdmi.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,12 +23,7 @@
#ifndef ARM9TDMI_H
#define ARM9TDMI_H
-#include "target.h"
-#include "register.h"
-#include "armv4_5.h"
#include "embeddedice.h"
-#include "arm_jtag.h"
-#include "arm7_9_common.h"
#define ARM9TDMI_COMMON_MAGIC 0x00a900a9
Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_adi_v5.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -38,14 +38,8 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "arm_adi_v5.h"
-#include "jtag.h"
-#include "log.h"
#include "time_support.h"
-#include <stdlib.h>
-#include <string.h>
/*
* Transaction Mode:
Modified: trunk/src/target/arm_disassembler.c
===================================================================
--- trunk/src/target/arm_disassembler.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_disassembler.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,10 +22,8 @@
#endif
#include "arm_disassembler.h"
-
#include "log.h"
-#include <string.h>
/* textual represenation of the condition field */
/* ALways (default) is ommitted (empty string) */
Modified: trunk/src/target/arm_jtag.c
===================================================================
--- trunk/src/target/arm_jtag.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_jtag.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,12 +26,7 @@
#include "arm_jtag.h"
-#include "binarybuffer.h"
-#include "log.h"
-#include "jtag.h"
-#include <stdlib.h>
-
#if 0
#define _ARM_JTAG_SCAN_N_CHECK_
#endif
Modified: trunk/src/target/arm_jtag.h
===================================================================
--- trunk/src/target/arm_jtag.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_jtag.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -23,7 +23,6 @@
#ifndef ARM_JTAG
#define ARM_JTAG
-#include "types.h"
#include "jtag.h"
typedef struct arm_jtag_s
Modified: trunk/src/target/arm_simulator.c
===================================================================
--- trunk/src/target/arm_simulator.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_simulator.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -24,14 +24,12 @@
#include "config.h"
#endif
-#include "target.h"
#include "armv4_5.h"
#include "arm_disassembler.h"
#include "arm_simulator.h"
#include "log.h"
#include "binarybuffer.h"
-#include <string.h>
u32 arm_shift(u8 shift, u32 Rm, u32 shift_amount, u8 *carry)
{
Modified: trunk/src/target/arm_simulator.h
===================================================================
--- trunk/src/target/arm_simulator.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/arm_simulator.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -20,11 +20,11 @@
#ifndef ARM_SIMULATOR_H
#define ARM_SIMULATOR_H
-#include "target.h"
#include "types.h"
-extern int arm_simulate_step(target_t *target, u32 *dry_run_pc);
+struct target_s;
+extern int arm_simulate_step(struct target_s *target, u32 *dry_run_pc);
#define ERROR_ARM_SIMULATOR_NOT_IMPLEMENTED (-700)
Modified: trunk/src/target/armv4_5.c
===================================================================
--- trunk/src/target/armv4_5.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -27,21 +27,10 @@
#include "config.h"
#endif
-#include "replacements.h"
-
-#include "arm_disassembler.h"
-
#include "armv4_5.h"
-
-#include "target.h"
-#include "register.h"
-#include "log.h"
+#include "arm_disassembler.h"
#include "binarybuffer.h"
-#include "command.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
bitfield_desc_t armv4_5_psr_bitfield_desc[] =
{
Modified: trunk/src/target/armv4_5_cache.c
===================================================================
--- trunk/src/target/armv4_5_cache.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_cache.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -22,9 +22,7 @@
#endif
#include "armv4_5_cache.h"
-
#include "log.h"
-#include "command.h"
int armv4_5_identify_cache(u32 cache_type_reg, armv4_5_cache_common_t *cache)
{
Modified: trunk/src/target/armv4_5_cache.h
===================================================================
--- trunk/src/target/armv4_5_cache.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_cache.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -21,8 +21,9 @@
#define ARMV4_5_CACHE_H
#include "types.h"
-#include "command.h"
+struct command_context_s;
+
typedef struct armv4_5_cachesize_s
{
int linelen;
Modified: trunk/src/target/armv4_5_mmu.c
===================================================================
--- trunk/src/target/armv4_5_mmu.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_mmu.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -21,13 +21,9 @@
#include "config.h"
#endif
-#include "arm7_9_common.h"
#include "log.h"
-#include "command.h"
#include "armv4_5_mmu.h"
-#include "target.h"
-#include <stdlib.h>
u32 armv4mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 va, int *type, u32 *cb, int *domain, u32 *ap);
Modified: trunk/src/target/armv4_5_mmu.h
===================================================================
--- trunk/src/target/armv4_5_mmu.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv4_5_mmu.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -21,6 +21,7 @@
#define ARMV4_5_MMU_H
#include "armv4_5_cache.h"
+#include "target.h"
typedef struct armv4_5_mmu_common_s
{
Modified: trunk/src/target/armv7m.c
===================================================================
--- trunk/src/target/armv7m.c 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv7m.c 2009-05-11 04:46:21 UTC (rev 1714)
@@ -30,17 +30,8 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "armv7m.h"
-#include "register.h"
-#include "target.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-#include <stdlib.h>
-#include <string.h>
#if 0
#define _DEBUG_INSTRUCTION_EXECUTION_
Modified: trunk/src/target/armv7m.h
===================================================================
--- trunk/src/target/armv7m.h 2009-05-11 04:38:18 UTC (rev 1713)
+++ trunk/src/target/armv7m.h 2009-05-11 04:46:21 UTC (rev 1714)
@@ -26,9 +26,6 @@
#ifndef ARMV7M_COMMON_H
#define ARMV7M_COMMON_H
-#include "register.h"
-#include "target.h"
-#include "arm_jtag.h"
#include "arm_adi_v5.h"
/* define for enabling armv7 gdb workarounds */
|
