[PATCH]: 4d13ee3e39 target: move parent target structs just after common_magic

[gerrit]

This is an automated email from Gerrit.

"Tomas Vanek <van...@fbl.cz>" just uploaded a new patch set to Gerrit, which 
you can find at https://review.openocd.org/c/openocd/+/7003

-- gerrit

commit 4d13ee3e3950a1ee4b245eda3a06d533f3ca93ed
Author: Tomas Vanek <van...@fbl.cz>
Date:   Thu May 26 16:25:34 2022 +0200

    target: move parent target structs just after common_magic
    
    Just a cosmetic refactoring.
    
    Change-Id: I7fbc05324e346fafc98d1b42691d33d3d8fbd04e
    Signed-off-by: Tomas Vanek <van...@fbl.cz>

diff --git a/src/target/aarch64.h b/src/target/aarch64.h
index 6d3086884b..1d2f21822f 100644
--- a/src/target/aarch64.h
+++ b/src/target/aarch64.h
@@ -52,6 +52,8 @@ struct aarch64_brp {
 struct aarch64_common {
        unsigned int common_magic;
 
+       struct armv8_common armv8_common;
+
        /* Context information */
        uint32_t system_control_reg;
        uint32_t system_control_reg_curr;
@@ -67,8 +69,6 @@ struct aarch64_common {
        int wp_num_available;
        struct aarch64_brp *wp_list;
 
-       struct armv8_common armv8_common;
-
        enum aarch64_isrmasking_mode isrmasking_mode;
 };
 
diff --git a/src/target/cortex_a.h b/src/target/cortex_a.h
index 062cb29fad..612da3b7fa 100644
--- a/src/target/cortex_a.h
+++ b/src/target/cortex_a.h
@@ -81,6 +81,8 @@ struct cortex_a_wrp {
 struct cortex_a_common {
        unsigned int common_magic;
 
+       struct armv7a_common armv7a_common;
+
        /* Context information */
        uint32_t cpudbg_dscr;
 
@@ -108,9 +110,6 @@ struct cortex_a_common {
 
        enum cortex_a_isrmasking_mode isrmasking_mode;
        enum cortex_a_dacrfixup_mode dacrfixup_mode;
-
-       struct armv7a_common armv7a_common;
-
 };
 
 static inline struct cortex_a_common *
diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h
index f3ef88da70..215f7a92fb 100644
--- a/src/target/cortex_m.h
+++ b/src/target/cortex_m.h
@@ -212,6 +212,8 @@ enum cortex_m_isrmasking_mode {
 struct cortex_m_common {
        unsigned int common_magic;
 
+       struct armv7m_common armv7m;
+
        /* Context information */
        uint32_t dcb_dhcsr;
        uint32_t dcb_dhcsr_cumulated_sticky;
@@ -237,7 +239,6 @@ struct cortex_m_common {
        enum cortex_m_isrmasking_mode isrmasking_mode;
 
        const struct cortex_m_part_info *core_info;
-       struct armv7m_common armv7m;
 
        bool slow_register_read;        /* A register has not been ready, poll 
S_REGRDY */
 
diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index ba9d9b3fd0..5e3b81d533 100644
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -31,8 +31,9 @@ struct target;
 struct mips_m4k_common {
        unsigned int common_magic;
 
-       bool is_pic32mx;
        struct mips32_common mips32;
+
+       bool is_pic32mx;
 };
 
 static inline struct mips_m4k_common *

--