[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-574-g10b5ac9cc

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  10b5ac9ccb2b51b5aad01e4cb02be84fea3ebc62 (commit)
      from  29912328f07d562281e8a0db8855c8362afba546 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10b5ac9ccb2b51b5aad01e4cb02be84fea3ebc62
Author: Tomas Vanek <va...@fb...>
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 <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6749
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

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)

-----------------------------------------------------------------------

Summary of changes:
 src/target/cortex_m.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository