mips32_core_reg_t -> struct mips32_core_reg

[openocd.git] / src / target / xscale.h

diff --git a/src/target/xscale.h b/src/target/xscale.h
index a5d83ee675c7a4aafe3385ac3ff1d08d1497e8d9..dd7b034652bc754ef74750fef117cde06ab8f1c9 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -80,14 +80,15 @@ typedef struct xscale_trace_s
 
 typedef struct xscale_common_s
 {
+       /* armv4/5 common stuff */
+       armv4_5_common_t armv4_5_common;
+
        int common_magic;
 
        /* XScale registers (CP15, DBG) */
        reg_cache_t *reg_cache;
 
        /* current state of the debug handler */
-       int handler_installed;
-       int handler_running;
        uint32_t handler_address;
 
        /* target-endian buffers with exception vectors */
@@ -123,19 +124,20 @@ typedef struct xscale_common_s
 
        int arch_debug_reason;
 
-       /* armv4/5 common stuff */
-       armv4_5_common_t armv4_5_common;
-
        /* MMU/Caches */
-       armv4_5_mmu_common_t armv4_5_mmu;
+       struct armv4_5_mmu_common armv4_5_mmu;
        uint32_t cp15_control_reg;
 
-       /* possible future enhancements that go beyond XScale common stuff */
-       void *arch_info;
-
        int fast_memory_access;
 } xscale_common_t;
 
+static inline struct xscale_common_s *
+target_to_xscale(struct target_s *target)
+{
+       return container_of(target->arch_info, struct xscale_common_s,
+                       armv4_5_common);
+}
+
 typedef struct xscale_reg_s
 {
        int dbg_handler_number;