Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

x86: Use uint_x types in rt_sigcontext

Browse source 
To be close to the kernel code.

Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov 2018-06-14 20:27:20 +03:00 • committed by Andrei Vagin
parent 23ff69a4b6
commit 4bc286d0e5
3 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

56
compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
View file

@ -10,34 +10,34 @@
#define SIGFRAME_MAX_OFFSET 8
struct rt_sigcontext {
unsigned long r8;
unsigned long r9;
unsigned long r10;
unsigned long r11;
unsigned long r12;
unsigned long r13;
unsigned long r14;
unsigned long r15;
unsigned long rdi;
unsigned long rsi;
unsigned long rbp;
unsigned long rbx;
unsigned long rdx;
unsigned long rax;
unsigned long rcx;
unsigned long rsp;
unsigned long rip;
unsigned long eflags;
unsigned short cs;
unsigned short gs;
unsigned short fs;
unsigned short ss;
unsigned long err;
unsigned long trapno;
unsigned long oldmask;
unsigned long cr2;
void *fpstate;
unsigned long reserved1[8];
uint64_t r8;
uint64_t r9;
uint64_t r10;
uint64_t r11;
uint64_t r12;
uint64_t r13;
uint64_t r14;
uint64_t r15;
uint64_t rdi;
uint64_t rsi;
uint64_t rbp;
uint64_t rbx;
uint64_t rdx;
uint64_t rax;
uint64_t rcx;
uint64_t rsp;
uint64_t rip;
uint64_t eflags;
uint16_t cs;
uint16_t gs;
uint16_t fs;
uint16_t ss;
uint64_t err;
uint64_t trapno;
uint64_t oldmask;
uint64_t cr2;
uint64_t fpstate;
uint64_t reserved1[8];
};
struct rt_sigcontext_32 {

2
compel/arch/x86/src/lib/infect.c
View file

@ -212,7 +212,7 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
return -1;
}
sigframe->native.uc.uc_mcontext.fpstate = (void *)addr;
sigframe->native.uc.uc_mcontext.fpstate = (uint64_t)addr;
} else if (!sigframe->is_native) {
sigframe->compat.uc.uc_mcontext.fpstate =
(uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;

2
criu/arch/x86/sigframe.c
View file

@ -26,7 +26,7 @@ int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
return -1;
}
sigframe->native.uc.uc_mcontext.fpstate = (void *)addr;
sigframe->native.uc.uc_mcontext.fpstate = (uint64_t)addr;
} else if (!sigframe->is_native) {
sigframe->compat.uc.uc_mcontext.fpstate =
(uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;