mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-10 18:13:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sim: Suppress non-literal printf warning

Browse Source 
Clang generates a warning if the format string of a printf-like function is
not a literal ("-Wformat-nonliteral"). On the default configuration, it
causes a build failure (unless "--disable-werror" is specified).

To avoid this warning, this commit now uses vsnprintf to format error
message and pass the message to sim_engine_abort function with another
printf-style formatting.

This patch is mostly authored by Andrew Burgess and slightly modified by
Tsukasa OI.

Co-authored-by: Andrew Burgess <aburgess@redhat.com>
Signed-off-by: Tsukasa OI <research_trasio@irq.a4lg.com>
This commit is contained in:
Tsukasa OI 2022-10-06 06:43:51 +00:00 committed by Andrew Burgess
parent 25ae9e2659
commit 96894c19ad
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sim/common/hw-device.h
View File

@ -437,10 +437,8 @@ void hw_abort
const char *fmt,
...) ATTRIBUTE_PRINTF (2, 3) ATTRIBUTE_NORETURN;
void hw_vabort
(struct hw *me,
const char *fmt,
va_list ap) ATTRIBUTE_NORETURN;
extern void hw_vabort (struct hw *me, const char *fmt, va_list ap)
ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (2, 0);
void hw_halt
(struct hw *me,

24
sim/common/sim-hw.c
View File

@ -408,8 +408,11 @@ hw_vabort (struct hw *me,
const char *fmt,
va_list ap)
{
int len;
const char *name;
char *msg;
va_list cpy;
/* find an identity */
if (me != NULL && hw_path (me) != NULL && hw_path (me) [0] != '\0')
name = hw_path (me);
@ -419,16 +422,19 @@ hw_vabort (struct hw *me,
name = hw_family (me);
else
name = "device";
/* construct an updated format string */
msg = alloca (strlen (name) + strlen (": ") + strlen (fmt) + 1);
strcpy (msg, name);
strcat (msg, ": ");
strcat (msg, fmt);
/* Expand FMT and AP into MSG buffer. */
va_copy (cpy, ap);
len = vsnprintf (NULL, 0, fmt, cpy) + 1;
va_end (cpy);
msg = alloca (len);
vsnprintf (msg, len, fmt, ap);
/* report the problem */
sim_engine_vabort (hw_system (me),
STATE_HW (hw_system (me))->cpu,
STATE_HW (hw_system (me))->cia,
msg, ap);
sim_engine_abort (hw_system (me),
STATE_HW (hw_system (me))->cpu,
STATE_HW (hw_system (me))->cia,
"%s: %s", name, msg);
}
void