From: Andrew Burgess <aburgess@redhat.com>
To: Tsukasa OI <research_trasio@irq.a4lg.com>,
Tsukasa OI <research_trasio@irq.a4lg.com>,
Mike Frysinger <vapier@gentoo.org>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH v3 3/5] sim: Suppress non-literal printf warning
Date: Tue, 11 Oct 2022 15:22:35 +0100 [thread overview]
Message-ID: <87edvecudw.fsf@redhat.com> (raw)
In-Reply-To: <1e125faf59c101508372275aa7b9d00b8d32a7e9.1665038297.git.research_trasio@irq.a4lg.com>
Tsukasa OI <research_trasio@irq.a4lg.com> writes:
> 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>
> ---
> sim/common/sim-hw.c | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/sim/common/sim-hw.c b/sim/common/sim-hw.c
> index cece5638bc9..c70770893c9 100644
> --- a/sim/common/sim-hw.c
> +++ b/sim/common/sim-hw.c
> @@ -403,13 +403,16 @@ sim_hw_io_write_buffer (struct sim_state *sd,
> \f
> /* Abort the simulation specifying HW as the reason */
>
> -void
> +void ATTRIBUTE_PRINTF (2, 0)
> hw_vabort (struct hw *me,
> const char *fmt,
> va_list ap)
I've pushed this patch, but I moved the ATTRIBUTE_PRINTF to the function
declaration.
Thanks,
Andrew
---
commit 96894c19ad2b91db76b9b606d48c56ad354b4801
Author: Tsukasa OI <research_trasio@irq.a4lg.com>
Date: Thu Oct 6 06:43:51 2022 +0000
sim: Suppress non-literal printf warning
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>
diff --git a/sim/common/hw-device.h b/sim/common/hw-device.h
index 7a36f2f518c..451f88723de 100644
--- a/sim/common/hw-device.h
+++ b/sim/common/hw-device.h
@@ -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,
diff --git a/sim/common/sim-hw.c b/sim/common/sim-hw.c
index cece5638bc9..7bfe91e4ae2 100644
--- a/sim/common/sim-hw.c
+++ b/sim/common/sim-hw.c
@@ -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
next prev parent reply other threads:[~2022-10-11 14:22 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 12:57 [PATCH 0/4] sim/common: Suppress warnings if built with Clang Tsukasa OI
2022-09-13 12:57 ` [PATCH 1/4] sim: Add ATTRIBUTE_PRINTF Tsukasa OI
2022-09-13 12:57 ` [PATCH 2/4] sim: Remove self-assignments Tsukasa OI
2022-09-13 12:57 ` [PATCH 3/4] sim: Make WITH_{TRACE,PROFILE}-based macros bool Tsukasa OI
2022-10-05 11:38 ` Andrew Burgess
2022-10-06 5:33 ` Tsukasa OI
2022-09-13 12:57 ` [PATCH 4/4] sim: Suppress non-literal printf warning Tsukasa OI
2022-10-05 11:45 ` Andrew Burgess
2022-10-06 5:39 ` Tsukasa OI
2022-10-23 12:22 ` Mike Frysinger
2022-10-24 10:50 ` Tsukasa OI
2022-09-25 8:42 ` [PATCH v2 0/5] sim: Suppress warnings if built with Clang Tsukasa OI
2022-09-25 8:42 ` [PATCH v2 1/5] sim: Remove self-assignments Tsukasa OI
2022-09-25 8:42 ` [PATCH v2 2/5] sim: Make WITH_{TRACE,PROFILE}-based macros bool Tsukasa OI
2022-09-25 8:42 ` [PATCH v2 3/5] sim: Suppress non-literal printf warning Tsukasa OI
2022-09-25 8:42 ` [PATCH v2 4/5] sim: Check known getopt definition existence Tsukasa OI
2022-09-25 8:42 ` [PATCH v2 5/5] sim: Initialize pbb_br_* by default Tsukasa OI
2022-10-06 6:43 ` [PATCH v3 0/5] sim: Suppress warnings if built with Clang Tsukasa OI
2022-10-06 6:43 ` [PATCH v3 1/5] sim: Remove self-assignments Tsukasa OI
2022-10-11 14:21 ` Andrew Burgess
2022-10-11 14:29 ` Tsukasa OI
2022-10-06 6:43 ` [PATCH v3 2/5] sim: Make WITH_{TRACE,PROFILE}-based macros bool Tsukasa OI
2022-10-06 6:43 ` [PATCH v3 3/5] sim: Suppress non-literal printf warning Tsukasa OI
2022-10-11 14:22 ` Andrew Burgess [this message]
2022-10-06 6:43 ` [PATCH v3 4/5] sim: Check known getopt definition existence Tsukasa OI
2022-10-12 16:28 ` Tom de Vries
2022-10-12 17:03 ` Tsukasa OI
2022-10-12 17:08 ` Tom de Vries
2022-10-12 17:20 ` Tom de Vries
2022-10-13 9:50 ` Tsukasa OI
2022-10-23 12:16 ` Mike Frysinger
2022-10-27 2:02 ` Tsukasa OI
2023-01-03 3:12 ` Mike Frysinger
2023-01-03 8:47 ` Tsukasa OI
2022-10-06 6:43 ` [PATCH v3 5/5] sim: Initialize pbb_br_* by default Tsukasa OI
2022-10-11 14:20 ` [PATCH v3 0/5] sim: Suppress warnings if built with Clang Andrew Burgess
2022-10-11 16:40 ` Tom de Vries
2022-10-11 18:02 ` Tsukasa OI
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87edvecudw.fsf@redhat.com \
--to=aburgess@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=research_trasio@irq.a4lg.com \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).