X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.h;h=65a2ef0592659fb267ab55344d06b1356c31339b;hb=79d0f1345b8d68ff522f21451860c74c8f1018ca;hp=20ad7c122d8fef223801488d4ae56f18a8fc0290;hpb=e6b27756da1912e9ed5c48d18d934784fa24a019;p=openocd.git

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 20ad7c122d..65a2ef0592 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -21,7 +21,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef ARMV7M_COMMON_H
@@ -29,21 +29,12 @@
 
 #include "arm_adi_v5.h"
 #include "arm.h"
-
-/* define for enabling armv7 gdb workarounds */
-#if 1
-#define ARMV7_GDB_HACKS
-#endif
-
-#ifdef ARMV7_GDB_HACKS
-extern uint8_t armv7m_gdb_dummy_cpsr_value[];
-extern struct reg armv7m_gdb_dummy_cpsr_reg;
-#endif
+#include "armv7m_trace.h"
 
 extern const int armv7m_psp_reg_map[];
 extern const int armv7m_msp_reg_map[];
 
-char *armv7m_exception_string(int number);
+const char *armv7m_exception_string(int number);
 
 /* offsets into armv7m core register cache */
 enum {
@@ -145,6 +136,9 @@ enum {
 	FPv4_SP,
 };
 
+#define ARMV7M_NUM_CORE_REGS (ARMV7M_xPSR + 1)
+#define ARMV7M_NUM_CORE_REGS_NOFP (ARMV7M_NUM_CORE_REGS + 6)
+
 #define ARMV7M_COMMON_MAGIC 0x2A452A45
 
 struct armv7m_common {
@@ -152,7 +146,9 @@ struct armv7m_common {
 
 	int common_magic;
 	int exception_number;
-	struct adiv5_dap dap;
+
+	/* AP this processor is connected to in the DAP */
+	struct adiv5_ap *debug_ap;
 
 	int fp_feature;
 	uint32_t demcr;
@@ -160,14 +156,12 @@ struct armv7m_common {
 	/* stlink is a high level adapter, does not support all functions */
 	bool stlink;
 
+	struct armv7m_trace_config trace_config;
+
 	/* Direct processor core register read and writes */
 	int (*load_core_reg_u32)(struct target *target, uint32_t num, uint32_t *value);
 	int (*store_core_reg_u32)(struct target *target, uint32_t num, uint32_t value);
 
-	/* register cache to processor synchronization */
-	int (*read_core_reg)(struct target *target, unsigned num);
-	int (*write_core_reg)(struct target *target, unsigned num);
-
 	int (*examine_debug_reason)(struct target *target);
 	int (*post_debug_entry)(struct target *target);
 
@@ -194,12 +188,15 @@ struct armv7m_algorithm {
 };
 
 struct reg_cache *armv7m_build_reg_cache(struct target *target);
+void armv7m_free_reg_cache(struct target *target);
+
 enum armv7m_mode armv7m_number_to_mode(int number);
 int armv7m_mode_to_number(enum armv7m_mode mode);
 
 int armv7m_arch_state(struct target *target);
 int armv7m_get_gdb_reg_list(struct target *target,
-		struct reg **reg_list[], int *reg_list_size);
+		struct reg **reg_list[], int *reg_list_size,
+		enum target_register_class reg_class);
 
 int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m);