target: constify structures

[fw/openocd] / src / target / armv7m.h

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index d5006c2bf294da717decfbdb1b823a12bd7312af..86c9aee2218f0da1dfa72bad5d20802fece8ea52 100644 (file)
--- 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
@@ -30,20 +30,10 @@
 #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
-
 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,13 +135,14 @@ enum {
        FPv4_SP,
 };
 
+#define ARMV7M_NUM_CORE_REGS (ARMV7M_xPSR + 1)
+
 #define ARMV7M_COMMON_MAGIC 0x2A452A45
 
 struct armv7m_common {
        struct arm      arm;
 
        int common_magic;
-       struct reg_cache *core_cache;
        int exception_number;
        struct adiv5_dap dap;
 
@@ -165,10 +156,6 @@ struct armv7m_common {
        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,19 +181,14 @@ struct armv7m_algorithm {
        uint32_t context[ARMV7M_LAST_REG]; /* ARMV7M_NUM_REGS */
 };
 
-struct armv7m_core_reg {
-       uint32_t num;
-       struct target *target;
-       struct armv7m_common *armv7m_common;
-};
-
 struct reg_cache *armv7m_build_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);