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.
This commit is contained in:
parent
b9fe995797
commit
783a7b12d3
@ -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.
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user