From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
To: qemu-devel@nongnu.org
Cc: sw@weilnetz.de, kkostiuk@redhat.com, clg@kaod.org,
richard.henderson@linaro.org, alex.bennee@linaro.org,
Pierrick Bouvier <pierrick.bouvier@linaro.org>
Subject: [PATCH 2/4] sysemu/os-win32: fix setjmp/longjmp on windows-arm64
Date: Mon, 13 Feb 2023 17:13:50 +0100 [thread overview]
Message-ID: <20230213161352.17199-3-pierrick.bouvier@linaro.org> (raw)
In-Reply-To: <20230213161352.17199-1-pierrick.bouvier@linaro.org>
Windows implementation of setjmp/longjmp is done in
C:/WINDOWS/system32/ucrtbase.dll. Alas, on arm64, it seems to *always*
perform stack unwinding, which crashes from generated code.
By using alternative implementation built in mingw, we avoid doing stack
unwinding and this fixes crash when calling longjmp.
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
include/sysemu/os-win32.h | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
index 5b38c7bd04..84f62d0a17 100644
--- a/include/sysemu/os-win32.h
+++ b/include/sysemu/os-win32.h
@@ -51,14 +51,28 @@ typedef struct sockaddr_un {
extern "C" {
#endif
-#if defined(_WIN64)
+#if defined(__aarch64__)
+/* On windows-arm64, setjmp is available in only one variant, and longjmp always
+ * does stack unwinding. This crash with generated code.
+ * Thus, we use another implementation of setjmp (not windows one), coming from
+ * mingw, which never performs stack unwinding. */
+#undef setjmp
+#undef longjmp
+/* These functions are not declared in setjmp.h because __aarch64__ defines
+ * setjmp to _setjmpex instead. However, they are still defined in libmingwex.a,
+ * which gets linked automatically. */
+extern int __mingw_setjmp(jmp_buf);
+extern void __attribute__((noreturn)) __mingw_longjmp(jmp_buf, int);
+#define setjmp(env) __mingw_setjmp(env)
+#define longjmp(env, val) __mingw_longjmp(env, val)
+#elif defined(_WIN64)
/* On w64, setjmp is implemented by _setjmp which needs a second parameter.
* If this parameter is NULL, longjump does no stack unwinding.
* That is what we need for QEMU. Passing the value of register rsp (default)
* lets longjmp try a stack unwinding which will crash with generated code. */
# undef setjmp
# define setjmp(env) _setjmp(env, NULL)
-#endif
+#endif /* __aarch64__ */
/* QEMU uses sigsetjmp()/siglongjmp() as the portable way to specify
* "longjmp and don't touch the signal masks". Since we know that the
* savemask parameter will always be zero we can safely define these
--
2.30.2
next prev parent reply other threads:[~2023-02-13 20:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 16:13 [PATCH 0/4] Adds support for running QEMU natively on windows-arm64 Pierrick Bouvier
2023-02-13 16:13 ` [PATCH 1/4] util/cacheflush: fix illegal instruction " Pierrick Bouvier
2023-02-14 16:44 ` Peter Maydell
2023-02-14 17:02 ` Richard Henderson
2023-02-15 12:49 ` Pierrick Bouvier
2023-02-15 18:22 ` Richard Henderson
2023-02-16 12:53 ` Pierrick Bouvier
2023-02-13 16:13 ` Pierrick Bouvier [this message]
2023-02-14 7:11 ` [PATCH 2/4] sysemu/os-win32: fix setjmp/longjmp " Philippe Mathieu-Daudé
2023-02-14 8:16 ` Pierrick Bouvier
2023-02-13 16:13 ` [PATCH 3/4] qga/vss-win32: fix warning for clang++-15 Pierrick Bouvier
2023-02-13 16:20 ` Konstantin Kostiuk
2023-02-13 18:08 ` Cédric Le Goater
2023-02-13 16:13 ` [PATCH 4/4] target/ppc: fix warning with clang-15 Pierrick Bouvier
2023-02-13 18:08 ` Cédric Le Goater
2023-02-14 7:14 ` Philippe Mathieu-Daudé
2023-02-14 7:57 ` Pierrick Bouvier
2023-02-14 18:10 ` Richard Henderson
2023-02-15 10:58 ` Pierrick Bouvier
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=20230213161352.17199-3-pierrick.bouvier@linaro.org \
--to=pierrick.bouvier@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=clg@kaod.org \
--cc=kkostiuk@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sw@weilnetz.de \
/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 NNTP newsgroup(s).