[PATCH 01/17] sim: arm: fix -Wunused-but-set-variable warnings

[PATCH 01/17] sim: arm: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/arm/armos.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sim/arm/armos.c b/sim/arm/armos.c
index 9cf238ac8e25..42d1dfb4ed1f 100644
--- a/sim/arm/armos.c
+++ b/sim/arm/armos.c
@@ -99,7 +99,6 @@ ARMul_OSInit (ARMul_State * state)
 #ifndef NOOS
 #ifndef VALIDATE
   ARMword instr, i, j;
-  struct OSblock *OSptr = (struct OSblock *) state->OSptr;
 
   if (state->OSptr == NULL)
     {
@@ -111,7 +110,6 @@ ARMul_OSInit (ARMul_State * state)
 	}
     }
 
-  OSptr = (struct OSblock *) state->OSptr;
   state->Reg[13] = ADDRSUPERSTACK;			/* Set up a stack for the current mode...  */
   ARMul_SetReg (state, SVC32MODE,   13, ADDRSUPERSTACK);/* ...and for supervisor mode...  */
   ARMul_SetReg (state, ABORT32MODE, 13, ADDRSUPERSTACK);/* ...and for abort 32 mode...  */
-- 
2.43.0

[PATCH 02/17] sim: bfin: gui: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

Rework the code to use static inline functions when it's disabled
rather than macros so the compiler knows the various function args
are always used.  The ifdef macros are a bit ugly, but get the job
done without duplicating the function prototypes.
---
 sim/bfin/gui.h | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/sim/bfin/gui.h b/sim/bfin/gui.h
index ef363b599861..daf4398694b4 100644
--- a/sim/bfin/gui.h
+++ b/sim/bfin/gui.h
@@ -21,7 +21,14 @@
 #ifndef BFIN_GUI_H
 #define BFIN_GUI_H
 
+/* These macros are ugly.  */
 #ifdef HAVE_SDL
+# define _BFIN_GUI_INLINE
+# define _BFIN_GUI_STUB(...) ;
+#else
+# define _BFIN_GUI_INLINE ATTRIBUTE_UNUSED static inline
+# define _BFIN_GUI_STUB(val) { return val; }
+#endif
 
 enum gui_color {
   GUI_COLOR_RGB_565,
@@ -30,21 +37,24 @@ enum gui_color {
   GUI_COLOR_BGR_888,
   GUI_COLOR_RGBA_8888,
 };
-enum gui_color bfin_gui_color (const char *color);
-int bfin_gui_color_depth (enum gui_color color);
-
-void *bfin_gui_setup (void *state, int enabled, int height, int width,
-		      enum gui_color color);
+_BFIN_GUI_INLINE
+enum gui_color bfin_gui_color (const char *color)
+  _BFIN_GUI_STUB(GUI_COLOR_RGB_565)
 
-unsigned bfin_gui_update (void *state, const void *source, unsigned nr_bytes);
+_BFIN_GUI_INLINE
+int bfin_gui_color_depth (enum gui_color color)
+  _BFIN_GUI_STUB(0)
 
-#else
+_BFIN_GUI_INLINE
+void *bfin_gui_setup (void *state, int enabled, int height, int width,
+		      enum gui_color color)
+  _BFIN_GUI_STUB(NULL)
 
-# define bfin_gui_color(...)		0
-# define bfin_gui_color_depth(...)	0
-# define bfin_gui_setup(...)		NULL
-# define bfin_gui_update(...)		0
+_BFIN_GUI_INLINE
+unsigned bfin_gui_update (void *state, const void *source, unsigned nr_bytes)
+  _BFIN_GUI_STUB(0)
 
-#endif
+#undef _BFIN_GUI_INLINE
+#undef _BFIN_GUI_STUB
 
 #endif
-- 
2.43.0

[PATCH 03/17] sim: bfin: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/bfin/bfin-sim.c     | 3 ++-
 sim/bfin/dv-bfin_emac.c | 3 ---
 sim/bfin/dv-bfin_mmu.c  | 4 +---
 sim/bfin/dv-bfin_pll.c  | 2 --
 sim/bfin/dv-bfin_rtc.c  | 2 --
 sim/bfin/dv-bfin_sic.c  | 8 --------
 6 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/sim/bfin/bfin-sim.c b/sim/bfin/bfin-sim.c
index a9b8fd09220f..12c7827f9ec4 100644
--- a/sim/bfin/bfin-sim.c
+++ b/sim/bfin/bfin-sim.c
@@ -1592,7 +1592,8 @@ decode_macfunc (SIM_CPU *cpu, int which, int op, int h0, int h1, int src0,
 
   if (op != 3)
     {
-      bu8 sgn0 = (acc >> 31) & 1;
+      /* TODO: Figure out how the 32-bit sign is used.  */
+      ATTRIBUTE_UNUSED bu8 sgn0 = (acc >> 31) & 1;
       bu8 sgn40 = (acc >> 39) & 1;
       bu40 nosat_acc;
 
diff --git a/sim/bfin/dv-bfin_emac.c b/sim/bfin/dv-bfin_emac.c
index 0288b7404999..1ab7cd63554d 100644
--- a/sim/bfin/dv-bfin_emac.c
+++ b/sim/bfin/dv-bfin_emac.c
@@ -539,11 +539,8 @@ bfin_emac_tap_init (struct hw *me)
 {
 #if WITH_TUN
   struct bfin_emac *emac = hw_data (me);
-  const hw_unit *unit;
   int flags;
 
-  unit = hw_unit_address (me);
-
   emac->tap = open ("/dev/net/tun", O_RDWR);
   if (emac->tap == -1)
     {
diff --git a/sim/bfin/dv-bfin_mmu.c b/sim/bfin/dv-bfin_mmu.c
index 71c7176b88bf..c14e2088c1f1 100644
--- a/sim/bfin/dv-bfin_mmu.c
+++ b/sim/bfin/dv-bfin_mmu.c
@@ -451,7 +451,7 @@ _mmu_check_addr (SIM_CPU *cpu, bu32 addr, bool write, bool inst, int size)
 {
   SIM_DESC sd = CPU_STATE (cpu);
   struct bfin_mmu *mmu;
-  bu32 *fault_status, *fault_addr, *mem_control, *cplb_addr, *cplb_data;
+  bu32 *mem_control, *cplb_addr, *cplb_data;
   bu32 faults;
   bool supv, do_excp, dag1;
   int i, hits;
@@ -469,8 +469,6 @@ _mmu_check_addr (SIM_CPU *cpu, bu32 addr, bool write, bool inst, int size)
     }
 
   mmu = MMU_STATE (cpu);
-  fault_status = inst ? &mmu->icplb_fault_status : &mmu->dcplb_fault_status;
-  fault_addr = inst ? &mmu->icplb_fault_addr : &mmu->dcplb_fault_addr;
   mem_control = inst ? &mmu->imem_control : &mmu->dmem_control;
   cplb_addr = inst ? &mmu->icplb_addr[0] : &mmu->dcplb_addr[0];
   cplb_data = inst ? &mmu->icplb_data[0] : &mmu->dcplb_data[0];
diff --git a/sim/bfin/dv-bfin_pll.c b/sim/bfin/dv-bfin_pll.c
index dd95013f2f49..863b07f49ec3 100644
--- a/sim/bfin/dv-bfin_pll.c
+++ b/sim/bfin/dv-bfin_pll.c
@@ -56,7 +56,6 @@ bfin_pll_io_write_buffer (struct hw *me, const void *source,
   bu32 mmr_off;
   bu32 value;
   bu16 *value16p;
-  bu32 *value32p;
   void *valuep;
 
   /* Invalid access mode is higher priority than missing register.  */
@@ -71,7 +70,6 @@ bfin_pll_io_write_buffer (struct hw *me, const void *source,
   mmr_off = addr - pll->base;
   valuep = (void *)((uintptr_t)pll + mmr_base() + mmr_off);
   value16p = valuep;
-  value32p = valuep;
 
   HW_TRACE_WRITE ();
 
diff --git a/sim/bfin/dv-bfin_rtc.c b/sim/bfin/dv-bfin_rtc.c
index b6ae0a537712..fdb63f3a4f9a 100644
--- a/sim/bfin/dv-bfin_rtc.c
+++ b/sim/bfin/dv-bfin_rtc.c
@@ -59,7 +59,6 @@ bfin_rtc_io_write_buffer (struct hw *me, const void *source,
   bu32 mmr_off;
   bu32 value;
   bu16 *value16p;
-  bu32 *value32p;
   void *valuep;
 
   /* Invalid access mode is higher priority than missing register.  */
@@ -74,7 +73,6 @@ bfin_rtc_io_write_buffer (struct hw *me, const void *source,
   mmr_off = addr - rtc->base;
   valuep = (void *)((uintptr_t)rtc + mmr_base() + mmr_off);
   value16p = valuep;
-  value32p = valuep;
 
   HW_TRACE_WRITE ();
 
diff --git a/sim/bfin/dv-bfin_sic.c b/sim/bfin/dv-bfin_sic.c
index 5210cf0a8eeb..ac302a7f8519 100644
--- a/sim/bfin/dv-bfin_sic.c
+++ b/sim/bfin/dv-bfin_sic.c
@@ -147,7 +147,6 @@ bfin_sic_52x_io_write_buffer (struct hw *me, const void *source, int space,
   struct bfin_sic *sic = hw_data (me);
   bu32 mmr_off;
   bu32 value;
-  bu16 *value16p;
   bu32 *value32p;
   void *valuep;
 
@@ -162,7 +161,6 @@ bfin_sic_52x_io_write_buffer (struct hw *me, const void *source, int space,
 
   mmr_off = addr - sic->base;
   valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
-  value16p = valuep;
   value32p = valuep;
 
   HW_TRACE_WRITE ();
@@ -261,7 +259,6 @@ bfin_sic_537_io_write_buffer (struct hw *me, const void *source, int space,
   struct bfin_sic *sic = hw_data (me);
   bu32 mmr_off;
   bu32 value;
-  bu16 *value16p;
   bu32 *value32p;
   void *valuep;
 
@@ -276,7 +273,6 @@ bfin_sic_537_io_write_buffer (struct hw *me, const void *source, int space,
 
   mmr_off = addr - sic->base;
   valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
-  value16p = valuep;
   value32p = valuep;
 
   HW_TRACE_WRITE ();
@@ -375,7 +371,6 @@ bfin_sic_54x_io_write_buffer (struct hw *me, const void *source, int space,
   struct bfin_sic *sic = hw_data (me);
   bu32 mmr_off;
   bu32 value;
-  bu16 *value16p;
   bu32 *value32p;
   void *valuep;
 
@@ -390,7 +385,6 @@ bfin_sic_54x_io_write_buffer (struct hw *me, const void *source, int space,
 
   mmr_off = addr - sic->base;
   valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
-  value16p = valuep;
   value32p = valuep;
 
   HW_TRACE_WRITE ();
@@ -482,7 +476,6 @@ bfin_sic_561_io_write_buffer (struct hw *me, const void *source, int space,
   struct bfin_sic *sic = hw_data (me);
   bu32 mmr_off;
   bu32 value;
-  bu16 *value16p;
   bu32 *value32p;
   void *valuep;
 
@@ -497,7 +490,6 @@ bfin_sic_561_io_write_buffer (struct hw *me, const void *source, int space,
 
   mmr_off = addr - sic->base;
   valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
-  value16p = valuep;
   value32p = valuep;
 
   HW_TRACE_WRITE ();
-- 
2.43.0

[PATCH 04/17] sim: cris: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

We suppress the warning in the generated switch file because the cris
cpu file has a hack to workaround a cgen bug, but that generates a set
but unused variable which makes the compiler upset.
---
 sim/Makefile.in   | 2 ++
 sim/cris/local.mk | 4 ++++
 sim/cris/sim-if.c | 7 +++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sim/cris/local.mk b/sim/cris/local.mk
index 12fa86b410d2..66ebc99376c4 100644
--- a/sim/cris/local.mk
+++ b/sim/cris/local.mk
@@ -16,6 +16,10 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+## Some CGEN kludges are causing build-time warnings.  See cris.cpu for details.
+AM_CFLAGS_%C%_mloopv10f.o = -Wno-unused-but-set-variable
+AM_CFLAGS_%C%_mloopv32f.o = -Wno-unused-but-set-variable
+
 nodist_%C%_libsim_a_SOURCES = \
 	%D%/modules.c
 %C%_libsim_a_SOURCES = \
diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index cad71693ede9..12baafbf323d 100644
--- a/sim/cris/sim-if.c
+++ b/sim/cris/sim-if.c
@@ -337,7 +337,6 @@ cris_set_section_offset_iterator (bfd *abfd, asection *s, void *vp)
 static void
 cris_offset_sections (SIM_DESC sd, int offset)
 {
-  bfd_boolean ret;
   struct bfd *abfd = STATE_PROG_BFD (sd);
   asection *text;
   struct offsetinfo oi;
@@ -350,7 +349,7 @@ cris_offset_sections (SIM_DESC sd, int offset)
   oi.offset = offset;
 
   bfd_map_over_sections (abfd, cris_set_section_offset_iterator, &oi);
-  ret = bfd_set_start_address (abfd, bfd_get_start_address (abfd) + offset);
+  bfd_set_start_address (abfd, bfd_get_start_address (abfd) + offset);
 
   STATE_START_ADDR (sd) = bfd_get_start_address (abfd);
 }
@@ -516,7 +515,7 @@ cris_handle_interpreter (SIM_DESC sd, struct bfd *abfd)
   for (i = 0; i < n_hdrs; i++)
     {
       int interplen;
-      bfd_size_type interpsiz, interp_filesiz;
+      bfd_size_type interpsiz;
       struct progbounds interp_bounds;
 
       if (phdr[i].p_type != PT_INTERP)
@@ -563,7 +562,7 @@ cris_handle_interpreter (SIM_DESC sd, struct bfd *abfd)
 	 perhaps should.  */
       interp_load_addr = 0x40000;
       interpsiz = interp_bounds.endmem - interp_bounds.startmem;
-      interp_filesiz = interp_bounds.end_loadmem - interp_bounds.startmem;
+      /* interp_filesiz = interp_bounds.end_loadmem - interp_bounds.startmem; */
 
       /* If we have a non-DSO or interpreter starting at the wrong
 	 address, bail.  */
-- 
2.43.0

[PATCH 05/17] sim: d10v: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/d10v/interp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 46d7bf274cca..d6a946185241 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -88,13 +88,13 @@ lookup_hash (SIM_DESC sd, SIM_CPU *cpu, uint32_t ins, int size)
 INLINE static void
 get_operands (struct simops *s, uint32_t ins)
 {
-  int i, shift, bits, flags;
+  int i, shift, bits;
   uint32_t mask;
   for (i=0; i < s->numops; i++)
     {
       shift = s->operands[3*i];
       bits = s->operands[3*i+1];
-      flags = s->operands[3*i+2];
+      /* flags = s->operands[3*i+2]; */
       mask = 0x7FFFFFFF >> (31 - bits);
       OP[i] = (ins >> shift) & mask;
     }
-- 
2.43.0

[PATCH 06/17] sim: erc32: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/erc32/erc32.c |  8 ++------
 sim/erc32/func.c  | 11 ++---------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/sim/erc32/erc32.c b/sim/erc32/erc32.c
index ec72ae070a4b..32c45bddb680 100644
--- a/sim/erc32/erc32.c
+++ b/sim/erc32/erc32.c
@@ -1042,10 +1042,6 @@ port_init(void)
 static uint32_t
 read_uart(uint32_t addr)
 {
-
-    unsigned        tmp;
-
-    tmp = 0;
     switch (addr & 0xff) {
 
     case 0xE0:			/* UART 1 */
@@ -1071,7 +1067,7 @@ read_uart(uint32_t addr)
 
 	}
 #else
-	tmp = uarta_data;
+	unsigned tmp = uarta_data;
 	uarta_data &= ~UART_DR;
 	uart_stat_reg &= ~UARTA_DR;
 	return tmp;
@@ -1103,7 +1099,7 @@ read_uart(uint32_t addr)
 
 	}
 #else
-	tmp = uartb_data;
+	unsigned tmp = uartb_data;
 	uartb_data &= ~UART_DR;
 	uart_stat_reg &= ~UARTB_DR;
 	return tmp;
diff --git a/sim/erc32/func.c b/sim/erc32/func.c
index 85f71817dfdb..f1b230a8f918 100644
--- a/sim/erc32/func.c
+++ b/sim/erc32/func.c
@@ -687,11 +687,8 @@ int_handler(int32_t sig)
 void
 init_signals(void)
 {
-    typedef void    (*PFI) ();
-    static PFI      int_tab[2];
-
-    int_tab[0] = signal(SIGTERM, int_handler);
-    int_tab[1] = signal(SIGINT, int_handler);
+    signal(SIGTERM, int_handler);
+    signal(SIGINT, int_handler);
 }
 
 
@@ -706,7 +703,6 @@ disp_fpu(struct pstate *sregs)
 {
 
     int         i;
-    float	t;
 
     printf("\n fsr: %08X\n\n", sregs->fsr);
 
@@ -716,7 +712,6 @@ disp_fpu(struct pstate *sregs)
 #endif
 
     for (i = 0; i < 32; i++) {
-	t = sregs->fs[i];
 	printf(" f%02d  %08x  %14e  ", i, sregs->fsi[i], sregs->fs[i]);
 	if (!(i & 1))
 	    printf("%14e\n", sregs->fd[i >> 1]);
@@ -1006,7 +1001,6 @@ bfd_load (const char *fname)
 {
     asection       *section;
     bfd            *pbfd;
-    const bfd_arch_info_type *arch;
     int            i;
 
     pbfd = bfd_openr(fname, 0);
@@ -1020,7 +1014,6 @@ bfd_load (const char *fname)
 	return -1;
     }
 
-    arch = bfd_get_arch_info (pbfd);
     if (sis_verbose)
 	printf("loading %s:", fname);
     for (section = pbfd->sections; section; section = section->next) {
-- 
2.43.0

[PATCH 07/17] sim: frv: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/frv/cache.c         |  2 --
 sim/frv/profile-fr400.c | 11 -----------
 sim/frv/profile-fr500.c |  2 --
 3 files changed, 15 deletions(-)

diff --git a/sim/frv/cache.c b/sim/frv/cache.c
index 76f762fe5ee7..b4f33f1252d5 100644
--- a/sim/frv/cache.c
+++ b/sim/frv/cache.c
@@ -362,7 +362,6 @@ read_data_from_memory (SIM_CPU *current_cpu, SI address, char *buffer,
 static void
 fill_line_from_memory (FRV_CACHE *cache, FRV_CACHE_TAG *tag, SI address)
 {
-  PCADDR pc;
   int line_alignment;
   SI read_address;
   SIM_CPU *current_cpu = cache->cpu;
@@ -382,7 +381,6 @@ fill_line_from_memory (FRV_CACHE *cache, FRV_CACHE_TAG *tag, SI address)
       tag->line = cache->data_storage + (line_index * cache->line_size);
     }
 
-  pc = CPU_PC_GET (current_cpu);
   line_alignment = cache->line_size - 1;
   read_address = address & ~line_alignment;
   read_data_from_memory (current_cpu, read_address, tag->line,
diff --git a/sim/frv/profile-fr400.c b/sim/frv/profile-fr400.c
index 58ad8c86c4b1..31e25178a4d4 100644
--- a/sim/frv/profile-fr400.c
+++ b/sim/frv/profile-fr400.c
@@ -632,7 +632,6 @@ frvbf_model_fr400_u_media_1 (SIM_CPU *cpu, const IDESC *idesc,
 {
   int cycles;
   FRV_PROFILE_STATE *ps;
-  const CGEN_INSN *insn;
   int busy_adjustment[] = {0, 0};
   int *fr;
 
@@ -643,7 +642,6 @@ frvbf_model_fr400_u_media_1 (SIM_CPU *cpu, const IDESC *idesc,
   cycles = idesc->timing->units[unit_num].done;
 
   ps = CPU_PROFILE_STATE (cpu);
-  insn = idesc->idata;
 
   /* The latency of the registers may be less than previously recorded,
      depending on how they were used previously.
@@ -1673,9 +1671,7 @@ frvbf_model_fr400_u_media_4 (SIM_CPU *cpu, const IDESC *idesc,
 {
   int cycles;
   FRV_PROFILE_STATE *ps;
-  const CGEN_INSN *insn;
   int busy_adjustment[] = {0};
-  int *fr;
 
   if (model_insn == FRV_INSN_MODEL_PASS_1)
     return 0;
@@ -1684,7 +1680,6 @@ frvbf_model_fr400_u_media_4 (SIM_CPU *cpu, const IDESC *idesc,
   cycles = idesc->timing->units[unit_num].done;
 
   ps = CPU_PROFILE_STATE (cpu);
-  insn = idesc->idata;
 
   /* The latency of the registers may be less than previously recorded,
      depending on how they were used previously.
@@ -1709,7 +1704,6 @@ frvbf_model_fr400_u_media_4 (SIM_CPU *cpu, const IDESC *idesc,
   post_wait_for_FR (cpu, out_FRk);
 
   /* Restore the busy cycles of the registers we used.  */
-  fr = ps->fr_busy;
 
   /* The latency of the output register will be at least the latency of the
      other inputs.  Once initiated, post-processing will take 1 cycle.  */
@@ -1751,7 +1745,6 @@ frvbf_model_fr400_u_media_4_acc_dual (SIM_CPU *cpu, const IDESC *idesc,
 {
   int cycles;
   FRV_PROFILE_STATE *ps;
-  const CGEN_INSN *insn;
   INT ACC40Si_1;
   INT FRk_1;
 
@@ -1765,8 +1758,6 @@ frvbf_model_fr400_u_media_4_acc_dual (SIM_CPU *cpu, const IDESC *idesc,
   ACC40Si_1 = DUAL_REG (in_ACC40Si);
   FRk_1 = DUAL_REG (out_FRk);
 
-  insn = idesc->idata;
-
   /* The post processing must wait if there is a dependency on a FR
      which is not ready yet.  */
   ps->post_wait = cycles;
@@ -1802,7 +1793,6 @@ frvbf_model_fr400_u_media_6 (SIM_CPU *cpu, const IDESC *idesc,
 {
   int cycles;
   FRV_PROFILE_STATE *ps;
-  const CGEN_INSN *insn;
   int busy_adjustment[] = {0};
   int *fr;
 
@@ -1813,7 +1803,6 @@ frvbf_model_fr400_u_media_6 (SIM_CPU *cpu, const IDESC *idesc,
   cycles = idesc->timing->units[unit_num].done;
 
   ps = CPU_PROFILE_STATE (cpu);
-  insn = idesc->idata;
 
   /* The latency of the registers may be less than previously recorded,
      depending on how they were used previously.
diff --git a/sim/frv/profile-fr500.c b/sim/frv/profile-fr500.c
index 9d268ce7bcec..0593aefd0dfb 100644
--- a/sim/frv/profile-fr500.c
+++ b/sim/frv/profile-fr500.c
@@ -2043,7 +2043,6 @@ frvbf_model_fr500_u_media (SIM_CPU *cpu, const IDESC *idesc,
 {
   int cycles;
   FRV_PROFILE_STATE *ps;
-  const CGEN_INSN *insn;
   int is_media_s1;
   int is_media_s2;
   int busy_adjustment[] = {0, 0, 0};
@@ -2057,7 +2056,6 @@ frvbf_model_fr500_u_media (SIM_CPU *cpu, const IDESC *idesc,
   cycles = idesc->timing->units[unit_num].done;
 
   ps = CPU_PROFILE_STATE (cpu);
-  insn = idesc->idata;
 
   /* If the previous use of the registers was a media op,
      then their latency will be less than previously recorded.
-- 
2.43.0

[PATCH 08/17] sim: ft32: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/ft32/interp.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c
index e8f990d78b74..146c88a3bcd5 100644
--- a/sim/ft32/interp.c
+++ b/sim/ft32/interp.c
@@ -702,12 +702,8 @@ sim_engine_run (SIM_DESC sd,
 		int nr_cpus,      /* ignore  */
 		int siggnal)      /* ignore  */
 {
-  sim_cpu *cpu;
-
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
-  cpu = STATE_CPU (sd, 0);
-
   while (1)
     {
       step_once (sd);
-- 
2.43.0

[PATCH 09/17] sim: h8300: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/h8300/compile.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c
index a4b39ae3380c..96254ea916d5 100644
--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -2792,7 +2792,6 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
 	    struct stat stat_rec;	/* Stat record */
 	    int fstat_return;	/* Return value from callback to stat.  */
 	    int stat_ptr;	/* Pointer to stat record.  */
-	    char *temp_stat_ptr;	/* Temporary stat_rec pointer.  */
 
 	    fd = (h8300hmode && !h8300_normal_mode) ? GET_L_REG (0) : GET_W_REG (0);
 
@@ -2803,9 +2802,6 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
 	    fstat_return = sim_callback->to_fstat (sim_callback, fd,
 						   &stat_rec);
 
-	    /* Have stat_ptr point to starting of stat_rec.  */
-	    temp_stat_ptr = (char *) (&stat_rec);
-
 	    /* Setting up the stat structure returned.  */
 	    SET_MEMORY_W (stat_ptr, stat_rec.st_dev);
 	    stat_ptr += 2;
@@ -2843,7 +2839,6 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
 	    struct stat stat_rec;	/* Stat record */
 	    int stat_return;	/* Return value from callback to stat */
 	    int stat_ptr;	/* Pointer to stat record.  */
-	    char *temp_stat_ptr;	/* Temporary stat_rec pointer.  */
 	    int i = 0;		/* Loop Counter */
 
 	    /* Setting filename_ptr to first argument of open.  */
@@ -2877,9 +2872,6 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
 	    stat_return =
 	      sim_callback->to_stat (sim_callback, filename, &stat_rec);
 
-	    /* Have stat_ptr point to starting of stat_rec.  */
-	    temp_stat_ptr = (char *) (&stat_rec);
- 
 	    /* Freeing memory used for filename.  */
 	    free (filename);
  
-- 
2.43.0

[PATCH 10/17] sim: m68hc11: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/m68hc11/dv-m68hc11.c    | 2 --
 sim/m68hc11/dv-m68hc11spi.c | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/sim/m68hc11/dv-m68hc11.c b/sim/m68hc11/dv-m68hc11.c
index 7d7931b4bb2a..ef18f0999360 100644
--- a/sim/m68hc11/dv-m68hc11.c
+++ b/sim/m68hc11/dv-m68hc11.c
@@ -589,13 +589,11 @@ m68hc11_info (struct hw *me)
   uint16_t base = 0;
   sim_cpu *cpu;
   struct m68hc11_sim_cpu *m68hc11_cpu;
-  struct m68hc11sio *controller;
   uint8_t val;
   
   sd = hw_system (me);
   cpu = STATE_CPU (sd, 0);
   m68hc11_cpu = M68HC11_SIM_CPU (cpu);
-  controller = hw_data (me);
 
   base = cpu_get_io_base (cpu);
   sim_io_printf (sd, "M68HC11:\n");
diff --git a/sim/m68hc11/dv-m68hc11spi.c b/sim/m68hc11/dv-m68hc11spi.c
index 845db2ffa793..e552fd5de9a8 100644
--- a/sim/m68hc11/dv-m68hc11spi.c
+++ b/sim/m68hc11/dv-m68hc11spi.c
@@ -157,14 +157,10 @@ m68hc11spi_port_event (struct hw *me,
                        int source_port,
                        int level)
 {
-  SIM_DESC sd;
   struct m68hc11spi *controller;
-  sim_cpu *cpu;
   uint8_t val;
   
   controller = hw_data (me);
-  sd         = hw_system (me);
-  cpu        = STATE_CPU (sd, 0);  
   switch (my_port)
     {
     case RESET_PORT:
-- 
2.43.0

[PATCH 11/17] sim: mcore: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/mcore/interp.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c
index 7561c440729d..8bfb745a11f2 100644
--- a/sim/mcore/interp.c
+++ b/sim/mcore/interp.c
@@ -332,8 +332,6 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
 
   /* TODO: Unindent this block.  */
     {
-      int32_t oldpc;
-
       insts ++;
 
       if (pc & 02)
@@ -408,8 +406,6 @@ step_once (SIM_DESC sd, SIM_CPU *cpu)
       if (tracing)
 	fprintf (stderr, "%.4x: inst = %.4x ", pc, inst);
 
-      oldpc = pc;
-
       pc += 2;
 
       switch (inst >> 8)
-- 
2.43.0

[PATCH 12/17] sim: mips: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/mips/interp.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sim/mips/interp.c b/sim/mips/interp.c
index f0c509021a41..18ccef8bb38a 100644
--- a/sim/mips/interp.c
+++ b/sim/mips/interp.c
@@ -1403,18 +1403,20 @@ sim_monitor (SIM_DESC sd,
             if (c == '%')
 	      {
 		char tmp[40];
+		/* The format logic isn't passed down.
 		enum {FMT_RJUST, FMT_LJUST, FMT_RJUST0, FMT_CENTER} fmt = FMT_RJUST;
+		*/
 		int width = 0, trunc = 0, haddot = 0, longlong = 0;
 		while (sim_read (sd, s++, &c, 1) && c != '\0')
 		  {
 		    if (strchr ("dobxXulscefg%", c))
 		      break;
 		    else if (c == '-')
-		      fmt = FMT_LJUST;
+		      /* fmt = FMT_LJUST */;
 		    else if (c == '0')
-		      fmt = FMT_RJUST0;
+		      /* fmt = FMT_RJUST0 */;
 		    else if (c == '~')
-		      fmt = FMT_CENTER;
+		      /* fmt = FMT_CENTER */;
 		    else if (c == '*')
 		      {
 			if (haddot)
-- 
2.43.0

[PATCH 13/17] sim: mn10300: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/mn10300/am33.igen | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/sim/mn10300/am33.igen b/sim/mn10300/am33.igen
index da8f88fa599f..60c77d47fe33 100644
--- a/sim/mn10300/am33.igen
+++ b/sim/mn10300/am33.igen
@@ -2688,7 +2688,7 @@
 *am33
 *am33_2
 {
-  int z, c, n;
+  int z, n;
   int32_t temp;
   int srcreg1, srcreg2, dstreg;
 
@@ -2698,7 +2698,6 @@
   dstreg = translate_rreg (SD_, RD0);
 
   temp = State.regs[srcreg2];
-  c = temp & 1;
   temp >>= State.regs[srcreg1];
   State.regs[dstreg] = temp;
 
@@ -2715,7 +2714,7 @@
 *am33
 *am33_2
 {
-  int z, c, n;
+  int z, n;
   int srcreg1, srcreg2, dstreg;
 
   PC = cia;
@@ -2723,7 +2722,6 @@
   srcreg2 = translate_rreg (SD_, RN0);
   dstreg = translate_rreg (SD_, RD0);
 
-  c = State.regs[srcreg2] & 1;
   State.regs[dstreg] = State.regs[srcreg2] >> State.regs[srcreg1];
 
   z = (State.regs[dstreg] == 0);
@@ -3242,12 +3240,11 @@
 *am33
 *am33_2
 {
-  int srcreg1, srcreg2, dstreg1, dstreg2;
+  int srcreg1, dstreg1, dstreg2;
   int64_t temp;
 
   PC = cia;
   srcreg1 = translate_rreg (SD_, RM2);
-  srcreg2 = translate_rreg (SD_, RN0);
   dstreg1 = translate_rreg (SD_, RD0);
   dstreg2 = translate_rreg (SD_, RD2);
 
@@ -3265,12 +3262,11 @@
 *am33
 *am33_2
 {
-  int srcreg1, srcreg2, dstreg1, dstreg2;
+  int srcreg1, dstreg1, dstreg2;
   int64_t temp;
 
   PC = cia;
   srcreg1 = translate_rreg (SD_, RM2);
-  srcreg2 = translate_rreg (SD_, RN0);
   dstreg1 = translate_rreg (SD_, RD0);
   dstreg2 = translate_rreg (SD_, RD2);
 
@@ -8638,11 +8634,10 @@
 *am33
 *am33_2
 {
-  int srcreg1, srcreg2, dstreg1, dstreg2;
+  int srcreg1, dstreg1, dstreg2;
 
   PC = cia;
   srcreg1 = translate_rreg (SD_, RM1);
-  srcreg2 = translate_rreg (SD_, RM2);
   dstreg1 = translate_rreg (SD_, RN1);
   dstreg2 = translate_rreg (SD_, RN2);
 
-- 
2.43.0

[PATCH 14/17] sim: msp430: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/msp430/msp430-sim.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c
index a4ff6a4ad3f2..b34d23e8e84d 100644
--- a/sim/msp430/msp430-sim.c
+++ b/sim/msp430/msp430-sim.c
@@ -202,11 +202,10 @@ sim_create_inferior (SIM_DESC sd,
 		     char * const *env)
 {
   unsigned char resetv[2];
-  int c;
   int new_pc;
 
   /* Set the PC to the default reset vector if available.  */
-  c = sim_core_read_buffer (sd, STATE_CPU (sd, 0), read_map, resetv, 0xfffe, 2);
+  sim_core_read_buffer (sd, STATE_CPU (sd, 0), read_map, resetv, 0xfffe, 2);
   new_pc = resetv[0] + 256 * resetv[1];
 
   /* If the reset vector isn't initialized, then use the ELF entry.  */
-- 
2.43.0

[PATCH 15/17] sim: sh: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/sh/interp.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index 2e2e13641e43..1982b7f17a7c 100644
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -1667,10 +1667,8 @@ dump_profile (void)
 {
   unsigned int minpc;
   unsigned int maxpc;
-  unsigned short *p;
   int i;
 
-  p = saved_state.asregs.profile_hist;
   minpc = 0;
   maxpc = (1 << sim_profile_size);
 
-- 
2.43.0

[PATCH 16/17] sim: v850: fix -Wunused-but-set-variable warnings

[Mike Frysinger]

---
 sim/v850/simops.c  | 13 ++++++-------
 sim/v850/v850.igen |  6 ++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/sim/v850/simops.c b/sim/v850/simops.c
index 326745efcb26..05770a946ea1 100644
--- a/sim/v850/simops.c
+++ b/sim/v850/simops.c
@@ -2106,7 +2106,6 @@ divn
   unsigned int    DBZ = als == 0 ? 1 : 0;
   unsigned int    Q   = ~(SS ^ SD) & 1;
   unsigned int    C;
-  unsigned int    S;
   unsigned int    i;
   unsigned long   alt = Q ? ~als : als;
 
@@ -2118,7 +2117,7 @@ divn
 	 | (((alt >> 31) ^ (ald >> 31)) & (~alo >> 31)));
   Q   = C ^ SS;
   R1  = (alo == 0) ? 0 : (R1 & (Q ^ (SS ^ SD)));
-  S   = alo >> 31;
+  /* S   = alo >> 31; */
   sfi = (sfi << (32-N+1)) | Q;
   ald = (alo << 1) | (sfi >> 31);
   if ((alo >> 31) ^ (ald >> 31))
@@ -2136,7 +2135,7 @@ divn
 	     | (((alt >> 31) ^ (ald >> 31)) & (~alo >> 31)));
       Q   = C ^ SS;
       R1  = (alo == 0) ? 0 : (R1 & (Q ^ (SS ^ SD)));
-      S   = alo >> 31;
+      /* S   = alo >> 31; */
       sfi = (sfi << 1) | Q;
       ald = (alo << 1) | (sfi >> 31);
       if ((alo >> 31) ^ (ald >> 31))
@@ -3034,7 +3033,7 @@ v850_float_compare (SIM_DESC sd, int cmp, sim_fpu wop1, sim_fpu wop2, int double
     }
   else
     {
-      int gt = 0,lt = 0,eq = 0, status;
+      int lt = 0, eq = 0, status;
 
       status = sim_fpu_cmp (&wop1, &wop2);
 
@@ -3049,19 +3048,19 @@ v850_float_compare (SIM_DESC sd, int cmp, sim_fpu wop1, sim_fpu wop2, int double
 	  lt = 1;
 	  break;
 	case SIM_FPU_IS_PINF:
-	  gt = 1;
+	  /* gt = 1; */
 	  break;
 	case SIM_FPU_IS_NNUMBER:
 	  lt = 1;
 	  break;
 	case SIM_FPU_IS_PNUMBER:
-	  gt = 1;
+	  /* gt = 1; */
 	  break;
 	case SIM_FPU_IS_NDENORM:
 	  lt = 1;
 	  break;
 	case SIM_FPU_IS_PDENORM:
-	  gt = 1;
+	  /* gt = 1; */
 	  break;
 	case SIM_FPU_IS_NZERO:
 	case SIM_FPU_IS_PZERO:
diff --git a/sim/v850/v850.igen b/sim/v850/v850.igen
index bd8de8e2790d..6b9a8bb4a5c5 100644
--- a/sim/v850/v850.igen
+++ b/sim/v850/v850.igen
@@ -3537,12 +3537,11 @@ rrrrr,11111100001 + wwww,010001000100:F_I:::trncf_sl
 {
   int64_t ans;
   sim_fpu wop;
-  sim_fpu_status status;
 
   sim_fpu_32to (&wop, GR[reg2]);
   TRACE_FP_INPUT_FPU1 (&wop);
 
-  status = sim_fpu_to64i (&ans, &wop, sim_fpu_round_zero);
+  sim_fpu_to64i (&ans, &wop, sim_fpu_round_zero);
 
   GR[reg3e] = ans;
   GR[reg3e+1] = ans >> 32L;
@@ -3557,12 +3556,11 @@ rrrrr,11111110001 + wwww,010001000100:F_I:::trncf_sul
 {
   uint64_t ans;
   sim_fpu wop;
-  sim_fpu_status status;
 
   sim_fpu_32to (&wop, GR[reg2]);
   TRACE_FP_INPUT_FPU1 (&wop);
 
-  status = sim_fpu_to64u (&ans, &wop, sim_fpu_round_zero);
+  sim_fpu_to64u (&ans, &wop, sim_fpu_round_zero);
 
   GR[reg3e] = ans;
   GR[reg3e+1] = ans >> 32L;
-- 
2.43.0

[PATCH 17/17] sim: warnings: enable -Wunused-but-set-variable

[Mike Frysinger]

---
 sim/configure                    | 2 +-
 sim/m4/sim_ac_option_warnings.m4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sim/m4/sim_ac_option_warnings.m4 b/sim/m4/sim_ac_option_warnings.m4
index e453d8866ff0..2cf4a22b6494 100644
--- a/sim/m4/sim_ac_option_warnings.m4
+++ b/sim/m4/sim_ac_option_warnings.m4
@@ -39,7 +39,7 @@ dnl NB: Kept somewhat in sync with gdbsupport/warnings.m4.
 build_warnings="-Wall -Wpointer-arith
 -Wno-unused -Wunused-value -Wunused-function
 -Wno-switch -Wno-char-subscripts
--Wempty-body -Wunused-but-set-parameter
+-Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable
 -Wno-sign-compare -Wno-error=maybe-uninitialized
 dnl C++ -Wno-mismatched-tags
 -Wno-error=deprecated-register
-- 
2.43.0