Skip to content

Commit

Permalink
linux-user: i386/signal: move fpstate at the end of the 32-bit frames
Browse files Browse the repository at this point in the history
Recent versions of Linux moved the 32-bit fpstate towards the end of the
frame, so that the variable-sized xsave data does not overwrite the
(ABI-defined) extramask[] field.  Follow suit in QEMU.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Oct 11, 2022
1 parent 3765647 commit 5154d35
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions linux-user/i386/signal.c
Expand Up @@ -163,9 +163,16 @@ struct sigframe {
abi_ulong pretcode;
int sig;
struct target_sigcontext sc;
struct target_fpstate fpstate;
/*
* The actual fpstate is placed after retcode[] below, to make
* room for the variable-sized xsave data. The older unused fpstate
* has to be kept to avoid changing the offset of extramask[], which
* is part of the ABI.
*/
struct target_fpstate fpstate_unused;
abi_ulong extramask[TARGET_NSIG_WORDS-1];
char retcode[8];
struct target_fpstate fpstate;
};

struct rt_sigframe {
Expand All @@ -175,8 +182,8 @@ struct rt_sigframe {
abi_ulong puc;
struct target_siginfo info;
struct target_ucontext uc;
struct target_fpstate fpstate;
char retcode[8];
struct target_fpstate fpstate;
};

#else
Expand Down

0 comments on commit 5154d35

Please sign in to comment.