Commit 1bdefb5a authored by Laurent Vivier's avatar Laurent Vivier
Browse files

linux-user: move sparc signal definitions to sparc/target_signal.h 



Remove sparc64/target_signal.h, use sparc/target_signal.h instead.

Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20180529194207.31503-11-laurent@vivier.eu>
parent e5171a9e

linux-user/sparc/target_signal.h

+48 −0
Original line number Diff line number Diff line 
#ifndef SPARC_TARGET_SIGNAL_H

#define SPARC_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_SIGIOT            6

#define TARGET_SIGSTKFLT         7 /* actually EMT */

#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

#define TARGET_SIGUSR1          30

#define TARGET_SIGUSR2          31

#define TARGET_SIGRTMIN         32



#define TARGET_SIG_BLOCK          0x01 /* for blocking signals */

#define TARGET_SIG_UNBLOCK        0x02 /* for unblocking signals */

#define TARGET_SIG_SETMASK        0x04 /* for setting the signal mask */



/* this struct defines a stack used during syscall handling */



typedef struct target_sigaltstack {
@@ -16,6 +54,16 @@ typedef struct target_sigaltstack { 
#define TARGET_SS_ONSTACK	1

#define TARGET_SS_DISABLE	2



#define TARGET_SA_NOCLDSTOP    8u

#define TARGET_SA_NOCLDWAIT    0x100u

#define TARGET_SA_SIGINFO      0x200u

#define TARGET_SA_ONSTACK      1u

#define TARGET_SA_RESTART      2u

#define TARGET_SA_NODEFER      0x20u

#define TARGET_SA_RESETHAND    4u

#define TARGET_ARCH_HAS_SA_RESTORER 1

#define TARGET_ARCH_HAS_KA_RESTORER 1



#define TARGET_MINSIGSTKSZ	4096

#define TARGET_SIGSTKSZ		16384

linux-user/sparc64/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -16,5 +16,4 @@ 
 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, see <http://www.gnu.org/licenses/>.

 */

#define SPARC_TARGET_SIGNAL_H /* to only include sparc64/target_signal.h */

#include "../sparc/signal.c"

linux-user/sparc64/target_signal.h

+1 −23
Original line number Diff line number Diff line 
#ifndef SPARC64_TARGET_SIGNAL_H

#define SPARC64_TARGET_SIGNAL_H



/* this struct defines a stack used during syscall handling */



typedef struct target_sigaltstack {

	abi_ulong ss_sp;

	abi_long ss_flags;

	abi_ulong ss_size;

} target_stack_t;





/*

 * sigaltstack controls

 */

#define TARGET_SS_ONSTACK	1

#define TARGET_SS_DISABLE	2



#define TARGET_MINSIGSTKSZ	4096

#define TARGET_SIGSTKSZ		16384



#define TARGET_ARCH_HAS_SETUP_FRAME

#endif /* SPARC64_TARGET_SIGNAL_H */
 
#include "../sparc/target_signal.h"

linux-user/syscall_defs.h

+1 −51
Original line number Diff line number Diff line
@@ -426,17 +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_SPARC)

#define TARGET_SA_NOCLDSTOP    8u

#define TARGET_SA_NOCLDWAIT    0x100u

#define TARGET_SA_SIGINFO      0x200u

#define TARGET_SA_ONSTACK      1u

#define TARGET_SA_RESTART      2u

#define TARGET_SA_NODEFER      0x20u

#define TARGET_SA_RESETHAND    4u

#define TARGET_ARCH_HAS_SA_RESTORER 1

#define TARGET_ARCH_HAS_KA_RESTORER 1

#elif defined(TARGET_MIPS)

#if defined(TARGET_MIPS)

#define TARGET_SA_NOCLDSTOP	0x00000001

#define TARGET_SA_NOCLDWAIT	0x00010000

#define TARGET_SA_SIGINFO	0x00000008
@@ -518,46 +508,6 @@ int do_sigaction(int sig, const struct target_sigaction *act, 
#define TARGET_SIG_UNBLOCK       2

#define TARGET_SIG_SETMASK       3



#elif defined(TARGET_SPARC)



#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_SIGIOT		 6

#define TARGET_SIGSTKFLT	 7 /* actually EMT */

#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

#define TARGET_SIGUSR1		30

#define TARGET_SIGUSR2		31

#define TARGET_SIGRTMIN         32



#define TARGET_SIG_BLOCK          0x01 /* for blocking signals */

#define TARGET_SIG_UNBLOCK        0x02 /* for unblocking signals */

#define TARGET_SIG_SETMASK        0x04 /* for setting the signal mask */



#elif defined(TARGET_MIPS)



#define TARGET_SIGHUP		 1	/* Hangup (POSIX).  */