sim/rx: move some variable declarations to the start of the block

For sim code variables still need to be declared at the start of the
enclosing block.  This silences a few GCC warnings.

sim/rx/ChangeLog:

	* syscalls.c (rx_syscall): Move declaration of some variables to
	the start of the enclosing block.
	* trace.c (load_file_and_line): Likewise.

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 320d164e9dfabba376948fc6951d1653fcae8822..6b4b3d9aed8596f1df8cefe6f8756db6d2bc1dcd 100644 (file)
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,9 @@
+2021-02-08  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * syscalls.c (rx_syscall): Move declaration of some variables to
+       the start of the enclosing block.
+       * trace.c (load_file_and_line): Likewise.
+
 2021-02-08  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * reg.c (fpsw2str): Provide a format string to printf.

diff --git a/sim/rx/syscalls.c b/sim/rx/syscalls.c
index 2f89da173307a827650534bc025262d615b1cd49..22778b3df490753119569aed7269de0f5d918745 100644 (file)
--- a/sim/rx/syscalls.c
+++ b/sim/rx/syscalls.c
@@ -160,6 +160,7 @@ rx_syscall (int id)
 
     case SYS_open:
       {
+       int oflags, cflags;
        int path = arg ();
        /* The open function is defined as taking a variable number of arguments
           because the third parameter to it is optional:
@@ -167,8 +168,8 @@ rx_syscall (int id)
           Hence the oflags and cflags arguments will be on the stack and we need
           to skip the (empty) argument registers r3 and r4.  */
        argp = 4;
-       int oflags = arg ();
-       int cflags = arg ();
+       oflags = arg ();
+       cflags = arg ();
 
        read_target (buf, path, 256, 1);
        if (trace)

diff --git a/sim/rx/trace.c b/sim/rx/trace.c
index 6f9294ad75adb7beb371f8923bec6de456076125..9d9f2dfd98dbc9a90c1e2d1101fab11e4db22492 100644 (file)
--- a/sim/rx/trace.c
+++ b/sim/rx/trace.c
@@ -139,6 +139,7 @@ load_file_and_line (const char *filename, int lineno)
       break;
   if (!f)
     {
+      FILE *file;
       int i;
       struct stat s;
       const char *found_filename, *slash;
@@ -159,7 +160,7 @@ load_file_and_line (const char *filename, int lineno)
       files = f;
       f->filename = strdup (filename);
       f->data = (char *) malloc (s.st_size + 2);
-      FILE *file = fopen (found_filename, "rb");
+      file = fopen (found_filename, "rb");
       fread (f->data, 1, s.st_size, file);
       f->data[s.st_size] = 0;
       fclose (file);