target: create/use register_cache_invalidate()

[openocd.git] / src / target / mips32.h

diff --git a/src/target/mips32.h b/src/target/mips32.h
index 7a4dd5e6814b37dad788a3768b1e07521eaa42bc..7d1928e5b057781d7b657aaaa33864fd4b425952 100644 (file)
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -24,54 +24,53 @@
 #define MIPS32_H
 
 #include "target.h"
-#include "register.h"
-#include "mips_ejtag.h"
 #include "mips32_pracc.h"
 
+
 #define MIPS32_COMMON_MAGIC            0xB320B320
 
 /* offsets into mips32 core register cache */
-enum 
+enum
 {
        MIPS32_PC = 37,
        MIPS32NUMCOREREGS
 };
 
-typedef struct mips32_comparator_s
+struct mips32_comparator
 {
        int used;
        //int type;
-       u32 bp_value;
-       u32 reg_address;
-} mips32_comparator_t;
+       uint32_t bp_value;
+       uint32_t reg_address;
+};
 
-typedef struct mips32_common_s
+struct mips32_common
 {
-       u32 common_magic;
+       uint32_t common_magic;
        void *arch_info;
-       reg_cache_t *core_cache;
-       mips_ejtag_t ejtag_info;
-       u32 core_regs[MIPS32NUMCOREREGS];
-       
+       struct reg_cache *core_cache;
+       struct mips_ejtag ejtag_info;
+       uint32_t core_regs[MIPS32NUMCOREREGS];
+
        int bp_scanned;
        int num_inst_bpoints;
        int num_data_bpoints;
        int num_inst_bpoints_avail;
        int num_data_bpoints_avail;
-       mips32_comparator_t *inst_break_list;
-       mips32_comparator_t *data_break_list;
-       
+       struct mips32_comparator *inst_break_list;
+       struct mips32_comparator *data_break_list;
+
        /* 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);
-} mips32_common_t;
+       int (*read_core_reg)(struct target *target, int num);
+       int (*write_core_reg)(struct target *target, int num);
+};
 
-typedef struct mips32_core_reg_s
+struct mips32_core_reg
 {
-       u32 num;
-       target_t *target;
-       mips32_common_t *mips32_common;
-} mips32_core_reg_t;
+       uint32_t num;
+       struct target *target;
+       struct mips32_common *mips32_common;
+};
 
 #define MIPS32_OP_BEQ  0x04
 #define MIPS32_OP_BNE  0x05
@@ -94,9 +93,9 @@ typedef struct mips32_core_reg_s
 #define MIPS32_COP0_MF 0x00
 #define MIPS32_COP0_MT 0x04
 
-#define MIPS32_R_INST(opcode, rs, rt, rd, shamt, funct)        (((opcode)<<26) |((rs)<<21)|((rt)<<16)|((rd)<<11)| ((shamt)<<5) | (funct))
-#define MIPS32_I_INST(opcode, rs, rt, immd)    (((opcode)<<26) |((rs)<<21)|((rt)<<16)|(immd))
-#define MIPS32_J_INST(opcode, addr)    (((opcode)<<26) |(addr))
+#define MIPS32_R_INST(opcode, rs, rt, rd, shamt, funct)        (((opcode) << 26) |((rs) << 21) | ((rt) << 16) | ((rd) << 11)| ((shamt) << 6) | (funct))
+#define MIPS32_I_INST(opcode, rs, rt, immd)    (((opcode) << 26) |((rs) << 21) | ((rt) << 16) | (immd))
+#define MIPS32_J_INST(opcode, addr)    (((opcode) << 26) |(addr))
 
 #define MIPS32_NOP                                     0
 #define MIPS32_ADDI(tar, src, val)     MIPS32_I_INST(MIPS32_OP_ADDI, src, tar, val)
@@ -112,8 +111,8 @@ typedef struct mips32_core_reg_s
 #define MIPS32_LW(reg, off, base)      MIPS32_I_INST(MIPS32_OP_LW, base, reg, off)
 #define MIPS32_MFLO(reg)                       MIPS32_R_INST(0, 0, 0, reg, 0, MIPS32_OP_MFLO)
 #define MIPS32_MFHI(reg)                       MIPS32_R_INST(0, 0, 0, reg, 0, MIPS32_OP_MFHI)
-#define MIPS32_MTLO(reg)                       MIPS32_R_INST(0, 0, 0, reg, 0, MIPS32_OP_MTLO)
-#define MIPS32_MTHI(reg)                       MIPS32_R_INST(0, 0, 0, reg, 0, MIPS32_OP_MTHI)
+#define MIPS32_MTLO(reg)                       MIPS32_R_INST(0, reg, 0, 0, 0, MIPS32_OP_MTLO)
+#define MIPS32_MTHI(reg)                       MIPS32_R_INST(0, reg, 0, 0, 0, MIPS32_OP_MTHI)
 #define MIPS32_ORI(src, tar, val)      MIPS32_I_INST(MIPS32_OP_ORI, src, tar, val)
 #define MIPS32_SB(reg, off, base)      MIPS32_I_INST(MIPS32_OP_SB, base, reg, off)
 #define MIPS32_SH(reg, off, base)      MIPS32_I_INST(MIPS32_OP_SH, base, reg, off)
@@ -124,17 +123,31 @@ typedef struct mips32_core_reg_s
 #define MIPS32_SDBBP                           0x7000003F
 #define MIPS16_SDBBP                           0xE801
 
-extern int mips32_arch_state(struct target_s *target);
-extern int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, jtag_tap_t *tap);
-extern int mips32_restore_context(target_t *target);
-extern int mips32_save_context(target_t *target);
-extern reg_cache_t *mips32_build_reg_cache(target_t *target);
-extern int mips32_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_params, u32 entry_point, u32 exit_point, int timeout_ms, void *arch_info);
-extern int mips32_configure_break_unit(struct target_s *target);
-extern int mips32_examine(struct target_s *target);
-
-extern int mips32_register_commands(struct command_context_s *cmd_ctx);
-extern int mips32_invalidate_core_regs(target_t *target);
-extern int mips32_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size);
+int mips32_arch_state(struct target *target);
+
+int mips32_init_arch_info(struct target *target,
+               struct mips32_common *mips32, struct jtag_tap *tap);
+
+int mips32_restore_context(struct target *target);
+int mips32_save_context(struct target *target);
+
+struct reg_cache *mips32_build_reg_cache(struct target *target);
+
+int mips32_run_algorithm(struct target *target,
+               int num_mem_params, struct mem_param *mem_params,
+               int num_reg_params, struct reg_param *reg_params,
+               uint32_t entry_point, uint32_t exit_point,
+               int timeout_ms, void *arch_info);
+
+int mips32_configure_break_unit(struct target *target);
+
+int mips32_enable_interrupts(struct target *target, int enable);
+
+int mips32_examine(struct target *target);
+
+int mips32_register_commands(struct command_context *cmd_ctx);
+
+int mips32_get_gdb_reg_list(struct target *target,
+               struct reg **reg_list[], int *reg_list_size);
 
 #endif /*MIPS32_H*/