From c6f30b8791edefc467bad77cc8f452e68c89a71e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Dec 2023 20:12:25 -0500 Subject: [PATCH] sim: m68hc11: fix -Wshadow=local warnings Delete redundant decls when the existing scope has the same var and type available for use. --- sim/m68hc11/dv-m68hc11.c | 3 +-- sim/m68hc11/dv-m68hc11sio.c | 2 +- sim/m68hc11/interp.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sim/m68hc11/dv-m68hc11.c b/sim/m68hc11/dv-m68hc11.c index ef18f09..fc8b22c 100644 --- a/sim/m68hc11/dv-m68hc11.c +++ b/sim/m68hc11/dv-m68hc11.c @@ -782,7 +782,6 @@ m68hc11_option_handler (SIM_DESC sd, sim_cpu *cpu, osc = &controller->oscillators[i]; if (osc->event) { - double f; int cur_value; int next_value; char freq[32]; @@ -927,7 +926,7 @@ m68hc11cpu_set_port (struct hw *me, sim_cpu *cpu, /* Scan IC3, IC2 and IC1. Bit number is 3 - i. */ for (i = 0; i < 3; i++) { - uint8_t mask = (1 << i); + mask = (1 << i); if (delta & mask) { diff --git a/sim/m68hc11/dv-m68hc11sio.c b/sim/m68hc11/dv-m68hc11sio.c index 03b4461..f77dfde 100644 --- a/sim/m68hc11/dv-m68hc11sio.c +++ b/sim/m68hc11/dv-m68hc11sio.c @@ -227,7 +227,7 @@ m68hc11sio_port_event (struct hw *me, simulate some initial setup by the internal rom. */ if (((m68hc11_cpu->ios[M6811_HPRIO]) & (M6811_SMOD | M6811_MDA)) == M6811_SMOD) { - unsigned char val = 0x33; + val = 0x33; m68hc11sio_io_write_buffer (me, &val, io_map, (unsigned_word) M6811_BAUD, 1); diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c index df6bd7b..c4d5c22 100644 --- a/sim/m68hc11/interp.c +++ b/sim/m68hc11/interp.c @@ -478,7 +478,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, /* CPU specific initialization. */ for (i = 0; i < MAX_NR_PROCESSORS; ++i) { - SIM_CPU *cpu = STATE_CPU (sd, i); + cpu = STATE_CPU (sd, i); CPU_REG_FETCH (cpu) = m68hc11_reg_fetch; CPU_REG_STORE (cpu) = m68hc11_reg_store; -- 2.7.4