MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sim/rx: provide a format string for printf

Browse Source 
Calling printf with the format being a non constant string results in
a GCC warning:

  warning: format not a string literal and no format arguments [-Wformat-nonliteral]

Provide a constant format string to printf in the few places this
warning is triggered.

sim/rx/ChangeLog:

	* reg.c (fpsw2str): Provide a format string to printf.
	(trace_register_changes): Likewise.
This commit is contained in:
Andrew Burgess 2021-02-01 11:12:56 +00:00
parent 4b42639636
commit b9fe995797
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sim/rx/ChangeLog
View File

@ -1,3 +1,8 @@
2021-02-08 Andrew Burgess <andrew.burgess@embecosm.com>
* reg.c (fpsw2str): Provide a format string to printf.
(trace_register_changes): Likewise.
2021-02-08 Andrew Burgess <andrew.burgess@embecosm.com> 2021-02-08 Andrew Burgess <andrew.burgess@embecosm.com>
* err.c (execution_error_exit_all): Delete. * err.c (execution_error_exit_all): Delete.

8
sim/rx/reg.c
View File

@ -509,7 +509,7 @@ fpsw2str(int rpsw)
#define TRC(f,n) \ #define TRC(f,n) \
if (oldregs.f != regs.f) \ if (oldregs.f != regs.f) \
{ \ { \
if (tag) { printf (tag); tag = 0; } \ if (tag) { printf ("%s", tag); tag = 0; } \
printf(" %s %08x:%08x", n, \ printf(" %s %08x:%08x", n, \
(unsigned int)oldregs.f, \ (unsigned int)oldregs.f, \
(unsigned int)regs.f); \ (unsigned int)regs.f); \
@ -531,7 +531,7 @@ trace_register_changes (void)
TRC (r_isp, "isp"); TRC (r_isp, "isp");
if (oldregs.r_psw != regs.r_psw) if (oldregs.r_psw != regs.r_psw)
{ {
if (tag) { printf (tag); tag = 0; } if (tag) { printf ("%s", tag); tag = 0; }
printf(" psw %s:", psw2str(oldregs.r_psw)); printf(" psw %s:", psw2str(oldregs.r_psw));
printf("%s", psw2str(regs.r_psw)); printf("%s", psw2str(regs.r_psw));
oldregs.r_psw = regs.r_psw; oldregs.r_psw = regs.r_psw;
@ -539,7 +539,7 @@ trace_register_changes (void)
if (oldregs.r_fpsw != regs.r_fpsw) if (oldregs.r_fpsw != regs.r_fpsw)
{ {
if (tag) { printf (tag); tag = 0; } if (tag) { printf ("%s", tag); tag = 0; }
printf(" fpsw %s:", fpsw2str(oldregs.r_fpsw)); printf(" fpsw %s:", fpsw2str(oldregs.r_fpsw));
printf("%s", fpsw2str(regs.r_fpsw)); printf("%s", fpsw2str(regs.r_fpsw));
oldregs.r_fpsw = regs.r_fpsw; oldregs.r_fpsw = regs.r_fpsw;
@ -547,7 +547,7 @@ trace_register_changes (void)
if (oldregs.r_acc != regs.r_acc) if (oldregs.r_acc != regs.r_acc)
{ {
if (tag) { printf (tag); tag = 0; } if (tag) { printf ("%s", tag); tag = 0; }
printf(" acc %016llx:", oldregs.r_acc); printf(" acc %016llx:", oldregs.r_acc);
printf("%016llx", regs.r_acc); printf("%016llx", regs.r_acc);
oldregs.r_acc = regs.r_acc; oldregs.r_acc = regs.r_acc;