target: no implicit #includes of "register.h"

[fw/openocd] / src / target / mips32.c

diff --git a/src/target/mips32.c b/src/target/mips32.c
index c8e47aac1a78c47a2299ea52e09e5874c2270bf9..6ba433c38b2d4a498c323b63d124ce51705bc2d6 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -27,6 +27,7 @@
 #endif
 
 #include "mips32.h"
+#include "register.h"
 
 
 char* mips32_core_reg_list[] =
@@ -38,7 +39,7 @@ char* mips32_core_reg_list[] =
        "status", "lo", "hi", "badvaddr", "cause", "pc"
 };
 
-mips32_core_reg_t mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] =
+struct mips32_core_reg mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] =
 {
        {0, NULL, NULL},
        {1, NULL, NULL},
@@ -88,19 +89,25 @@ mips32_core_reg_t mips32_core_reg_list_arch_info[MIPS32NUMCOREREGS] =
 
 uint8_t mips32_gdb_dummy_fp_value[] = {0, 0, 0, 0};
 
-reg_t mips32_gdb_dummy_fp_reg =
+struct reg mips32_gdb_dummy_fp_reg =
 {
-       "GDB dummy floating-point register", mips32_gdb_dummy_fp_value, 0, 1, 32, NULL, 0, NULL, 0
+       .name = "GDB dummy floating-point register",
+       .value = mips32_gdb_dummy_fp_value,
+       .dirty = 0,
+       .valid = 1,
+       .size = 32,
+       .arch_info = NULL,
+       .arch_type = 0,
 };
 
 int mips32_core_reg_arch_type = -1;
 
-int mips32_get_core_reg(reg_t *reg)
+int mips32_get_core_reg(struct reg *reg)
 {
        int retval;
-       mips32_core_reg_t *mips32_reg = reg->arch_info;
-       target_t *target = mips32_reg->target;
-       mips32_common_t *mips32_target = target->arch_info;
+       struct mips32_core_reg *mips32_reg = reg->arch_info;
+       struct target *target = mips32_reg->target;
+       struct mips32_common *mips32_target = target->arch_info;
 
        if (target->state != TARGET_HALTED)
        {
@@ -112,10 +119,10 @@ int mips32_get_core_reg(reg_t *reg)
        return retval;
 }
 
-int mips32_set_core_reg(reg_t *reg, uint8_t *buf)
+int mips32_set_core_reg(struct reg *reg, uint8_t *buf)
 {
-       mips32_core_reg_t *mips32_reg = reg->arch_info;
-       target_t *target = mips32_reg->target;
+       struct mips32_core_reg *mips32_reg = reg->arch_info;
+       struct target *target = mips32_reg->target;
        uint32_t value = buf_get_u32(buf, 0, 32);
 
        if (target->state != TARGET_HALTED)
@@ -130,13 +137,13 @@ int mips32_set_core_reg(reg_t *reg, uint8_t *buf)
        return ERROR_OK;
 }
 
-int mips32_read_core_reg(struct target_s *target, int num)
+int mips32_read_core_reg(struct target *target, int num)
 {
        uint32_t reg_value;
-       mips32_core_reg_t *mips_core_reg;
+       struct mips32_core_reg *mips_core_reg;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if ((num < 0) || (num >= MIPS32NUMCOREREGS))
                return ERROR_INVALID_ARGUMENTS;
@@ -150,13 +157,13 @@ int mips32_read_core_reg(struct target_s *target, int num)
        return ERROR_OK;
 }
 
-int mips32_write_core_reg(struct target_s *target, int num)
+int mips32_write_core_reg(struct target *target, int num)
 {
        uint32_t reg_value;
-       mips32_core_reg_t *mips_core_reg;
+       struct mips32_core_reg *mips_core_reg;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if ((num < 0) || (num >= MIPS32NUMCOREREGS))
                return ERROR_INVALID_ARGUMENTS;
@@ -171,10 +178,10 @@ int mips32_write_core_reg(struct target_s *target, int num)
        return ERROR_OK;
 }
 
-int mips32_invalidate_core_regs(target_t *target)
+int mips32_invalidate_core_regs(struct target *target)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
        int i;
 
        for (i = 0; i < mips32->core_cache->num_regs; i++)
@@ -186,15 +193,15 @@ int mips32_invalidate_core_regs(target_t *target)
        return ERROR_OK;
 }
 
-int mips32_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size)
+int mips32_get_gdb_reg_list(struct target *target, struct reg **reg_list[], int *reg_list_size)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
        int i;
 
        /* include floating point registers */
        *reg_list_size = MIPS32NUMCOREREGS + MIPS32NUMFPREGS;
-       *reg_list = malloc(sizeof(reg_t*) * (*reg_list_size));
+       *reg_list = malloc(sizeof(struct reg*) * (*reg_list_size));
 
        for (i = 0; i < MIPS32NUMCOREREGS; i++)
        {
@@ -210,13 +217,13 @@ int mips32_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_
        return ERROR_OK;
 }
 
-int mips32_save_context(target_t *target)
+int mips32_save_context(struct target *target)
 {
        int i;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
-       mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       struct mips32_common *mips32 = target->arch_info;
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 
        /* read core registers */
        mips32_pracc_read_regs(ejtag_info, mips32->core_regs);
@@ -232,13 +239,13 @@ int mips32_save_context(target_t *target)
        return ERROR_OK;
 }
 
-int mips32_restore_context(target_t *target)
+int mips32_restore_context(struct target *target)
 {
        int i;
 
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
-       mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       struct mips32_common *mips32 = target->arch_info;
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
 
        for (i = 0; i < MIPS32NUMCOREREGS; i++)
        {
@@ -254,9 +261,9 @@ int mips32_restore_context(target_t *target)
        return ERROR_OK;
 }
 
-int mips32_arch_state(struct target_s *target)
+int mips32_arch_state(struct target *target)
 {
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if (mips32->common_magic != MIPS32_COMMON_MAGIC)
        {
@@ -271,16 +278,16 @@ int mips32_arch_state(struct target_s *target)
        return ERROR_OK;
 }
 
-reg_cache_t *mips32_build_reg_cache(target_t *target)
+struct reg_cache *mips32_build_reg_cache(struct target *target)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        int num_regs = MIPS32NUMCOREREGS;
-       reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
-       reg_cache_t *cache = malloc(sizeof(reg_cache_t));
-       reg_t *reg_list = malloc(sizeof(reg_t) * num_regs);
-       mips32_core_reg_t *arch_info = malloc(sizeof(mips32_core_reg_t) * num_regs);
+       struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
+       struct reg_cache *cache = malloc(sizeof(struct reg_cache));
+       struct reg *reg_list = malloc(sizeof(struct reg) * num_regs);
+       struct mips32_core_reg *arch_info = malloc(sizeof(struct mips32_core_reg) * num_regs);
        int i;
 
        if (mips32_core_reg_arch_type == -1)
@@ -306,8 +313,6 @@ reg_cache_t *mips32_build_reg_cache(target_t *target)
                reg_list[i].value = calloc(1, 4);
                reg_list[i].dirty = 0;
                reg_list[i].valid = 0;
-               reg_list[i].bitfield_desc = NULL;
-               reg_list[i].num_bitfields = 0;
                reg_list[i].arch_type = mips32_core_reg_arch_type;
                reg_list[i].arch_info = &arch_info[i];
        }
@@ -315,7 +320,7 @@ reg_cache_t *mips32_build_reg_cache(target_t *target)
        return cache;
 }
 
-int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, struct jtag_tap *tap)
+int mips32_init_arch_info(struct target *target, struct mips32_common *mips32, struct jtag_tap *tap)
 {
        target->arch_info = mips32;
        mips32->common_magic = MIPS32_COMMON_MAGIC;
@@ -331,20 +336,20 @@ int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, struct jtag
        return ERROR_OK;
 }
 
-int mips32_register_commands(struct command_context_s *cmd_ctx)
+int mips32_register_commands(struct command_context *cmd_ctx)
 {
        return ERROR_OK;
 }
 
-int mips32_run_algorithm(struct target_s *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_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)
 {
        /*TODO*/
        return ERROR_OK;
 }
 
-int mips32_examine(struct target_s *target)
+int mips32_examine(struct target *target)
 {
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
 
        if (!target_was_examined(target))
        {
@@ -361,10 +366,10 @@ int mips32_examine(struct target_s *target)
        return ERROR_OK;
 }
 
-int mips32_configure_break_unit(struct target_s *target)
+int mips32_configure_break_unit(struct target *target)
 {
        /* get pointers to arch-specific information */
-       mips32_common_t *mips32 = target->arch_info;
+       struct mips32_common *mips32 = target->arch_info;
        int retval;
        uint32_t dcr, bpinfo;
        int i;
@@ -421,7 +426,7 @@ int mips32_configure_break_unit(struct target_s *target)
        return ERROR_OK;
 }
 
-int mips32_enable_interrupts(struct target_s *target, int enable)
+int mips32_enable_interrupts(struct target *target, int enable)
 {
        int retval;
        int update = 0;