From 1bd7a78d92e06fcd403c915f0e9d3ecdbcc8305d Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 13 Nov 2009 08:43:26 -0800 Subject: [PATCH] mips32_comparator_t -> struct mips32_comparator Remove misleading typedef and redundant suffix from struct mips32_comparator. --- src/target/mips32.c | 4 ++-- src/target/mips32.h | 8 ++++---- src/target/mips_m4k.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/target/mips32.c b/src/target/mips32.c index 055d2788..c8e47aac 100644 --- 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->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); @@ -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->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); diff --git a/src/target/mips32.h b/src/target/mips32.h index 476b7688..5398ddf7 100644 --- a/src/target/mips32.h +++ b/src/target/mips32.h @@ -37,13 +37,13 @@ enum MIPS32NUMCOREREGS }; -typedef struct mips32_comparator_s +struct mips32_comparator { int used; //int type; uint32_t bp_value; uint32_t reg_address; -} mips32_comparator_t; +}; 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; - 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); diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index 0fc32ab8..df9ec414 100644 --- 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; - mips32_comparator_t * comparator_list = mips32->inst_break_list; + struct mips32_comparator * comparator_list = mips32->inst_break_list; 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; - mips32_comparator_t * comparator_list = mips32->inst_break_list; + struct mips32_comparator * comparator_list = mips32->inst_break_list; 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; - 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 @@ -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; - mips32_comparator_t * comparator_list = mips32->data_break_list; + struct mips32_comparator * comparator_list = mips32->data_break_list; if (!watchpoint->set) { -- 2.39.5