armv7m: detect floating point feature

[openocd.git] / src / target / cortex_m.c

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 625065c57957e876e9eecb8227b564b8f9771555..488899cbe9430ac814db859efb9219bc2d0d38d5 100644 (file)
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -609,7 +609,7 @@ static int cortex_m3_halt(struct target *target)
                        return ERROR_TARGET_FAILURE;
                } else {
                        /* we came here in a reset_halt or reset_init sequence
-                        * debug entry was already prepared in cortex_m3_prepare_reset_halt()
+                        * debug entry was already prepared in cortex_m3_assert_reset()
                         */
                        target->debug_reason = DBG_REASON_DBGRQ;
 
@@ -1756,13 +1756,20 @@ fail1:
         */
 }
 
-static int cortex_m3_examine(struct target *target)
+#define MVFR0 0xe000ef40
+#define MVFR1 0xe000ef44
+
+#define MVFR0_DEFAULT_M4 0x10110021
+#define MVFR1_DEFAULT_M4 0x11000011
+
+int cortex_m3_examine(struct target *target)
 {
        int retval;
-       uint32_t cpuid, fpcr;
+       uint32_t cpuid, fpcr, mvfr0, mvfr1;
        int i;
        struct cortex_m3_common *cortex_m3 = target_to_cm3(target);
        struct adiv5_dap *swjdp = &cortex_m3->armv7m.dap;
+       struct armv7m_common *armv7m = target_to_armv7m(target);
 
        retval = ahbap_debugport_init(swjdp);
        if (retval != ERROR_OK)
@@ -1776,11 +1783,24 @@ static int cortex_m3_examine(struct target *target)
                if (retval != ERROR_OK)
                        return retval;
 
-               if (((cpuid >> 4) & 0xc3f) == 0xc23)
-                       LOG_DEBUG("Cortex-M3 r%" PRId8 "p%" PRId8 " processor detected",
-                               (uint8_t)((cpuid >> 20) & 0xf), (uint8_t)((cpuid >> 0) & 0xf));
+               /* Get CPU Type */
+               i = (cpuid >> 4) & 0xf;
+
+               LOG_DEBUG("Cortex-M%d r%" PRId8 "p%" PRId8 " processor detected",
+                               i, (uint8_t)((cpuid >> 20) & 0xf), (uint8_t)((cpuid >> 0) & 0xf));
                LOG_DEBUG("cpuid: 0x%8.8" PRIx32 "", cpuid);
 
+               /* test for floating point feature on cortex-m4 */
+               if (i == 4) {
+                       target_read_u32(target, MVFR0, &mvfr0);
+                       target_read_u32(target, MVFR1, &mvfr1);
+
+                       if ((mvfr0 == MVFR0_DEFAULT_M4) && (mvfr1 == MVFR1_DEFAULT_M4)) {
+                               LOG_DEBUG("Cortex-M%d floating point feature FPv4_SP found", i);
+                               armv7m->fp_feature = FPv4_SP;
+                       }
+               }
+
                /* NOTE: FPB and DWT are both optional. */
 
                /* Setup FPB */