Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad694df5 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: get rid of sysdep/sc.h 



only sysdep/sigcontext.h uses it and very few definitions are
actually used.  The rest refers to symbols that don't even
exist anymore anyway.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 412f90ed

arch/um/sys-i386/shared/sysdep/sc.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
#ifndef __SYSDEP_I386_SC_H

#define __SYSDEP_I386_SC_H



#include <generated/user_constants.h>



#define SC_OFFSET(sc, field) \

	*((unsigned long *) &(((char *) (sc))[HOST_##field]))

#define SC_FP_OFFSET(sc, field) \

	*((unsigned long *) &(((char *) (SC_FPSTATE(sc)))[HOST_##field]))

#define SC_FP_OFFSET_PTR(sc, field, type) \

	((type *) &(((char *) (SC_FPSTATE(sc)))[HOST_##field]))



#define SC_IP(sc) SC_OFFSET(sc, SC_IP)

#define SC_SP(sc) SC_OFFSET(sc, SC_SP)

#define SC_FS(sc) SC_OFFSET(sc, SC_FS)

#define SC_GS(sc) SC_OFFSET(sc, SC_GS)

#define SC_DS(sc) SC_OFFSET(sc, SC_DS)

#define SC_ES(sc) SC_OFFSET(sc, SC_ES)

#define SC_SS(sc) SC_OFFSET(sc, SC_SS)

#define SC_CS(sc) SC_OFFSET(sc, SC_CS)

#define SC_EFLAGS(sc) SC_OFFSET(sc, SC_EFLAGS)

#define SC_EAX(sc) SC_OFFSET(sc, SC_EAX)

#define SC_EBX(sc) SC_OFFSET(sc, SC_EBX)

#define SC_ECX(sc) SC_OFFSET(sc, SC_ECX)

#define SC_EDX(sc) SC_OFFSET(sc, SC_EDX)

#define SC_EDI(sc) SC_OFFSET(sc, SC_EDI)

#define SC_ESI(sc) SC_OFFSET(sc, SC_ESI)

#define SC_EBP(sc) SC_OFFSET(sc, SC_EBP)

#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)

#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)

#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)

#define SC_FPSTATE(sc) SC_OFFSET(sc, SC_FPSTATE)

#define SC_SIGMASK(sc) SC_OFFSET(sc, SC_SIGMASK)

#define SC_FP_CW(sc) SC_FP_OFFSET(sc, SC_FP_CW)

#define SC_FP_SW(sc) SC_FP_OFFSET(sc, SC_FP_SW)

#define SC_FP_TAG(sc) SC_FP_OFFSET(sc, SC_FP_TAG)

#define SC_FP_IPOFF(sc) SC_FP_OFFSET(sc, SC_FP_IPOFF)

#define SC_FP_CSSEL(sc) SC_FP_OFFSET(sc, SC_FP_CSSEL)

#define SC_FP_DATAOFF(sc) SC_FP_OFFSET(sc, SC_FP_DATAOFF)

#define SC_FP_DATASEL(sc) SC_FP_OFFSET(sc, SC_FP_DATASEL)

#define SC_FP_ST(sc) SC_FP_OFFSET_PTR(sc, SC_FP_ST, struct _fpstate)

#define SC_FXSR_ENV(sc) SC_FP_OFFSET_PTR(sc, SC_FXSR_ENV, void)



#endif

arch/um/sys-i386/shared/sysdep/sigcontext.h

+8 −1
Original line number Diff line number Diff line
@@ -6,10 +6,17 @@ 
#ifndef __SYS_SIGCONTEXT_I386_H

#define __SYS_SIGCONTEXT_I386_H



#include "sysdep/sc.h"

#include <generated/user_constants.h>



#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)



#define SC_OFFSET(sc, field) \

	*((unsigned long *) &(((char *) (sc))[HOST_##field]))



#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)

#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)

#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)



#define GET_FAULTINFO_FROM_SC(fi, sc) \

	{ \

		(fi).cr2 = SC_CR2(sc); \

arch/um/sys-x86_64/shared/sysdep/sc.h

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
#ifndef __SYSDEP_X86_64_SC_H

#define __SYSDEP_X86_64_SC_H



/* Copyright (C) 2003 - 2004 PathScale, Inc

 * Released under the GPL

 */



#include <generated/user_constants.h>



#define SC_OFFSET(sc, field) \

	 *((unsigned long *) &(((char *) (sc))[HOST_##field]))



#define SC_RBX(sc) SC_OFFSET(sc, SC_RBX)

#define SC_RCX(sc) SC_OFFSET(sc, SC_RCX)

#define SC_RDX(sc) SC_OFFSET(sc, SC_RDX)

#define SC_RSI(sc) SC_OFFSET(sc, SC_RSI)

#define SC_RDI(sc) SC_OFFSET(sc, SC_RDI)

#define SC_RBP(sc) SC_OFFSET(sc, SC_RBP)

#define SC_RAX(sc) SC_OFFSET(sc, SC_RAX)

#define SC_R8(sc) SC_OFFSET(sc, SC_R8)

#define SC_R9(sc) SC_OFFSET(sc, SC_R9)

#define SC_R10(sc) SC_OFFSET(sc, SC_R10)

#define SC_R11(sc) SC_OFFSET(sc, SC_R11)

#define SC_R12(sc) SC_OFFSET(sc, SC_R12)

#define SC_R13(sc) SC_OFFSET(sc, SC_R13)

#define SC_R14(sc) SC_OFFSET(sc, SC_R14)

#define SC_R15(sc) SC_OFFSET(sc, SC_R15)

#define SC_IP(sc) SC_OFFSET(sc, SC_IP)

#define SC_SP(sc) SC_OFFSET(sc, SC_SP)

#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)

#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)

#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)

#define SC_CS(sc) SC_OFFSET(sc, SC_CS)

#define SC_FS(sc) SC_OFFSET(sc, SC_FS)

#define SC_GS(sc) SC_OFFSET(sc, SC_GS)

#define SC_EFLAGS(sc) SC_OFFSET(sc, SC_EFLAGS)

#define SC_SIGMASK(sc) SC_OFFSET(sc, SC_SIGMASK)

#define SC_SS(sc) SC_OFFSET(sc, SC_SS)

#if 0

#define SC_ORIG_RAX(sc) SC_OFFSET(sc, SC_ORIG_RAX)

#define SC_DS(sc) SC_OFFSET(sc, SC_DS)

#define SC_ES(sc) SC_OFFSET(sc, SC_ES)

#endif



#endif

arch/um/sys-x86_64/shared/sysdep/sigcontext.h

+7 −1
Original line number Diff line number Diff line
@@ -7,7 +7,13 @@ 
#ifndef __SYSDEP_X86_64_SIGCONTEXT_H

#define __SYSDEP_X86_64_SIGCONTEXT_H



#include <sysdep/sc.h>

#include <generated/user_constants.h>



#define SC_OFFSET(sc, field) \

	 *((unsigned long *) &(((char *) (sc))[HOST_##field]))

#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)

#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)

#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)



#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)