mips32_comparator_t -> struct mips32_comparator

Remove misleading typedef and redundant suffix from struct mips32_comparator.

diff --git a/src/target/mips32.c b/src/target/mips32.c
index 055d2788051c9c4f5b754ec8ba9e833bd8c8b1c6..c8e47aac1a78c47a2299ea52e09e5874c2270bf9 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -384,7 +384,7 @@ int mips32_configure_break_unit(struct target_s *target)
 
                mips32->num_inst_bpoints = (bpinfo >> 24) & 0x0F;
                mips32->num_inst_bpoints_avail = mips32->num_inst_bpoints;
 
                mips32->num_inst_bpoints = (bpinfo >> 24) & 0x0F;
                mips32->num_inst_bpoints_avail = mips32->num_inst_bpoints;

-               mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(mips32_comparator_t));
+               mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(struct mips32_comparator));

                for (i = 0; i < mips32->num_inst_bpoints; i++)
                {
                        mips32->inst_break_list[i].reg_address = EJTAG_IBA1 + (0x100 * i);
                for (i = 0; i < mips32->num_inst_bpoints; i++)
                {
                        mips32->inst_break_list[i].reg_address = EJTAG_IBA1 + (0x100 * i);


@@ -403,7 +403,7 @@ int mips32_configure_break_unit(struct target_s *target)
 
                mips32->num_data_bpoints = (bpinfo >> 24) & 0x0F;
                mips32->num_data_bpoints_avail = mips32->num_data_bpoints;
 
                mips32->num_data_bpoints = (bpinfo >> 24) & 0x0F;
                mips32->num_data_bpoints_avail = mips32->num_data_bpoints;

-               mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(mips32_comparator_t));
+               mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(struct mips32_comparator));

                for (i = 0; i < mips32->num_data_bpoints; i++)
                {
                        mips32->data_break_list[i].reg_address = EJTAG_DBA1 + (0x100 * i);
                for (i = 0; i < mips32->num_data_bpoints; i++)
                {
                        mips32->data_break_list[i].reg_address = EJTAG_DBA1 + (0x100 * i);

diff --git a/src/target/mips32.h b/src/target/mips32.h
index 476b76882fb3370717aa8cf330a883e38b311014..5398ddf7fef255a0604d0dd257e577c34ca7de74 100644 (file)
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -37,13 +37,13 @@ enum
        MIPS32NUMCOREREGS
 };
 
        MIPS32NUMCOREREGS
 };
 

-typedef struct mips32_comparator_s
+struct mips32_comparator

 {
        int used;
        //int type;
        uint32_t bp_value;
        uint32_t reg_address;
 {
        int used;
        //int type;
        uint32_t bp_value;
        uint32_t reg_address;

-} mips32_comparator_t;
+};

 
 typedef struct mips32_common_s
 {
 
 typedef struct mips32_common_s
 {


@@ -58,8 +58,8 @@ typedef struct mips32_common_s
        int num_data_bpoints;
        int num_inst_bpoints_avail;
        int num_data_bpoints_avail;
        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);
 
        /* register cache to processor synchronization */
        int (*read_core_reg)(struct target_s *target, int num);

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 0fc32ab8798843d7a4b8f23ce5093032bd9feefa..df9ec4143f92c8001589818286fdb90f54e3920e 100644 (file)
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -494,7 +494,7 @@ void mips_m4k_enable_breakpoints(struct target_s *target)
 int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
        mips32_common_t *mips32 = target->arch_info;
 int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
        mips32_common_t *mips32 = target->arch_info;

-       mips32_comparator_t * comparator_list = mips32->inst_break_list;
+       struct mips32_comparator * comparator_list = mips32->inst_break_list;

        int retval;
 
        if (breakpoint->set)
        int retval;
 
        if (breakpoint->set)


@@ -586,7 +586,7 @@ int mips_m4k_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
        /* get pointers to arch-specific information */
        mips32_common_t *mips32 = target->arch_info;
 {
        /* get pointers to arch-specific information */
        mips32_common_t *mips32 = target->arch_info;

-       mips32_comparator_t * comparator_list = mips32->inst_break_list;
+       struct mips32_comparator * comparator_list = mips32->inst_break_list;

        int retval;
 
        if (!breakpoint->set)
        int retval;
 
        if (!breakpoint->set)


@@ -702,7 +702,7 @@ int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint
 int mips_m4k_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
        mips32_common_t *mips32 = target->arch_info;
 int mips_m4k_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
        mips32_common_t *mips32 = target->arch_info;

-       mips32_comparator_t * comparator_list = mips32->data_break_list;
+       struct mips32_comparator * comparator_list = mips32->data_break_list;

        int wp_num = 0;
        /*
         * watchpoint enabled, ignore all byte lanes in value register
        int wp_num = 0;
        /*
         * watchpoint enabled, ignore all byte lanes in value register


@@ -771,7 +771,7 @@ int mips_m4k_unset_watchpoint(struct target_s *target, struct watchpoint *watchp
 {
        /* get pointers to arch-specific information */
        mips32_common_t *mips32 = target->arch_info;
 {
        /* get pointers to arch-specific information */
        mips32_common_t *mips32 = target->arch_info;

-       mips32_comparator_t * comparator_list = mips32->data_break_list;
+       struct mips32_comparator * comparator_list = mips32->data_break_list;

 
        if (!watchpoint->set)
        {
 
        if (!watchpoint->set)
        {