X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.h;h=bcf0ee1aaeb03c125791352fd6ce0b6f27221942;hb=ec5e4bae251e01d2b7681e370a6c5e82a81e5962;hp=35bd62a6f217051b0513b38440321ecc9b1da881;hpb=5d02d2de43d1c0f4302f5d5cbfe51bbbe87854bd;p=openocd.git

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 35bd62a6f2..bcf0ee1aae 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -62,7 +62,7 @@ char *armv7m_exception_string(int number);
 /* offsets into armv7m core register cache */
 enum {
 	/* for convenience, the first set of indices match
-	 * the Cortex-M3 DCRSR selectors
+	 * the Cortex-M3/-M4 DCRSR selectors
 	 */
 	ARMV7M_R0,
 	ARMV7M_R1,
@@ -94,9 +94,71 @@ enum {
 	ARMV7M_FAULTMASK,
 	ARMV7M_CONTROL,
 
+	/* 32bit Floating-point registers */
+	ARMV7M_S0,
+	ARMV7M_S1,
+	ARMV7M_S2,
+	ARMV7M_S3,
+	ARMV7M_S4,
+	ARMV7M_S5,
+	ARMV7M_S6,
+	ARMV7M_S7,
+	ARMV7M_S8,
+	ARMV7M_S9,
+	ARMV7M_S10,
+	ARMV7M_S11,
+	ARMV7M_S12,
+	ARMV7M_S13,
+	ARMV7M_S14,
+	ARMV7M_S15,
+	ARMV7M_S16,
+	ARMV7M_S17,
+	ARMV7M_S18,
+	ARMV7M_S19,
+	ARMV7M_S20,
+	ARMV7M_S21,
+	ARMV7M_S22,
+	ARMV7M_S23,
+	ARMV7M_S24,
+	ARMV7M_S25,
+	ARMV7M_S26,
+	ARMV7M_S27,
+	ARMV7M_S28,
+	ARMV7M_S29,
+	ARMV7M_S30,
+	ARMV7M_S31,
+
+	/* 64bit Floating-point registers */
+	ARMV7M_D0,
+	ARMV7M_D1,
+	ARMV7M_D2,
+	ARMV7M_D3,
+	ARMV7M_D4,
+	ARMV7M_D5,
+	ARMV7M_D6,
+	ARMV7M_D7,
+	ARMV7M_D8,
+	ARMV7M_D9,
+	ARMV7M_D10,
+	ARMV7M_D11,
+	ARMV7M_D12,
+	ARMV7M_D13,
+	ARMV7M_D14,
+	ARMV7M_D15,
+
+	/* Floating-point status registers */
+	ARMV7M_FPSID,
+	ARMV7M_FPSCR,
+	ARMV7M_FPEXC,
+
 	ARMV7M_LAST_REG,
 };
 
+enum {
+	FP_NONE = 0,
+	FPv4_SP,
+};
+
 #define ARMV7M_COMMON_MAGIC 0x2A452A45
 
 struct armv7m_common {
@@ -108,8 +170,12 @@ struct armv7m_common {
 	int exception_number;
 	struct adiv5_dap dap;
 
+	int fp_feature;
 	uint32_t demcr;
 
+	/* stlink is a high level adapter, does not support all functions */
+	bool stlink;
+
 	/* Direct processor core register read and writes */
 	int (*load_core_reg_u32)(struct target *target,
 		enum armv7m_regtype type, uint32_t num, uint32_t *value);