sim: frv: fix -Wshadow=local warnings

Delete redundant decls, and rename conflicting vars.

diff --git a/sim/frv/interrupts.c b/sim/frv/interrupts.c
index 979360738bab8aa3882bfbf072250b0c15191c17..8faab5fe0db96e012a425a9b868cc1d87f654a05 100644 (file)
--- 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 cb1729b9c403516c695d19481c4761b282ee4995..d6425002901f36c643e65bd4657bed6fdd2ed133 100644 (file)
--- 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;
          }