[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-576-gb53f5c257

[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  b53f5c257185e5410622ed72790affb1bda88248 (commit)
      from  e4ba76a003ce4a2336eade806a04a278c376d0b6 (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 b53f5c257185e5410622ed72790affb1bda88248
Author: Tomas Vanek <va...@fb...>
Date:   Thu Nov 25 06:13:31 2021 +0100

    target/cortex_m: add Cortex-M part number getter
    
    The getter checks the magic numbers in arch_info to detect eventual
    type mismatch.
    
    Change-Id: I61134b05310a97ae9831517d0516c7b4240d35a5
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6751
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>

diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h
index 8fb34f46c..555401416 100644
--- a/src/target/cortex_m.h
+++ b/src/target/cortex_m.h
@@ -46,6 +46,7 @@
 #define ARM_CPUID_PARTNO_MASK	(0xFFF << ARM_CPUID_PARTNO_POS)
 
 enum cortex_m_partno {
+	CORTEX_M_PARTNO_INVALID,
 	CORTEX_M0_PARTNO   = 0xC20,
 	CORTEX_M1_PARTNO   = 0xC21,
 	CORTEX_M3_PARTNO   = 0xC23,
@@ -294,6 +295,23 @@ target_to_cortex_m_safe(struct target *target)
 	return cortex_m;
 }
 
+/**
+ * @returns cached value of Cortex-M part number
+ * or CORTEX_M_PARTNO_INVALID if the magic number does not match
+ * or core_info is not initialised.
+ */
+static inline enum cortex_m_partno cortex_m_get_partno_safe(struct target *target)
+{
+	struct cortex_m_common *cortex_m = target_to_cortex_m_safe(target);
+	if (!cortex_m)
+		return CORTEX_M_PARTNO_INVALID;
+
+	if (!cortex_m->core_info)
+		return CORTEX_M_PARTNO_INVALID;
+
+	return cortex_m->core_info->partno;
+}
+
 int cortex_m_examine(struct target *target);
 int cortex_m_set_breakpoint(struct target *target, struct breakpoint *breakpoint);
 int cortex_m_unset_breakpoint(struct target *target, struct breakpoint *breakpoint);

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

Summary of changes:
 src/target/cortex_m.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository