Skip to content

Commit 562ca4c

Browse files
committed
Correct x86 rt_sigframe definition
1 parent 2bac544 commit 562ca4c

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/kernel_abi.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,7 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> {
20562056
ptr<struct ucontext> uc_link;
20572057
stack_t uc_stack;
20582058
struct sigcontext uc_mcontext;
2059-
kernel_sigset_t uc_sigmask;
2059+
kernel_sigset_t uc_sigmask;
20602060
};
20612061

20622062
struct rt_sigframe {
@@ -2290,17 +2290,20 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
22902290
RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext);
22912291

22922292
struct ucontext {
2293-
unsigned int uc_flags;
2294-
unsigned int uc_link;
2295-
stack_t uc_stack;
2296-
struct sigcontext uc_mcontext;
2297-
kernel_sigset_t uc_sigmask;
2293+
unsigned_long uc_flags;
2294+
ptr<struct ucontext> uc_link;
2295+
stack_t uc_stack;
2296+
struct sigcontext uc_mcontext;
2297+
kernel_sigset_t uc_sigmask;
22982298
};
22992299

23002300
struct rt_sigframe {
23012301
ptr<char> pretcode;
2302-
struct ucontext uc;
2302+
int sig;
2303+
uint32_t pinfo;
2304+
uint32_t puc;
23032305
siginfo_t info;
2306+
struct ucontext uc;
23042307
// Extended ISA state follows
23052308
};
23062309

0 commit comments

Comments
 (0)