[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/15] linux-user: move alpha signal definitions to
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH 13/15] linux-user: move alpha signal definitions to alpha/target_signal.h |
Date: |
Tue, 29 May 2018 21:42:05 +0200 |
No code change.
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/alpha/target_signal.h | 45 +++++++++++++++++++++++++++++++++++
linux-user/syscall_defs.h | 51 ++--------------------------------------
2 files changed, 47 insertions(+), 49 deletions(-)
diff --git a/linux-user/alpha/target_signal.h b/linux-user/alpha/target_signal.h
index e6f2f04911..cd63d59fde 100644
--- a/linux-user/alpha/target_signal.h
+++ b/linux-user/alpha/target_signal.h
@@ -1,6 +1,43 @@
#ifndef ALPHA_TARGET_SIGNAL_H
#define ALPHA_TARGET_SIGNAL_H
+#define TARGET_SIGHUP 1
+#define TARGET_SIGINT 2
+#define TARGET_SIGQUIT 3
+#define TARGET_SIGILL 4
+#define TARGET_SIGTRAP 5
+#define TARGET_SIGABRT 6
+#define TARGET_SIGSTKFLT 7 /* actually SIGEMT */
+#define TARGET_SIGFPE 8
+#define TARGET_SIGKILL 9
+#define TARGET_SIGBUS 10
+#define TARGET_SIGSEGV 11
+#define TARGET_SIGSYS 12
+#define TARGET_SIGPIPE 13
+#define TARGET_SIGALRM 14
+#define TARGET_SIGTERM 15
+#define TARGET_SIGURG 16
+#define TARGET_SIGSTOP 17
+#define TARGET_SIGTSTP 18
+#define TARGET_SIGCONT 19
+#define TARGET_SIGCHLD 20
+#define TARGET_SIGTTIN 21
+#define TARGET_SIGTTOU 22
+#define TARGET_SIGIO 23
+#define TARGET_SIGXCPU 24
+#define TARGET_SIGXFSZ 25
+#define TARGET_SIGVTALRM 26
+#define TARGET_SIGPROF 27
+#define TARGET_SIGWINCH 28
+#define TARGET_SIGPWR 29 /* actually SIGINFO */
+#define TARGET_SIGUSR1 30
+#define TARGET_SIGUSR2 31
+#define TARGET_SIGRTMIN 32
+
+#define TARGET_SIG_BLOCK 1
+#define TARGET_SIG_UNBLOCK 2
+#define TARGET_SIG_SETMASK 3
+
/* this struct defines a stack used during syscall handling */
typedef struct target_sigaltstack {
@@ -17,6 +54,14 @@ typedef struct target_sigaltstack {
#define TARGET_SS_ONSTACK 1
#define TARGET_SS_DISABLE 2
+#define TARGET_SA_ONSTACK 0x00000001
+#define TARGET_SA_RESTART 0x00000002
+#define TARGET_SA_NOCLDSTOP 0x00000004
+#define TARGET_SA_NODEFER 0x00000008
+#define TARGET_SA_RESETHAND 0x00000010
+#define TARGET_SA_NOCLDWAIT 0x00000020 /* not supported yet */
+#define TARGET_SA_SIGINFO 0x00000040
+
#define TARGET_MINSIGSTKSZ 4096
#define TARGET_SIGSTKSZ 16384
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 360d37c9c0..8436875005 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -426,15 +426,7 @@ int do_sigaction(int sig, const struct target_sigaction
*act,
|| defined(TARGET_TILEGX) || defined(TARGET_HPPA) || defined(TARGET_NIOS2)
\
|| defined(TARGET_RISCV) || defined(TARGET_XTENSA)
-#if defined(TARGET_ALPHA)
-#define TARGET_SA_ONSTACK 0x00000001
-#define TARGET_SA_RESTART 0x00000002
-#define TARGET_SA_NOCLDSTOP 0x00000004
-#define TARGET_SA_NODEFER 0x00000008
-#define TARGET_SA_RESETHAND 0x00000010
-#define TARGET_SA_NOCLDWAIT 0x00000020 /* not supported yet */
-#define TARGET_SA_SIGINFO 0x00000040
-#elif defined(TARGET_HPPA)
+#if defined(TARGET_HPPA)
#define TARGET_SA_ONSTACK 0x00000001
#define TARGET_SA_RESETHAND 0x00000004
#define TARGET_SA_NOCLDSTOP 0x00000008
@@ -450,46 +442,7 @@ int do_sigaction(int sig, const struct target_sigaction
*act,
#define TARGET_ARCH_HAS_SA_RESTORER 1
#endif
-#if defined(TARGET_ALPHA)
-
-#define TARGET_SIGHUP 1
-#define TARGET_SIGINT 2
-#define TARGET_SIGQUIT 3
-#define TARGET_SIGILL 4
-#define TARGET_SIGTRAP 5
-#define TARGET_SIGABRT 6
-#define TARGET_SIGSTKFLT 7 /* actually SIGEMT */
-#define TARGET_SIGFPE 8
-#define TARGET_SIGKILL 9
-#define TARGET_SIGBUS 10
-#define TARGET_SIGSEGV 11
-#define TARGET_SIGSYS 12
-#define TARGET_SIGPIPE 13
-#define TARGET_SIGALRM 14
-#define TARGET_SIGTERM 15
-#define TARGET_SIGURG 16
-#define TARGET_SIGSTOP 17
-#define TARGET_SIGTSTP 18
-#define TARGET_SIGCONT 19
-#define TARGET_SIGCHLD 20
-#define TARGET_SIGTTIN 21
-#define TARGET_SIGTTOU 22
-#define TARGET_SIGIO 23
-#define TARGET_SIGXCPU 24
-#define TARGET_SIGXFSZ 25
-#define TARGET_SIGVTALRM 26
-#define TARGET_SIGPROF 27
-#define TARGET_SIGWINCH 28
-#define TARGET_SIGPWR 29 /* actually SIGINFO */
-#define TARGET_SIGUSR1 30
-#define TARGET_SIGUSR2 31
-#define TARGET_SIGRTMIN 32
-
-#define TARGET_SIG_BLOCK 1
-#define TARGET_SIG_UNBLOCK 2
-#define TARGET_SIG_SETMASK 3
-
-#elif defined(TARGET_HPPA)
+#if defined(TARGET_HPPA)
#define TARGET_SIGHUP 1
#define TARGET_SIGINT 2
--
2.14.3
- [Qemu-devel] [PATCH 01/15] linux-user: move generic fcntl definitions to generic/fcntl.h, (continued)
- [Qemu-devel] [PATCH 01/15] linux-user: move generic fcntl definitions to generic/fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 09/15] linux-user: move generic signal definitions to generic/signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 02/15] linux-user: move alpha fcntl definitions to alpha/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 03/15] linux-user: move hppa fcntl definitions to hppa/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 06/15] linux-user: move ppc fcntl definitions to ppc/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 07/15] linux-user: move sparc/sparc64 fcntl definitions to sparc/target_fcntl.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 12/15] linux-user: move openrisc signal definitions to openrisc/target_signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 10/15] linux-user: move sparc signal definitions to sparc/target_signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 13/15] linux-user: move alpha signal definitions to alpha/target_signal.h,
Laurent Vivier <=
- [Qemu-devel] [PATCH 15/15] linux-user: remove useless #if, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 14/15] linux-user: move hppa signal definitions to hppa/target_signal.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 08/15] linux-user: move get_sp_from_cpustate() to target_cpu.h, Laurent Vivier, 2018/05/29
- [Qemu-devel] [PATCH 11/15] linux-user: move mips signal definitions to mips/target_signal.h, Laurent Vivier, 2018/05/29
- Re: [Qemu-devel] [PATCH 00/15] linux-user: move more definitions out of syscall_defs.h, no-reply, 2018/05/29
- Re: [Qemu-devel] [PATCH 00/15] linux-user: move more definitions out of syscall_defs.h, Richard Henderson, 2018/05/30