From f6315d5e5b7b71515ef051711e5f818a42d6b3b3 Mon Sep 17 00:00:00 2001 From: Freddie Chopin Date: Fri, 3 Jun 2011 22:10:03 +0200 Subject: Fix "unused variable" warnings (errors) detected with GCC 4.7.0 - trivial fixes --- src/target/arm720t.c | 5 ----- src/target/arm920t.c | 10 ---------- src/target/arm926ejs.c | 3 --- src/target/arm946e.c | 2 -- src/target/arm_adi_v5.c | 6 ++---- src/target/arm_disassembler.c | 3 +-- src/target/armv4_5.c | 2 -- src/target/breakpoints.c | 4 ---- src/target/dsp563xx.c | 14 +++----------- src/target/embeddedice.c | 5 ++--- src/target/mips32.c | 4 ---- src/target/mips32_pracc.c | 8 -------- src/target/smp.c | 4 ++-- 13 files changed, 10 insertions(+), 60 deletions(-) (limited to 'src/target') diff --git a/src/target/arm720t.c b/src/target/arm720t.c index 76862ed5..b41fbecc 100644 --- a/src/target/arm720t.c +++ b/src/target/arm720t.c @@ -253,15 +253,12 @@ static int arm720t_verify_pointer(struct command_context *cmd_ctx, static int arm720t_arch_state(struct target *target) { struct arm720t_common *arm720t = target_to_arm720(target); - struct arm *armv4_5; static const char *state[] = { "disabled", "enabled" }; - armv4_5 = &arm720t->arm7_9_common.armv4_5_common; - arm_arch_state(target); LOG_USER("MMU: %s, Cache: %s", state[arm720t->armv4_5_mmu.mmu_enabled], @@ -466,13 +463,11 @@ COMMAND_HANDLER(arm720t_handle_cp15_command) int retval; struct target *target = get_current_target(CMD_CTX); struct arm720t_common *arm720t = target_to_arm720(target); - struct arm_jtag *jtag_info; retval = arm720t_verify_pointer(CMD_CTX, arm720t); if (retval != ERROR_OK) return retval; - jtag_info = &arm720t->arm7_9_common.jtag_info; if (target->state != TARGET_HALTED) { diff --git a/src/target/arm920t.c b/src/target/arm920t.c index 210c253d..f057d7b9 100644 --- a/src/target/arm920t.c +++ b/src/target/arm920t.c @@ -533,7 +533,6 @@ int arm920t_arch_state(struct target *target) }; struct arm920t_common *arm920t = target_to_arm920(target); - struct arm *armv4_5; if (arm920t->common_magic != ARM920T_COMMON_MAGIC) { @@ -541,8 +540,6 @@ int arm920t_arch_state(struct target *target) return ERROR_TARGET_INVALID; } - armv4_5 = &arm920t->arm7_9_common.armv4_5_common; - arm_arch_state(target); LOG_USER("MMU: %s, D-Cache: %s, I-Cache: %s", state[arm920t->armv4_5_mmu.mmu_enabled], @@ -898,7 +895,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command) uint32_t C15_C_D_Ind, C15_C_I_Ind; int i; FILE *output; - struct arm920t_cache_line d_cache[8][64], i_cache[8][64]; int segment, index_t; struct reg *r; @@ -1007,8 +1003,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command) return retval; } - d_cache[segment][index_t].cam = regs[9]; - /* mask LFSR[6] */ regs[9] &= 0xfffffffe; fprintf(output, "\nsegment: %i, index: %i, CAM: 0x%8.8" @@ -1018,7 +1012,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command) for (i = 1; i < 9; i++) { - d_cache[segment][index_t].data[i] = regs[i]; fprintf(output, "%i: 0x%8.8" PRIx32 "\n", i-1, regs[i]); } @@ -1115,8 +1108,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command) return retval; } - i_cache[segment][index_t].cam = regs[9]; - /* mask LFSR[6] */ regs[9] &= 0xfffffffe; fprintf(output, "\nsegment: %i, index: %i, " @@ -1126,7 +1117,6 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command) for (i = 1; i < 9; i++) { - i_cache[segment][index_t].data[i] = regs[i]; fprintf(output, "%i: 0x%8.8" PRIx32 "\n", i-1, regs[i]); } diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index c72fe105..873e9a03 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -536,7 +536,6 @@ int arm926ejs_arch_state(struct target *target) }; struct arm926ejs_common *arm926ejs = target_to_arm926(target); - struct arm *armv4_5; if (arm926ejs->common_magic != ARM926EJS_COMMON_MAGIC) { @@ -544,8 +543,6 @@ int arm926ejs_arch_state(struct target *target) return ERROR_TARGET_INVALID; } - armv4_5 = &arm926ejs->arm7_9_common.armv4_5_common; - arm_arch_state(target); LOG_USER("MMU: %s, D-Cache: %s, I-Cache: %s", state[arm926ejs->armv4_5_mmu.mmu_enabled], diff --git a/src/target/arm946e.c b/src/target/arm946e.c index 09227185..d9d953d1 100644 --- a/src/target/arm946e.c +++ b/src/target/arm946e.c @@ -383,7 +383,6 @@ uint32_t arm946e_invalidate_dcache(struct target *target, uint32_t address, uint32_t shift = 0; uint32_t cur_addr = 0x0; uint32_t cp15_idx, set, way, dtag; - int nb_idx; uint32_t i = 0; int retval; @@ -403,7 +402,6 @@ uint32_t arm946e_invalidate_dcache(struct target *target, uint32_t address, shift = csize - 0x3; /* Now 0 = 4KB, 1 = 8KB, ... */ csize = 1 << (12 + shift); - nb_idx = (csize / 32); set = (cur_addr >> 5) & 0xff; /* set field is 8 bits long */ diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index cd6e5deb..f8a2e227 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -1088,7 +1088,7 @@ int dap_get_debugbase(struct adiv5_dap *dap, int ap, { uint32_t ap_old; int retval; - uint32_t dbgbase, apid, idcode; + uint32_t dbgbase, apid; /* AP address is in bits 31:24 of DP_SELECT */ if (ap >= 256) @@ -1110,10 +1110,8 @@ int dap_get_debugbase(struct adiv5_dap *dap, int ap, /* Excavate the device ID code */ struct jtag_tap *tap = dap->jtag_info->tap; while (tap != NULL) { - if (tap->hasidcode) { - idcode = tap->idcode; + if (tap->hasidcode) break; - } tap = tap->next_tap; } if (tap == NULL || !tap->hasidcode) diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c index 10720f45..36566c99 100644 --- a/src/target/arm_disassembler.c +++ b/src/target/arm_disassembler.c @@ -300,7 +300,7 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode, else /* LDC or STC */ { uint8_t CRd, Rn, offset; - uint8_t U, N; + uint8_t U; char *mnemonic; char addressing_mode[32]; @@ -321,7 +321,6 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode, } U = (opcode & 0x00800000) >> 23; - N = (opcode & 0x00400000) >> 22; /* addressing modes */ if ((opcode & 0x01200000) == 0x01000000) /* offset */ diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index ac7f6236..ef9b8397 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -612,7 +612,6 @@ COMMAND_HANDLER(handle_armv4_5_reg_command) { struct target *target = get_current_target(CMD_CTX); struct arm *armv4_5 = target_to_arm(target); - unsigned num_regs; struct reg *regs; if (!is_arm(armv4_5)) @@ -645,7 +644,6 @@ COMMAND_HANDLER(handle_armv4_5_reg_command) return ERROR_FAIL; } - num_regs = armv4_5->core_cache->num_regs; regs = armv4_5->core_cache->reg_list; for (unsigned mode = 0; mode < ARRAY_SIZE(arm_mode_data); mode++) { diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c index 80f98dc1..e6eb6738 100644 --- a/src/target/breakpoints.c +++ b/src/target/breakpoints.c @@ -159,13 +159,11 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint void breakpoint_remove_internal(struct target *target, uint32_t address) { struct breakpoint *breakpoint = target->breakpoints; - struct breakpoint **breakpoint_p = &target->breakpoints; while (breakpoint) { if (breakpoint->address == address) break; - breakpoint_p = &breakpoint->next; breakpoint = breakpoint->next; } @@ -332,13 +330,11 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint void watchpoint_remove(struct target *target, uint32_t address) { struct watchpoint *watchpoint = target->watchpoints; - struct watchpoint **watchpoint_p = &target->watchpoints; while (watchpoint) { if (watchpoint->address == address) break; - watchpoint_p = &watchpoint->next; watchpoint = watchpoint->next; } diff --git a/src/target/dsp563xx.c b/src/target/dsp563xx.c index 82cd8be5..5290b637 100644 --- a/src/target/dsp563xx.c +++ b/src/target/dsp563xx.c @@ -349,13 +349,11 @@ static int dsp563xx_get_gdb_reg_list(struct target *target, struct reg **reg_lis static int dsp563xx_read_core_reg(struct target *target, int num) { uint32_t reg_value; - struct dsp563xx_core_reg *dsp563xx_core_reg; struct dsp563xx_common *dsp563xx = target_to_dsp563xx(target); if ((num < 0) || (num >= DSP563XX_NUMCOREREGS)) return ERROR_INVALID_ARGUMENTS; - dsp563xx_core_reg = dsp563xx->core_cache->reg_list[num].arch_info; reg_value = dsp563xx->core_regs[num]; buf_set_u32(dsp563xx->core_cache->reg_list[num].value, 0, 32, reg_value); dsp563xx->core_cache->reg_list[num].valid = 1; @@ -367,14 +365,12 @@ static int dsp563xx_read_core_reg(struct target *target, int num) static int dsp563xx_write_core_reg(struct target *target, int num) { uint32_t reg_value; - struct dsp563xx_core_reg *dsp563xx_core_reg; struct dsp563xx_common *dsp563xx = target_to_dsp563xx(target); if ((num < 0) || (num >= DSP563XX_NUMCOREREGS)) return ERROR_INVALID_ARGUMENTS; reg_value = buf_get_u32(dsp563xx->core_cache->reg_list[num].value, 0, 32); - dsp563xx_core_reg = dsp563xx->core_cache->reg_list[num].arch_info; dsp563xx->core_regs[num] = reg_value; dsp563xx->core_cache->reg_list[num].valid = 1; dsp563xx->core_cache->reg_list[num].dirty = 0; @@ -582,7 +578,7 @@ static int dsp563xx_reg_pc_read(struct target *target) static int dsp563xx_reg_ssh_read(struct target *target) { int err; - uint32_t sp, sc, ep; + uint32_t sp; struct dsp563xx_core_reg *arch_info; struct dsp563xx_common *dsp563xx = target_to_dsp563xx(target); @@ -598,14 +594,14 @@ static int dsp563xx_reg_ssh_read(struct target *target) /* get a valid stack count */ if ((err = dsp563xx_read_register(target, DSP563XX_REG_IDX_SC, 0)) != ERROR_OK) return err; - sc = dsp563xx->core_regs[DSP563XX_REG_IDX_SC]; + if ((err = dsp563xx_write_register(target, DSP563XX_REG_IDX_SC, 0)) != ERROR_OK) return err; /* get a valid extended pointer */ if ((err = dsp563xx_read_register(target, DSP563XX_REG_IDX_EP, 0)) != ERROR_OK) return err; - ep = dsp563xx->core_regs[DSP563XX_REG_IDX_EP]; + if ((err = dsp563xx_write_register(target, DSP563XX_REG_IDX_EP, 0)) != ERROR_OK) return err; @@ -1060,7 +1056,6 @@ static int dsp563xx_halt(struct target *target) static int dsp563xx_resume(struct target *target, int current, uint32_t address, int handle_breakpoints, int debug_execution) { int err; - struct dsp563xx_core_reg *dsp563xx_core_reg; struct dsp563xx_common *dsp563xx = target_to_dsp563xx(target); /* check if pc was changed and resume want to execute the next address @@ -1072,7 +1067,6 @@ static int dsp563xx_resume(struct target *target, int current, uint32_t address, if ( current && dsp563xx->core_cache->reg_list[DSP563XX_REG_IDX_PC].dirty ) { dsp563xx_write_core_reg(target,DSP563XX_REG_IDX_PC); - dsp563xx_core_reg = dsp563xx->core_cache->reg_list[DSP563XX_REG_IDX_PC].arch_info; address = dsp563xx->core_regs[DSP563XX_REG_IDX_PC]; current = 0; } @@ -1112,7 +1106,6 @@ static int dsp563xx_step_ex(struct target *target, int current, uint32_t address int err; uint32_t once_status; uint32_t dr_in, cnt; - struct dsp563xx_core_reg *dsp563xx_core_reg; struct dsp563xx_common *dsp563xx = target_to_dsp563xx(target); if (target->state != TARGET_HALTED) @@ -1130,7 +1123,6 @@ static int dsp563xx_step_ex(struct target *target, int current, uint32_t address if ( current && dsp563xx->core_cache->reg_list[DSP563XX_REG_IDX_PC].dirty ) { dsp563xx_write_core_reg(target,DSP563XX_REG_IDX_PC); - dsp563xx_core_reg = dsp563xx->core_cache->reg_list[DSP563XX_REG_IDX_PC].arch_info; address = dsp563xx->core_regs[DSP563XX_REG_IDX_PC]; current = 0; } diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index b171dcf7..a38028c8 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -497,13 +497,12 @@ static int embeddedice_set_reg_w_exec(struct reg *reg, uint8_t *buf) void embeddedice_write_reg(struct reg *reg, uint32_t value) { struct embeddedice_reg *ice_reg = reg->arch_info; - int retval; LOG_DEBUG("%i: 0x%8.8" PRIx32 "", ice_reg->addr, value); - retval = arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE); + arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE); - retval = arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL, TAP_IDLE); + arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL, TAP_IDLE); uint8_t reg_addr = ice_reg->addr & 0x1f; embeddedice_write_reg_inner(ice_reg->jtag_info->tap, reg_addr, value); diff --git a/src/target/mips32.c b/src/target/mips32.c index 4782067b..65ea6e85 100644 --- a/src/target/mips32.c +++ b/src/target/mips32.c @@ -143,7 +143,6 @@ static int mips32_set_core_reg(struct reg *reg, uint8_t *buf) static int mips32_read_core_reg(struct target *target, int num) { uint32_t reg_value; - struct mips32_core_reg *mips_core_reg; /* get pointers to arch-specific information */ struct mips32_common *mips32 = target_to_mips32(target); @@ -151,7 +150,6 @@ static int mips32_read_core_reg(struct target *target, int num) if ((num < 0) || (num >= MIPS32NUMCOREREGS)) return ERROR_INVALID_ARGUMENTS; - mips_core_reg = mips32->core_cache->reg_list[num].arch_info; reg_value = mips32->core_regs[num]; buf_set_u32(mips32->core_cache->reg_list[num].value, 0, 32, reg_value); mips32->core_cache->reg_list[num].valid = 1; @@ -163,7 +161,6 @@ static int mips32_read_core_reg(struct target *target, int num) static int mips32_write_core_reg(struct target *target, int num) { uint32_t reg_value; - struct mips32_core_reg *mips_core_reg; /* get pointers to arch-specific information */ struct mips32_common *mips32 = target_to_mips32(target); @@ -172,7 +169,6 @@ static int mips32_write_core_reg(struct target *target, int num) return ERROR_INVALID_ARGUMENTS; reg_value = buf_get_u32(mips32->core_cache->reg_list[num].value, 0, 32); - mips_core_reg = mips32->core_cache->reg_list[num].arch_info; mips32->core_regs[num] = reg_value; LOG_DEBUG("write core reg %i value 0x%" PRIx32 "", num , reg_value); mips32->core_cache->reg_list[num].valid = 1; diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c index 178f68e1..af60d321 100644 --- a/src/target/mips32_pracc.c +++ b/src/target/mips32_pracc.c @@ -473,11 +473,8 @@ static int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int retval = ERROR_OK; int blocksize; - int bytesread; uint32_t param_in[2]; - bytesread = 0; - //while (count > 0) { blocksize = count; @@ -492,7 +489,6 @@ static int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, // count -= blocksize; // addr += blocksize; -// bytesread += blocksize; } for (i = 0; i < count; i++) @@ -550,11 +546,8 @@ static int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int retval = ERROR_OK; int blocksize; - int bytesread; uint32_t param_in[2]; - bytesread = 0; - // while (count > 0) { blocksize = count; @@ -569,7 +562,6 @@ static int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, // count -= blocksize; // addr += blocksize; -// bytesread += blocksize; } for (i = 0; i < count; i++) diff --git a/src/target/smp.c b/src/target/smp.c index aabfa5b8..f4adc8d0 100644 --- a/src/target/smp.c +++ b/src/target/smp.c @@ -95,7 +95,6 @@ int gdb_write_smp_packet(struct connection *connection, { char *separator; int coreid = 0; - int retval = ERROR_OK; /* skip command character */ if (target->smp) @@ -110,7 +109,8 @@ int gdb_write_smp_packet(struct connection *connection, } else { - retval = gdb_put_packet(connection,"E01",3); + gdb_put_packet(connection,"E01",3); } + return ERROR_OK; } -- cgit v1.2.3