X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.c;h=a3c81dcee9d0f8d0e97389f1597823313b4b4044;hb=9b6de72c2ba149ac6f3e11d6d0dd3030bf7b19f9;hp=9740a28c5790e6caafe5537e8d594601e0d84a8c;hpb=f4f87cb4726fbba4a03e2eda1759faf1c47ab4ba;p=openocd.git

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 9740a28c57..a3c81dcee9 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -289,7 +289,7 @@ int armv7m_get_gdb_reg_list(struct target *target, struct reg **reg_list[], int
 	 * if it does not support this arch */
 	*((char *)armv7m->arm.pc->value) |= 1;
 #else
-	(*reg_list)[25] = &armv7m->core_cache->reg_list[ARMV7M_xPSR];
+	(*reg_list)[25] = &armv7m->arm.core_cache->reg_list[ARMV7M_xPSR];
 #endif
 
 	return ERROR_OK;
@@ -661,7 +661,7 @@ int armv7m_checksum_memory(struct target *target,
 		goto cleanup;
 
 	armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
-	armv7m_info.core_mode = ARM_MODE_ANY;
+	armv7m_info.core_mode = ARM_MODE_THREAD;
 
 	init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);
 	init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
@@ -721,7 +721,7 @@ int armv7m_blank_check_memory(struct target *target,
 		return retval;
 
 	armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
-	armv7m_info.core_mode = ARM_MODE_ANY;
+	armv7m_info.core_mode = ARM_MODE_THREAD;
 
 	init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
 	buf_set_u32(reg_params[0].value, 0, 32, address);