[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-160-g936cff887

[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  936cff887abf116427802c4f07096fca1f2b1d88 (commit)
      from  3a85fd52b66360a7cc3fa7ee236f31ac4c46daeb (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 936cff887abf116427802c4f07096fca1f2b1d88
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Tue May 11 09:22:01 2021 +0100

    cortex_m: fix VECTRESET detection for ARMv6-M cores
    
    VECTRESET check should be done after verifying if the core is an ARMv6-M core,
    and not before that.
    
    Fixes: 2dc9c1df81b6 ("cortex_m: [FIX] ARMv8-M does not support VECTRESET")
    Change-Id: I8306affd332b3a35cea69bba39ef24ca71244273
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/6232
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 245490c08..9f9bc0dd2 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2040,9 +2040,6 @@ int cortex_m_examine(struct target *target)
 		}
 		LOG_DEBUG("cpuid: 0x%8.8" PRIx32 "", cpuid);
 
-		/* VECTRESET is supported only on ARMv7-M cores */
-		cortex_m->vectreset_supported = !armv7m->arm.is_armv8m && !armv7m->arm.is_armv6m;
-
 		if (core == 4) {
 			target_read_u32(target, MVFR0, &mvfr0);
 			target_read_u32(target, MVFR1, &mvfr1);
@@ -2069,6 +2066,9 @@ int cortex_m_examine(struct target *target)
 			armv7m->arm.is_armv6m = true;
 		}
 
+		/* VECTRESET is supported only on ARMv7-M cores */
+		cortex_m->vectreset_supported = !armv7m->arm.is_armv8m && !armv7m->arm.is_armv6m;
+
 		/* Check for FPU, otherwise mark FPU register as non-existent */
 		if (armv7m->fp_feature == FP_NONE)
 			for (size_t idx = ARMV7M_FPU_FIRST_REG; idx <= ARMV7M_FPU_LAST_REG; idx++)

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

Summary of changes:
 src/target/cortex_m.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository