X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.h;h=7eaa5c512805f48f8669cb4ac55ce43d94fc20ef;hb=e2b6de3d66bae70cb08fea17f5b66ee875dbb636;hp=e897fc4490e61b9853724baeeac149b35ce29189;hpb=2c5fc392f019e78ae858ffd761bcb859f898ff53;p=openocd.git

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index e897fc4490..7eaa5c5128 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -27,21 +27,21 @@
 #include "target.h"
 #include "arm_jtag.h"
 
+/* define for enabling armv7 gdb workarounds */
+#if 1
+#define ARMV7_GDB_HACKS
+#endif
+
 enum armv7m_mode
 {
-	ARMV7M_MODE_HANDLER = 0, 
-	ARMV7M_MODE_THREAD = 1, 
+	ARMV7M_MODE_THREAD = 0,
+	ARMV7M_MODE_USER_THREAD = 1,
+	ARMV7M_MODE_HANDLER = 2,
 	ARMV7M_MODE_ANY = -1
 };
 
 extern char* armv7m_mode_strings[];
 
-enum armv7m_state
-{
-	ARMV7M_STATE_THUMB,
-	ARMV7M_STATE_DEBUG,
-};
-
 enum armv7m_regtype
 {
 	ARMV7M_REGISTER_CORE_GP,
@@ -49,13 +49,6 @@ enum armv7m_regtype
 	ARMV7M_REGISTER_MEMMAP
 };
 
-enum armv7m_runcontext
-{
-	ARMV7M_PROCESS_CONTEXT,
-	ARMV7M_DEBUG_CONTEXT
-};
-
-extern char* armv7m_state_strings[];
 extern char* armv7m_exception_strings[];
 
 extern char *armv7m_exception_string(int number);
@@ -80,51 +73,17 @@ typedef struct armv7m_common_s
 {
 	int common_magic;
 	reg_cache_t *core_cache;
-	reg_cache_t *process_context;
-	reg_cache_t *debug_context;
 	enum armv7m_mode core_mode;
-	enum armv7m_state core_state;
-	int  exception_number;
-	int (*full_context)(struct target_s *target);
+	int exception_number;
+	
 	/* Direct processor core register read and writes */
 	int (*load_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, u32 num, u32 *value);
 	int (*store_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, u32 num, u32 value);
 	/* register cache to processor synchronization */
 	int (*read_core_reg)(struct target_s *target, int num);
 	int (*write_core_reg)(struct target_s *target, int num);
-	/* get or set register through cache, return error if target is running and synchronisation is impossible */
-	int (*get_core_reg_32)(struct target_s *target, int num, u32* value);
-	int (*set_core_reg_32)(struct target_s *target, int num, u32 value);
-
-	arm_jtag_t jtag_info;
-	reg_cache_t *eice_cache;
-	reg_cache_t *etm_cache;
-
-	int (*examine_debug_reason)(target_t *target);
-	
-	void (*change_to_arm)(target_t *target, u32 *r0, u32 *pc);
 	
-/*
-	void (*read_core_regs)(target_t *target, u32 mask, u32 *core_regs[16]);
-	void (*read_core_regs_target_buffer)(target_t *target, u32 mask, void *buffer, int size);
-	void (*write_core_regs)(target_t *target, u32 mask, u32 core_regs[16]);
-*/
-
-/*
-	void (*write_xpsr_im8)(target_t *target, u8 xpsr_im, int rot, int spsr);
-	
-	void (*load_word_regs)(target_t *target, u32 mask);
-	void (*load_hword_reg)(target_t *target, int num);
-	void (*load_byte_reg)(target_t *target, int num);
-
-	void (*store_word_regs)(target_t *target, u32 mask);
-	void (*store_hword_reg)(target_t *target, int num);
-	void (*store_byte_reg)(target_t *target, int num);
-	
-	void (*write_pc)(target_t *target, u32 pc);
-	void (*branch_resume)(target_t *target);
-*/	
-
+	int (*examine_debug_reason)(target_t *target);
 	void (*pre_debug_entry)(target_t *target);
 	void (*post_debug_entry)(target_t *target);
 	
@@ -137,9 +96,8 @@ typedef struct armv7m_common_s
 typedef struct armv7m_algorithm_s
 {
 	int common_magic;
-		
+	
 	enum armv7m_mode core_mode;
-	enum armv7m_state core_state;
 } armv7m_algorithm_t;
 
 typedef struct armv7m_core_reg_s
@@ -166,12 +124,10 @@ extern int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem
 
 extern int armv7m_invalidate_core_regs(target_t *target);
 
-extern enum armv7m_runcontext armv7m_get_context(target_t *target);
-extern int armv7m_use_context(target_t *target, enum armv7m_runcontext new_ctx);
-extern enum armv7m_runcontext armv7m_get_context(target_t *target);
 extern int armv7m_restore_context(target_t *target);
 
 extern int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32* checksum);
+extern int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u32* blank);
 
 /* Thumb mode instructions
  */