X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftarget%2Farmv7m.h;h=bcf0ee1aaeb03c125791352fd6ce0b6f27221942;hb=18077654afaa6f5325abf0d01187161770ff8ce4;hp=cee2b605790acfffeec1f6dc45290d12a95c1e18;hpb=374127301ec1d72033b9d573b72c7abdfd61990d;p=fw%2Fopenocd

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index cee2b6057..bcf0ee1aa 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,
@@ -93,6 +93,70 @@ enum {
 	ARMV7M_BASEPRI,
 	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
@@ -106,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);
@@ -140,7 +208,7 @@ struct armv7m_algorithm {
 
 	enum armv7m_mode core_mode;
 
-	uint32_t context[ARMV7M_CONTROL + 1]; /* ARMV7M_NUM_REGS */
+	uint32_t context[ARMV7M_LAST_REG]; /* ARMV7M_NUM_REGS */
 };
 
 struct armv7m_core_reg {