X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm.h;h=e47640425d95273d49687cbaabef448128b0b08e;hp=ee4bd767c62446285719e6f330920eb05cddebe4;hb=cf8a3c3d7075abad3c88cd604f8add4d06898abc;hpb=9d6ede25ddb0863873f84b6a55f4300891429049

diff --git a/src/target/arm.h b/src/target/arm.h
index ee4bd767c6..e47640425d 100644
--- a/src/target/arm.h
+++ b/src/target/arm.h
@@ -23,6 +23,7 @@
  * Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
 #ifndef ARM_H
 #define ARM_H
 
@@ -62,9 +63,9 @@ enum arm_mode {
 	ARM_MODE_UND = 27,
 	ARM_MODE_SYS = 31,
 
-	ARM_MODE_THREAD,
-	ARM_MODE_USER_THREAD,
-	ARM_MODE_HANDLER,
+	ARM_MODE_THREAD = 0,
+	ARM_MODE_USER_THREAD = 1,
+	ARM_MODE_HANDLER = 2,
 
 	ARM_MODE_ANY = -1
 };
@@ -80,8 +81,6 @@ enum arm_state {
 	ARM_STATE_THUMB_EE,
 };
 
-extern const char *arm_state_strings[];
-
 #define ARM_COMMON_MAGIC 0x0A450A45
 
 /**
@@ -126,6 +125,9 @@ struct arm {
 	/** Flag reporting unavailability of the BKPT instruction. */
 	bool is_armv4;
 
+	/** Flag reporting armv6m based core. */
+	bool is_armv6m;
+
 	/** Flag reporting whether semihosting is active. */
 	bool is_semihosting;
 
@@ -167,17 +169,25 @@ struct arm {
 			uint32_t value);
 
 	void *arch_info;
+
+	/** For targets conforming to ARM Debug Interface v5,
+	 * this handle references the Debug Access Port (DAP)
+	 * used to make requests to the target.
+	 */
+	struct adiv5_dap *dap;
 };
 
 /** Convert target handle to generic ARM target state handle. */
 static inline struct arm *target_to_arm(struct target *target)
 {
+	assert(target != NULL);
 	return target->arch_info;
 }
 
 static inline bool is_arm(struct arm *arm)
 {
-	return arm && arm->common_magic == ARM_COMMON_MAGIC;
+	assert(arm != NULL);
+	return arm->common_magic == ARM_COMMON_MAGIC;
 }
 
 struct arm_algorithm {
@@ -191,7 +201,7 @@ struct arm_reg {
 	int num;
 	enum arm_mode mode;
 	struct target *target;
-	struct arm *armv4_5_common;
+	struct arm *arm;
 	uint32_t value;
 };
 
@@ -227,8 +237,6 @@ int arm_blank_check_memory(struct target *target,
 void arm_set_cpsr(struct arm *arm, uint32_t cpsr);
 struct reg *arm_reg_current(struct arm *arm, unsigned regnum);
 
-void arm_endianness(uint8_t *tmp, void *in, int size, int be, int flip);
-
 extern struct reg arm_gdb_dummy_fp_reg;
 extern struct reg arm_gdb_dummy_fps_reg;