ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms.

This commit is contained in:
Alexandre Julliard 2014-07-23 16:32:33 +02:00
parent 8d817997ce
commit 775263aa5c
3 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/ntdll/signal_arm.c
View File

@ -82,8 +82,6 @@ typedef struct ucontext
} ucontext_t; } ucontext_t;
#endif #endif
typedef ucontext_t SIGCONTEXT;
/* All Registers access - only for local access */ /* All Registers access - only for local access */
# define REG_sig(reg_name, context) ((context)->uc_mcontext.reg_name) # define REG_sig(reg_name, context) ((context)->uc_mcontext.reg_name)
# define REGn_sig(reg_num, context) ((context)->uc_mcontext.arm_r##reg_num) # define REGn_sig(reg_num, context) ((context)->uc_mcontext.arm_r##reg_num)
@ -149,7 +147,7 @@ static inline BOOL is_valid_frame( void *frame )
* *
* Set the register values from a sigcontext. * Set the register values from a sigcontext.
*/ */
static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) static void save_context( CONTEXT *context, const ucontext_t *sigcontext )
{ {
#define C(x) context->R##x = REGn_sig(x,sigcontext) #define C(x) context->R##x = REGn_sig(x,sigcontext)
/* Save normal registers */ /* Save normal registers */
@ -171,7 +169,7 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext )
* *
* Build a sigcontext from the register values. * Build a sigcontext from the register values.
*/ */
static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) static void restore_context( const CONTEXT *context, ucontext_t *sigcontext )
{ {
#define C(x) REGn_sig(x,sigcontext) = context->R##x #define C(x) REGn_sig(x,sigcontext) = context->R##x
/* Restore normal registers */ /* Restore normal registers */
@ -192,7 +190,7 @@ static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext )
* *
* Set the FPU context from a sigcontext. * Set the FPU context from a sigcontext.
*/ */
static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext )
{ {
FIXME("not implemented\n"); FIXME("not implemented\n");
} }
@ -203,7 +201,7 @@ static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
* *
* Restore the FPU context to a sigcontext. * Restore the FPU context to a sigcontext.
*/ */
static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext )
{ {
FIXME("not implemented\n"); FIXME("not implemented\n");
} }
@ -398,7 +396,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline_arm,
* *
* Setup the exception record and context on the thread stack. * Setup the exception record and context on the thread stack.
*/ */
static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func func )
{ {
struct stack_layout struct stack_layout
{ {
@ -586,7 +584,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f
static void segv_handler( int signal, siginfo_t *info, void *ucontext ) static void segv_handler( int signal, siginfo_t *info, void *ucontext )
{ {
EXCEPTION_RECORD *rec; EXCEPTION_RECORD *rec;
SIGCONTEXT *context = ucontext; ucontext_t *context = ucontext;
/* check for page fault inside the thread stack */ /* check for page fault inside the thread stack */
if (TRAP_sig(context) == TRAP_ARM_PAGEFLT && if (TRAP_sig(context) == TRAP_ARM_PAGEFLT &&

14
dlls/ntdll/signal_arm64.c
View File

@ -67,8 +67,6 @@ static pthread_key_t teb_key;
*/ */
#ifdef linux #ifdef linux
typedef ucontext_t SIGCONTEXT;
/* All Registers access - only for local access */ /* All Registers access - only for local access */
# define REG_sig(reg_name, context) ((context)->uc_mcontext.reg_name) # define REG_sig(reg_name, context) ((context)->uc_mcontext.reg_name)
# define REGn_sig(reg_num, context) ((context)->uc_mcontext.regs[reg_num]) # define REGn_sig(reg_num, context) ((context)->uc_mcontext.regs[reg_num])
@ -117,7 +115,7 @@ static inline BOOL is_valid_frame( void *frame )
* *
* Set the register values from a sigcontext. * Set the register values from a sigcontext.
*/ */
static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) static void save_context( CONTEXT *context, const ucontext_t *sigcontext )
{ {
#define C(n) context->X##n = REGn_sig(n,sigcontext) #define C(n) context->X##n = REGn_sig(n,sigcontext)
/* Save normal registers */ /* Save normal registers */
@ -138,7 +136,7 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext )
* *
* Build a sigcontext from the register values. * Build a sigcontext from the register values.
*/ */
static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) static void restore_context( const CONTEXT *context, ucontext_t *sigcontext )
{ {
#define C(n) REGn_sig(n,sigcontext) = context->X##n #define C(n) REGn_sig(n,sigcontext) = context->X##n
/* Restore normal registers */ /* Restore normal registers */
@ -158,7 +156,7 @@ static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext )
* *
* Set the FPU context from a sigcontext. * Set the FPU context from a sigcontext.
*/ */
static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext )
{ {
FIXME( "Not implemented on ARM64\n" ); FIXME( "Not implemented on ARM64\n" );
} }
@ -169,7 +167,7 @@ static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
* *
* Restore the FPU context to a sigcontext. * Restore the FPU context to a sigcontext.
*/ */
static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext )
{ {
FIXME( "Not implemented on ARM64\n" ); FIXME( "Not implemented on ARM64\n" );
} }
@ -286,7 +284,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from )
* *
* Setup the exception record and context on the thread stack. * Setup the exception record and context on the thread stack.
*/ */
static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func func )
{ {
struct stack_layout struct stack_layout
{ {
@ -460,7 +458,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f
static void segv_handler( int signal, siginfo_t *info, void *ucontext ) static void segv_handler( int signal, siginfo_t *info, void *ucontext )
{ {
EXCEPTION_RECORD *rec; EXCEPTION_RECORD *rec;
SIGCONTEXT *context = ucontext; ucontext_t *context = ucontext;
/* check for page fault inside the thread stack */ /* check for page fault inside the thread stack */
if (signal == SIGSEGV && if (signal == SIGSEGV &&

41
dlls/ntdll/signal_i386.c
View File

@ -102,6 +102,7 @@ typedef struct
#ifdef __ANDROID__ #ifdef __ANDROID__
#ifndef HAVE_SYS_UCONTEXT_H
typedef struct ucontext typedef struct ucontext
{ {
unsigned long uc_flags; unsigned long uc_flags;
@ -109,7 +110,8 @@ typedef struct ucontext
stack_t uc_stack; stack_t uc_stack;
struct sigcontext uc_mcontext; struct sigcontext uc_mcontext;
sigset_t uc_sigmask; sigset_t uc_sigmask;
} SIGCONTEXT; } ucontext_t;
#endif
#define EAX_sig(context) ((context)->uc_mcontext.eax) #define EAX_sig(context) ((context)->uc_mcontext.eax)
#define EBX_sig(context) ((context)->uc_mcontext.ebx) #define EBX_sig(context) ((context)->uc_mcontext.ebx)
@ -143,8 +145,6 @@ __ASM_GLOBAL_FUNC( rt_sigreturn,
#elif defined (__linux__) #elif defined (__linux__)
typedef ucontext_t SIGCONTEXT;
#define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) #define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX])
#define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) #define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX])
#define ECX_sig(context) ((context)->uc_mcontext.gregs[REG_ECX]) #define ECX_sig(context) ((context)->uc_mcontext.gregs[REG_ECX])
@ -222,7 +222,7 @@ __ASM_GLOBAL_FUNC(vm86_enter,
#elif defined (__BSDI__) #elif defined (__BSDI__)
#include <machine/frame.h> #include <machine/frame.h>
typedef struct trapframe SIGCONTEXT; typedef struct trapframe ucontext_t;
#define EAX_sig(context) ((context)->tf_eax) #define EAX_sig(context) ((context)->tf_eax)
#define EBX_sig(context) ((context)->tf_ebx) #define EBX_sig(context) ((context)->tf_ebx)
@ -249,8 +249,6 @@ typedef struct trapframe SIGCONTEXT;
#include <machine/trap.h> #include <machine/trap.h>
typedef struct sigcontext SIGCONTEXT;
#define EAX_sig(context) ((context)->sc_eax) #define EAX_sig(context) ((context)->sc_eax)
#define EBX_sig(context) ((context)->sc_ebx) #define EBX_sig(context) ((context)->sc_ebx)
#define ECX_sig(context) ((context)->sc_ecx) #define ECX_sig(context) ((context)->sc_ecx)
@ -278,8 +276,6 @@ typedef struct sigcontext SIGCONTEXT;
#elif defined (__OpenBSD__) #elif defined (__OpenBSD__)
typedef struct sigcontext SIGCONTEXT;
#define EAX_sig(context) ((context)->sc_eax) #define EAX_sig(context) ((context)->sc_eax)
#define EBX_sig(context) ((context)->sc_ebx) #define EBX_sig(context) ((context)->sc_ebx)
#define ECX_sig(context) ((context)->sc_ecx) #define ECX_sig(context) ((context)->sc_ecx)
@ -312,10 +308,6 @@ typedef struct sigcontext SIGCONTEXT;
#ifdef _SCO_DS #ifdef _SCO_DS
#include <sys/regset.h> #include <sys/regset.h>
#endif
typedef struct ucontext SIGCONTEXT;
#ifdef _SCO_DS
#define gregs regs #define gregs regs
#endif #endif
@ -357,8 +349,6 @@ typedef struct ucontext SIGCONTEXT;
#elif defined (__APPLE__) #elif defined (__APPLE__)
typedef ucontext_t SIGCONTEXT;
/* work around silly renaming of struct members in OS X 10.5 */ /* work around silly renaming of struct members in OS X 10.5 */
#if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32) #if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32)
#define EAX_sig(context) ((context)->uc_mcontext->__ss.__eax) #define EAX_sig(context) ((context)->uc_mcontext->__ss.__eax)
@ -406,8 +396,6 @@ typedef ucontext_t SIGCONTEXT;
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
typedef ucontext_t SIGCONTEXT;
#define EAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EAX]) #define EAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EAX])
#define EBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBX]) #define EBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBX])
#define ECX_sig(context) ((context)->uc_mcontext.__gregs[_REG_ECX]) #define ECX_sig(context) ((context)->uc_mcontext.__gregs[_REG_ECX])
@ -436,7 +424,6 @@ typedef ucontext_t SIGCONTEXT;
#define T_XMMFLT T_XMM #define T_XMMFLT T_XMM
#elif defined(__GNU__) #elif defined(__GNU__)
typedef ucontext_t SIGCONTEXT;
#define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) #define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX])
#define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) #define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX])
@ -553,7 +540,7 @@ static inline int dispatch_signal(unsigned int sig)
* *
* Get the trap code for a signal. * Get the trap code for a signal.
*/ */
static inline enum i386_trap_code get_trap_code( const SIGCONTEXT *sigcontext ) static inline enum i386_trap_code get_trap_code( const ucontext_t *sigcontext )
{ {
#ifdef TRAP_sig #ifdef TRAP_sig
return TRAP_sig(sigcontext); return TRAP_sig(sigcontext);
@ -567,7 +554,7 @@ static inline enum i386_trap_code get_trap_code( const SIGCONTEXT *sigcontext )
* *
* Get the error code for a signal. * Get the error code for a signal.
*/ */
static inline WORD get_error_code( const SIGCONTEXT *sigcontext ) static inline WORD get_error_code( const ucontext_t *sigcontext )
{ {
#ifdef ERROR_sig #ifdef ERROR_sig
return ERROR_sig(sigcontext); return ERROR_sig(sigcontext);
@ -952,7 +939,7 @@ __ASM_GLOBAL_FUNC( clear_alignment_flag,
* Handler initialization when the full context is not needed. * Handler initialization when the full context is not needed.
* Return the stack pointer to use for pushing the exception data. * Return the stack pointer to use for pushing the exception data.
*/ */
static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) static inline void *init_handler( const ucontext_t *sigcontext, WORD *fs, WORD *gs )
{ {
TEB *teb = get_current_teb(); TEB *teb = get_current_teb();
@ -1114,7 +1101,7 @@ static void fpux_to_fpu( FLOATING_SAVE_AREA *fpu, const XMM_SAVE_AREA32 *fpux )
* *
* Build a context structure from the signal info. * Build a context structure from the signal info.
*/ */
static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, WORD fs, WORD gs ) static inline void save_context( CONTEXT *context, const ucontext_t *sigcontext, WORD fs, WORD gs )
{ {
struct ntdll_thread_data * const regs = ntdll_get_thread_data(); struct ntdll_thread_data * const regs = ntdll_get_thread_data();
FLOATING_SAVE_AREA *fpu = FPU_sig(sigcontext); FLOATING_SAVE_AREA *fpu = FPU_sig(sigcontext);
@ -1166,7 +1153,7 @@ static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext,
* *
* Restore the signal info from the context. * Restore the signal info from the context.
*/ */
static inline void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) static inline void restore_context( const CONTEXT *context, ucontext_t *sigcontext )
{ {
struct ntdll_thread_data * const regs = ntdll_get_thread_data(); struct ntdll_thread_data * const regs = ntdll_get_thread_data();
FLOATING_SAVE_AREA *fpu = FPU_sig(sigcontext); FLOATING_SAVE_AREA *fpu = FPU_sig(sigcontext);
@ -1659,7 +1646,7 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context )
* *
* Setup the exception record and context on the thread stack. * Setup the exception record and context on the thread stack.
*/ */
static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *stack_ptr, static EXCEPTION_RECORD *setup_exception_record( ucontext_t *sigcontext, void *stack_ptr,
WORD fs, WORD gs, raise_func func ) WORD fs, WORD gs, raise_func func )
{ {
struct stack_layout struct stack_layout
@ -1761,7 +1748,7 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s
* sigcontext so that the return from the signal handler will call * sigcontext so that the return from the signal handler will call
* the raise function. * the raise function.
*/ */
static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func func )
{ {
WORD fs, gs; WORD fs, gs;
void *stack = init_handler( sigcontext, &fs, &gs ); void *stack = init_handler( sigcontext, &fs, &gs );
@ -1954,7 +1941,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext )
{ {
WORD fs, gs; WORD fs, gs;
EXCEPTION_RECORD *rec; EXCEPTION_RECORD *rec;
SIGCONTEXT *context = sigcontext; ucontext_t *context = sigcontext;
void *stack = init_handler( sigcontext, &fs, &gs ); void *stack = init_handler( sigcontext, &fs, &gs );
/* check for page fault inside the thread stack */ /* check for page fault inside the thread stack */
@ -2036,7 +2023,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext )
*/ */
static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext )
{ {
SIGCONTEXT *context = sigcontext; ucontext_t *context = sigcontext;
EXCEPTION_RECORD *rec = setup_exception( context, raise_trap_exception ); EXCEPTION_RECORD *rec = setup_exception( context, raise_trap_exception );
switch(get_trap_code(context)) switch(get_trap_code(context))
@ -2062,7 +2049,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext )
static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext )
{ {
CONTEXT *win_context; CONTEXT *win_context;
SIGCONTEXT *context = sigcontext; ucontext_t *context = sigcontext;
EXCEPTION_RECORD *rec = setup_exception( context, raise_generic_exception ); EXCEPTION_RECORD *rec = setup_exception( context, raise_generic_exception );
win_context = get_exception_context( rec ); win_context = get_exception_context( rec );