UML - Separate out signal reception
PATCH 9/28 UML - Separate out signal reception
This patch moves most of the signal handlers to os-Linux, adds an arch-specific mechanism to get the address of the sigcontext structure, and implements it for i386 and x86_64.
Signed-off-by Jeff Dike <[email protected]>
arch/um/include/sysdep-i386/signal.h +25 -0
@@ -0,0 +1,25 @@ +/* +* Copyright (C) 2004 PathScale, Inc +* Licensed under the GPL +*/ + +#ifndef __I386_SIGNAL_H_ +#define __I386_SIGNAL_H_ + +#include <signal.h> + +#define ARCH_GET_SIGCONTEXT (sc, sig) \ + do sc = (struct sigcontext *) (&sig + 1); while(0) + +#endif + +/* +* Overrides for Emacs so that we follow Linus's tabbing style. +* Emacs will notice this stuff at the end of the file and automatically +* adjust the settings for this buffer only. This must remain at the end +* of the file. +* --------------------------------------------------------------------------- +* Local variables: +* c-file-style: "linux" +* End: +*/
arch/um/include/sysdep-x86_64/signal.h +27 -0
@@ -0,0 +1,27 @@ +/* +* Copyright (C) 2004 PathScale, Inc +* Licensed under the GPL +*/ + +#ifndef __X86_64_SIGNAL_H_ +#define __X86_64_SIGNAL_H_ + +#define ARCH_GET_SIGCONTEXT (sc, sig_addr) \ + do { \ + struct ucontext *__uc; \ + asm("movq %%rdx, %0" : "=r" (__uc)); \ + sc = (struct sigcontext *) &__uc->uc_mcontext; \ + } while(0) + +#endif + +/* +* Overrides for Emacs so that we follow Linus's tabbing style. +* Emacs will notice this stuff at the end of the file and automatically +* adjust the settings for this buffer only. This must remain at the end +* of the file. +* --------------------------------------------------------------------------- +* Local variables: +* c-file-style: "linux" +* End: +*/
arch/um/kernel/trap_user.c +0 -22
@@ -102,28 +102,6 @@ .is_irq = 0 }, }; -void sig_handler (int sig,struct sigcontext sc) -{ -CHOOSE_MODE_PROC (sig_handler_common_tt, sig_handler_common_skas, - sig, &sc); -} - -extern int timer_irq_inited; - -void alarm_handler (int sig,struct sigcontext sc) -{ -if (!timer_irq_inited)return ; - -if (sig ==SIGALRM ) -switch_timers (0 ); - -CHOOSE_MODE_PROC (sig_handler_common_tt, sig_handler_common_skas, - sig, &sc); - -if (sig ==SIGALRM ) -switch_timers (1 ); -} -void do_longjmp (void *b,int val) {sigjmp_buf *buf = b;
arch/um/os-Linux/Makefile +2 -2
@@ -3,10 +3,10 @@ # Licensed under the GPL # -obj-y = elf_aux.o file.o process.o time.o tty.o user_syms.o drivers/ \ +obj-y = elf_aux.o file.o process.o signal.o time.o tty.o user_syms.o drivers/ \ sys-$(SUBARCH)/ -USER_OBJS := elf_aux.o file.o process.o time.o tty.o +USER_OBJS := elf_aux.o file.o process.o signal.o time.o tty.o USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) $(USER_OBJS) : %.o: %.c
arch/um/os-Linux/signal.c +48 -0
48 lines not on this page · raw message