[PATCH]: db3d5d4d1 target/cortex_m: fix target_to_cm() helper

[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/+/6749

-- gerrit

commit db3d5d4d12901341c044dedb59529b81068fcbb2
Author: Tomas Vanek <van...@fbl.cz>
Date:   Wed Nov 24 19:05:21 2021 +0100

    target/cortex_m: fix target_to_cm() helper
    
    The third parameter of container_of() should point to the same member
    as target->arch_info points to, struct arm.
    
    It worked just because struct arm is the first member in
    struct armv7m_common.
    If you move arm member from the first place, OpenOCD fails heavily.
    
    Change-Id: I0c0a5221490945563e17a0a34d99a603f1d6c2ff
    Signed-off-by: Tomas Vanek <van...@fbl.cz>

diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h
index c2f836a35..cabe405ce 100644
--- a/src/target/cortex_m.h
+++ b/src/target/cortex_m.h
@@ -251,7 +251,7 @@ static inline struct cortex_m_common *
 target_to_cm(struct target *target)
 {
        return container_of(target->arch_info,
-                       struct cortex_m_common, armv7m);
+                       struct cortex_m_common, armv7m.arm);
 }
 
 static inline bool is_cortex_m_or_hla(const struct cortex_m_common *cortex_m)

--