From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Pierrick Bouvier <pierrick.bouvier@linaro.org>, qemu-devel@nongnu.org
Cc: sw@weilnetz.de, kkostiuk@redhat.com, clg@kaod.org,
richard.henderson@linaro.org, alex.bennee@linaro.org,
peter.maydell@linaro.org
Subject: Re: [PATCH v4 2/4] sysemu/os-win32: fix setjmp/longjmp on windows-arm64
Date: Wed, 22 Feb 2023 17:17:06 +0100 [thread overview]
Message-ID: <fa7ff862-32fd-edd2-1629-ee68e920c68d@linaro.org> (raw)
In-Reply-To: <8fc239ec-b01c-019a-9c8c-b276bbf3fd02@linaro.org>
On 22/2/23 17:08, Pierrick Bouvier wrote:
> On 2/21/23 23:27, Philippe Mathieu-Daudé wrote:
>> On 21/2/23 16:30, Pierrick Bouvier wrote:
>>> 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>
>>> Acked-by: Richard Henderson <richard.henderson@linaro.org>
>>> ---
>>> include/sysemu/os-win32.h | 28 ++++++++++++++++++++++++----
>>> meson.build | 21 +++++++++++++++++++++
>>> 2 files changed, 45 insertions(+), 4 deletions(-)
>>
>>
>>> -#if defined(_WIN64)
>>> -/* On w64, setjmp is implemented by _setjmp which needs a second
>>> parameter.
>>> +#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 windows-x64, 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. */
>>> + * lets longjmp try a stack unwinding which will crash with
>>> generated code.
>>> + */
>>> # undef setjmp
>>> # define setjmp(env) _setjmp(env, NULL)
>>> -#endif
>>> +#endif /* __aarch64__ */
>>
>> This comment is confusing, the previous if ladder is about i86. Maybe
>> better not add any comment?
>
> If I am not mistaken, before we had:
>
> #if x64
> define setjmp as _setjmp(env, 0)
> #endif
> // nothing done for x86
>
> and now we have:
>
> #if aarch64
> define setjmp as __mingw_setjmp
> define longjmp as __mingw_longjmp
> #elif x64
> define setjmp as _setjmp(env, 0)
> #endif
> // nothing done for x86
>
> Maybe the patch format is confusing, or I missed what you pointed.
Oh OK, we are good then, sorry :)
next prev parent reply other threads:[~2023-02-22 16:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 15:30 [PATCH v4 0/4] Adds support for running QEMU natively on windows-arm64 Pierrick Bouvier
2023-02-21 15:30 ` [PATCH v4 1/4] util/cacheflush: fix cache " Pierrick Bouvier
2023-02-21 23:44 ` Richard Henderson
2023-02-21 15:30 ` [PATCH v4 2/4] sysemu/os-win32: fix setjmp/longjmp " Pierrick Bouvier
2023-02-21 22:27 ` Philippe Mathieu-Daudé
2023-02-22 16:08 ` Pierrick Bouvier
2023-02-22 16:17 ` Philippe Mathieu-Daudé [this message]
2023-02-21 23:45 ` Richard Henderson
2023-02-21 15:30 ` [PATCH v4 3/4] qga/vss-win32: fix warning for clang++-15 Pierrick Bouvier
2023-03-21 21:48 ` Pierrick Bouvier
2023-03-22 17:18 ` Konstantin Kostiuk
2023-03-22 17:23 ` Daniel P. Berrangé
2023-02-21 15:30 ` [PATCH v4 4/4] target/ppc: fix warning with clang-15 Pierrick Bouvier
2023-02-21 22:30 ` Philippe Mathieu-Daudé
2023-02-21 23:43 ` Richard Henderson
2023-02-22 16:02 ` 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=fa7ff862-32fd-edd2-1629-ee68e920c68d@linaro.org \
--to=philmd@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=clg@kaod.org \
--cc=kkostiuk@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--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).