[PATCH/committed] sim: rl78: clean up various warnings

Mike Frysinger via Gdb-patches
2021-05-05T03:05:05Z

A random grab bag of minor fixes to enable -Werror for this port.

Fix local prototypes for a bunch of functions (e.g. adding static).
Add missing includes for missing prototypes.
Move local variable decls from the middle of functions to the top
of the scope.
Fix a logic error when processing commands where p was reassigned
to cmd and then has its leading whitespace scanned a 2nd time.
Handle short reads with fread().
---
sim/rl78/ChangeLog | 14 ++++++++++++++
sim/rl78/configure | 5 ++++-
sim/rl78/configure.ac | 1 -
sim/rl78/cpu.c | 2 +-
sim/rl78/gdb-if.c | 9 ++-------
sim/rl78/mem.c | 6 +++---
sim/rl78/mem.h | 2 ++
sim/rl78/rl78.c | 3 ++-
sim/rl78/trace.c | 9 ++++++---
9 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index f0e1631d5e48..baaf6d8eae9e 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,17 @@
+2021-05-04 Mike Frysinger <vapier@gentoo.org>
+
+ * cpu.c (trace_register_init): Add missing (void).
+ * gdb-if.c (rl78_signal_to_target, handle_step): Mark static.
+ (sim_do_command): Delete redundant for loop.
+ * mem.c (mirror_rom_base, mirror_ram_base, mirror_length): Mark static.
+ * mem.h (mem_set_mirror): New prototype.
+ * rl78.c (op_flags): Move psw decl to top of scope.
+ * trace.c: Include trace.h.
+ (load_file_and_line): Move file decl to top of scope. Declare ret.
+ assign fread to ret and use to index f->data.
+ * configure.ac: Delete SIM_AC_OPTION_WARNINGS call.
+ * configure: Regenerate.
+
2021-05-04 Mike Frysinger <vapier@gentoo.org>

* configure: Regenerate.
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 59cb1ec2861a..6e2076857dde 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -11844,6 +11844,7 @@ _ACEOF

+
# Check whether --enable-werror was given.
if test "${enable_werror+set}" = set; then :
enableval=$enable_werror; case "${enableval}" in
@@ -11860,6 +11861,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
fi

WERROR_CFLAGS=""
+ if test "${ERROR_ON_WARNING}" = yes ; then
+ WERROR_CFLAGS="-Werror"
+ fi

build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
-Wpointer-sign \
@@ -11941,7 +11945,6 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; }
fi

-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware"
diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac
index 0e5f69c7065c..4f2c0ace70bb 100644
--- a/sim/rl78/configure.ac
+++ b/sim/rl78/configure.ac
@@ -22,6 +22,5 @@ AC_INIT(Makefile.in)
AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

SIM_AC_COMMON
-SIM_AC_OPTION_WARNINGS(no)

SIM_AC_OUTPUT
diff --git a/sim/rl78/cpu.c b/sim/rl78/cpu.c
index a38d6f688aee..fde8afee96b0 100644
--- a/sim/rl78/cpu.c
+++ b/sim/rl78/cpu.c
@@ -51,7 +51,7 @@ typedef struct {
unsigned char h;
} RegBank;

-static void trace_register_init ();
+static void trace_register_init (void);

/* This maps PSW to a pointer into memory[] */
static RegBank *regbase_table[256];
diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c
index 56717917e552..7119214113be 100644
--- a/sim/rl78/gdb-if.c
+++ b/sim/rl78/gdb-if.c
@@ -403,7 +403,7 @@ int siggnal;
/* Given a signal number used by the rl78 bsp (that is, newlib),
return the corresponding signal numbers. */

-int
+static int
rl78_signal_to_target (int sig)
{
switch (sig)
@@ -442,7 +442,7 @@ rl78_signal_to_target (int sig)
/* Take a step return code RC and set up the variables consulted by
sim_stop_reason appropriately. */

-void
+static void
handle_step (int rc)
{
if (RL78_STEPPED (rc) || RL78_HIT_BREAK (rc))
@@ -549,11 +549,6 @@ sim_do_command (SIM_DESC sd, const char *cmd)
while (isspace (*p))
p++;

- /* Find the extent of the command word. */
- for (p = cmd; *p; p++)
- if (isspace (*p))
- break;
-
/* Null-terminate the command word, and record the start of any
further arguments. */
if (*p)
diff --git a/sim/rl78/mem.c b/sim/rl78/mem.c
index 8527e02cba1e..77e4987b6ff1 100644
--- a/sim/rl78/mem.c
+++ b/sim/rl78/mem.c
@@ -63,9 +63,9 @@ mem_rom_size (int rom_bytes)
rom_limit = rom_bytes;
}

-int mirror_rom_base = 0x01000;
-int mirror_ram_base = 0xf1000;
-int mirror_length = 0x7000;
+static int mirror_rom_base = 0x01000;
+static int mirror_ram_base = 0xf1000;
+static int mirror_length = 0x7000;

void
mem_set_mirror (int rom_base, int ram_base, int length)
diff --git a/sim/rl78/mem.h b/sim/rl78/mem.h
index f04b36aa8d36..77d2f18a786c 100644
--- a/sim/rl78/mem.h
+++ b/sim/rl78/mem.h
@@ -29,6 +29,8 @@ extern unsigned char memory[];

void init_mem (void);

+void mem_set_mirror (int rom_base, int ram_base, int length);
+
/* Pass the amount of bytes, like 2560 for 2.5k */
void mem_ram_size (int ram_bytes);
void mem_rom_size (int rom_bytes);
diff --git a/sim/rl78/rl78.c b/sim/rl78/rl78.c
index a969845c5f97..006691c4c0af 100644
--- a/sim/rl78/rl78.c
+++ b/sim/rl78/rl78.c
@@ -249,6 +249,7 @@ static void
op_flags (int before, int after, int mask, RL78_Size size)
{
int vmask, cmask, amask, avmask;
+ int psw;

if (size == RL78_Word)
{
@@ -265,7 +266,7 @@ op_flags (int before, int after, int mask, RL78_Size size)
avmask = 0x0f;
}

- int psw = get_reg (RL78_Reg_PSW);
+ psw = get_reg (RL78_Reg_PSW);
psw &= ~mask;

if (mask & RL78_PSW_CY)
diff --git a/sim/rl78/trace.c b/sim/rl78/trace.c
index b30ec2ae8415..6f897eb03393 100644
--- a/sim/rl78/trace.c
+++ b/sim/rl78/trace.c
@@ -36,6 +36,7 @@
#include "cpu.h"
#include "mem.h"
#include "load.h"
+#include "trace.h"

static disassembler_ftype rl78_disasm_fn = NULL;

@@ -138,6 +139,8 @@ load_file_and_line (const char *filename, int lineno)
int i;
struct stat s;
const char *found_filename, *slash;
+ FILE *file;
+ size_t ret;

found_filename = filename;
while (1)
@@ -155,9 +158,9 @@ load_file_and_line (const char *filename, int lineno)
files = f;
f->filename = xstrdup (filename);
f->data = (char *) xmalloc (s.st_size + 2);
- FILE *file = fopen (found_filename, "rb");
- fread (f->data, 1, s.st_size, file);
- f->data[s.st_size] = 0;
+ file = fopen (found_filename, "rb");
+ ret = fread (f->data, 1, s.st_size, file);
+ f->data[ret] = 0;
fclose (file);

f->nlines = 1;
--
2.31.1