Commit 70e0eb8e authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] Split i386 and x86_64 ptrace.h 



The use of SEGMENT_RPL_MASK in the i386 ptrace.h introduced by
x86-allow-a-kernel-to-not-be-in-ring-0.patch broke the UML build, as UML
includes the underlying architecture's ptrace.h, but has no easy access to the
x86 segment definitions.

Rather than kludging around this, as in the past, this patch splits the
userspace-usable parts, which are the bits that UML needs, of ptrace.h into
ptrace-abi.h, which is included back into ptrace.h.  Thus, there is no net
effect on i386.

As a side-effect, this creates a ptrace header which is close to being usable
in /usr/include.

x86_64 is also treated in this way for consistency.  There was some trailing
whitespace there, which is cleaned up.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b1fc0b1f

include/asm-i386/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ include include/asm-generic/Kbuild.asm 
header-y += boot.h

header-y += debugreg.h

header-y += ldt.h

header-y += ptrace-abi.h

header-y += ucontext.h



unifdef-y += mtrr.h

include/asm-i386/ptrace-abi.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
#ifndef I386_PTRACE_ABI_H

#define I386_PTRACE_ABI_H



#define EBX 0

#define ECX 1

#define EDX 2

#define ESI 3

#define EDI 4

#define EBP 5

#define EAX 6

#define DS 7

#define ES 8

#define FS 9

#define GS 10

#define ORIG_EAX 11

#define EIP 12

#define CS  13

#define EFL 14

#define UESP 15

#define SS   16

#define FRAME_SIZE 17



/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS            12

#define PTRACE_SETREGS            13

#define PTRACE_GETFPREGS          14

#define PTRACE_SETFPREGS          15

#define PTRACE_GETFPXREGS         18

#define PTRACE_SETFPXREGS         19



#define PTRACE_OLDSETOPTIONS         21



#define PTRACE_GET_THREAD_AREA    25

#define PTRACE_SET_THREAD_AREA    26



#define PTRACE_SYSEMU		  31

#define PTRACE_SYSEMU_SINGLESTEP  32



#endif

include/asm-i386/ptrace.h

+1 −34
Original line number Diff line number Diff line 
#ifndef _I386_PTRACE_H

#define _I386_PTRACE_H



#define EBX 0

#define ECX 1

#define EDX 2

#define ESI 3

#define EDI 4

#define EBP 5

#define EAX 6

#define DS 7

#define ES 8

#define FS 9

#define GS 10

#define ORIG_EAX 11

#define EIP 12

#define CS  13

#define EFL 14

#define UESP 15

#define SS   16

#define FRAME_SIZE 17

#include <asm/ptrace-abi.h>



/* this struct defines the way the registers are stored on the 

   stack during a system call. */
@@ -41,22 +24,6 @@ struct pt_regs { 
	int  xss;

};



/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS            12

#define PTRACE_SETREGS            13

#define PTRACE_GETFPREGS          14

#define PTRACE_SETFPREGS          15

#define PTRACE_GETFPXREGS         18

#define PTRACE_SETFPXREGS         19



#define PTRACE_OLDSETOPTIONS         21



#define PTRACE_GET_THREAD_AREA    25

#define PTRACE_SET_THREAD_AREA    26



#define PTRACE_SYSEMU		  31

#define PTRACE_SYSEMU_SINGLESTEP  32



#ifdef __KERNEL__



#include <asm/vm86.h>

include/asm-x86_64/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ header-y += debugreg.h 
header-y += ldt.h

header-y += msr.h

header-y += prctl.h

header-y += ptrace-abi.h

header-y += setup.h

header-y += sigcontext32.h

header-y += ucontext.h

include/asm-x86_64/ptrace-abi.h

0 → 100644
+51 −0
Original line number Diff line number Diff line 
#ifndef _X86_64_PTRACE_ABI_H

#define _X86_64_PTRACE_ABI_H



#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS)

#define R15 0

#define R14 8

#define R13 16

#define R12 24

#define RBP 32

#define RBX 40

/* arguments: interrupts/non tracing syscalls only save upto here*/

#define R11 48

#define R10 56

#define R9 64

#define R8 72

#define RAX 80

#define RCX 88

#define RDX 96

#define RSI 104

#define RDI 112

#define ORIG_RAX 120       /* = ERROR */

/* end of arguments */

/* cpu exception frame or undefined in case of fast syscall. */

#define RIP 128

#define CS 136

#define EFLAGS 144

#define RSP 152

#define SS 160

#define ARGOFFSET R11

#endif /* __ASSEMBLY__ */



/* top of stack page */

#define FRAME_SIZE 168



#define PTRACE_OLDSETOPTIONS         21



/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS            12

#define PTRACE_SETREGS            13

#define PTRACE_GETFPREGS          14

#define PTRACE_SETFPREGS          15

#define PTRACE_GETFPXREGS         18

#define PTRACE_SETFPXREGS         19



/* only useful for access 32bit programs */

#define PTRACE_GET_THREAD_AREA    25

#define PTRACE_SET_THREAD_AREA    26



#define PTRACE_ARCH_PRCTL	  30	/* arch_prctl for child */



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE