From 9b5e6c1e489d5cc1e14aeb18c134b0b2892d3d92 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Dec 2023 20:09:50 -0500 Subject: sim: frv: fix -Wshadow=local warnings Delete redundant decls, and rename conflicting vars. --- sim/frv/interrupts.c | 1 - sim/frv/options.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sim/frv/interrupts.c b/sim/frv/interrupts.c index 9793607..8faab5f 100644 --- a/sim/frv/interrupts.c +++ b/sim/frv/interrupts.c @@ -887,7 +887,6 @@ set_exception_status_registers ( break; default: { - SIM_DESC sd = CPU_STATE (current_cpu); IADDR pc = CPU_PC_GET (current_cpu); sim_engine_abort (sd, current_cpu, pc, "invalid non-strict program interrupt kind: %d\n", diff --git a/sim/frv/options.c b/sim/frv/options.c index cb1729b..d642500 100644 --- a/sim/frv/options.c +++ b/sim/frv/options.c @@ -212,9 +212,9 @@ frv_option_handler (SIM_DESC sd, sim_cpu *current_cpu, int opt, } for (i = 0; i < MAX_NR_PROCESSORS; ++i) { - SIM_CPU *current_cpu = STATE_CPU (sd, i); - FRV_CACHE *insn_cache = CPU_INSN_CACHE (current_cpu); - FRV_CACHE *data_cache = CPU_DATA_CACHE (current_cpu); + SIM_CPU *cpu = STATE_CPU (sd, i); + FRV_CACHE *insn_cache = CPU_INSN_CACHE (cpu); + FRV_CACHE *data_cache = CPU_DATA_CACHE (cpu); insn_cache->memory_latency = cycles; data_cache->memory_latency = cycles; } -- cgit v1.1