cortex_m: use the new enum ARMV7M_REGSEL_name

Register xPSR is indexed directly with its value 16 or with the
incorrect enum ARMV7M_xPSR.

Replace them with the new enum ARMV7M_REGSEL_xPSR.

Change-Id: I86600e7f78e39002ce45f66d4792d5067c1f541b
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5873
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c
index 30bf8850198b1bb5404ef23675490dffe49d0e91..19d483bab42424b6e21ee63d05895eb07f949d11 100644 (file)
--- a/src/flash/nor/psoc6.c
+++ b/src/flash/nor/psoc6.c
@@ -153,7 +153,7 @@ static int sromalgo_prepare(struct target *target)
 
        /* Restore THUMB bit in xPSR register */
        const struct armv7m_common *cm = target_to_armv7m(target);
-       hr = cm->store_core_reg_u32(target, ARMV7M_xPSR, 0x01000000);
+       hr = cm->store_core_reg_u32(target, ARMV7M_REGSEL_xPSR, 0x01000000);
        if (hr != ERROR_OK)
                return hr;
 

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 72a2bd322e5f8ed89d942729c40d1cd1a7b01462..ced7a8a679637525ad522cba415aa2dc125b3fed 100644 (file)
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -530,7 +530,7 @@ static int cortex_m_debug_entry(struct target *target)
        /* For IT instructions xPSR must be reloaded on resume and clear on debug exec */
        if (xPSR & 0xf00) {
                r->dirty = r->valid;
-               cortex_m_store_core_reg_u32(target, 16, xPSR & ~0xff);
+               cortex_m_store_core_reg_u32(target, ARMV7M_REGSEL_xPSR, xPSR & ~0xff);
        }
 
        /* Are we in an exception handler */