From 94c9216c03ab1af16b1bdd11a10a66c13e6458d8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 1 Nov 2021 00:58:05 -0400 Subject: [PATCH] sim: iq2000: reduce -Wno-error scope Clean up the warnings in sim-if, then reduce the -Werror disable to the files that still aren't clean that now that we require GNU make and can set variables on a per-object basis. --- sim/iq2000/Makefile.in | 4 ++-- sim/iq2000/sim-if.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in index 4f85dc76235..b47d15ac477 100644 --- a/sim/iq2000/Makefile.in +++ b/sim/iq2000/Makefile.in @@ -37,8 +37,8 @@ ALL_CPU_CFLAGS = -DHAVE_CPU_IQ2000BF -DHAVE_CPU_IQ10BF SIM_EXTRA_CLEAN = iq2000-clean -# Code doesn't build cleanly yet. -SIM_WERROR_CFLAGS = +# Some modules don't build cleanly yet. +cpu.o iq2000.o mloop.o sem.o: SIM_WERROR_CFLAGS = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/iq2000/sim-if.c b/sim/iq2000/sim-if.c index 9728882dac5..8cfc1e0ca3e 100644 --- a/sim/iq2000/sim-if.c +++ b/sim/iq2000/sim-if.c @@ -32,7 +32,7 @@ static void free_state (SIM_DESC); /* Cover function for sim_cgen_disassemble_insn. */ -void +static void iq2000bf_disassemble_insn (SIM_CPU *cpu, const CGEN_INSN *insn, const ARGBUF *abuf, IADDR pc, char *buf) { @@ -89,8 +89,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, } /* Allocate core managed memory. */ - sim_do_commandf (sd, "memory region 0x%lx,0x%lx", IQ2000_INSN_VALUE, IQ2000_INSN_MEM_SIZE); - sim_do_commandf (sd, "memory region 0x%lx,0x%lx", IQ2000_DATA_VALUE, IQ2000_DATA_MEM_SIZE); + sim_do_commandf (sd, "memory region 0x%x,0x%x", IQ2000_INSN_VALUE, IQ2000_INSN_MEM_SIZE); + sim_do_commandf (sd, "memory region 0x%x,0x%x", IQ2000_DATA_VALUE, IQ2000_DATA_MEM_SIZE); /* check for/establish the reference program image */ if (sim_analyze_program (sd, -- 2.30.2