diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 20:12:52 -0500 |
---|---|---|
committer | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 20:12:52 -0500 |
commit | dc3a9efb5ee89493a42c3365d219e339e4720c2b (patch) | |
tree | a0d261c2933f3083f351c858b01de7677356d4b7 /include/asm-ppc64 | |
parent | 30415f6a63f3383a18e9adf7c144acabe6893f63 (diff) | |
parent | d3ab57ebdc6457543b346255fa47b0ecd7671136 (diff) |
Merge with Paulus
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r-- | include/asm-ppc64/ppc32.h | 122 | ||||
-rw-r--r-- | include/asm-ppc64/ptrace.h | 213 | ||||
-rw-r--r-- | include/asm-ppc64/sigcontext.h | 47 | ||||
-rw-r--r-- | include/asm-ppc64/stat.h | 60 | ||||
-rw-r--r-- | include/asm-ppc64/ucontext.h | 22 |
5 files changed, 0 insertions, 464 deletions
diff --git a/include/asm-ppc64/ppc32.h b/include/asm-ppc64/ppc32.h deleted file mode 100644 index 3945a55d112a..000000000000 --- a/include/asm-ppc64/ppc32.h +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | #ifndef _PPC64_PPC32_H | ||
2 | #define _PPC64_PPC32_H | ||
3 | |||
4 | #include <linux/compat.h> | ||
5 | #include <asm/siginfo.h> | ||
6 | #include <asm/signal.h> | ||
7 | |||
8 | /* | ||
9 | * Data types and macros for providing 32b PowerPC support. | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or | ||
12 | * modify it under the terms of the GNU General Public License | ||
13 | * as published by the Free Software Foundation; either version | ||
14 | * 2 of the License, or (at your option) any later version. | ||
15 | */ | ||
16 | |||
17 | /* These are here to support 32-bit syscalls on a 64-bit kernel. */ | ||
18 | |||
19 | typedef struct compat_siginfo { | ||
20 | int si_signo; | ||
21 | int si_errno; | ||
22 | int si_code; | ||
23 | |||
24 | union { | ||
25 | int _pad[SI_PAD_SIZE32]; | ||
26 | |||
27 | /* kill() */ | ||
28 | struct { | ||
29 | compat_pid_t _pid; /* sender's pid */ | ||
30 | compat_uid_t _uid; /* sender's uid */ | ||
31 | } _kill; | ||
32 | |||
33 | /* POSIX.1b timers */ | ||
34 | struct { | ||
35 | compat_timer_t _tid; /* timer id */ | ||
36 | int _overrun; /* overrun count */ | ||
37 | compat_sigval_t _sigval; /* same as below */ | ||
38 | int _sys_private; /* not to be passed to user */ | ||
39 | } _timer; | ||
40 | |||
41 | /* POSIX.1b signals */ | ||
42 | struct { | ||
43 | compat_pid_t _pid; /* sender's pid */ | ||
44 | compat_uid_t _uid; /* sender's uid */ | ||
45 | compat_sigval_t _sigval; | ||
46 | } _rt; | ||
47 | |||
48 | /* SIGCHLD */ | ||
49 | struct { | ||
50 | compat_pid_t _pid; /* which child */ | ||
51 | compat_uid_t _uid; /* sender's uid */ | ||
52 | int _status; /* exit code */ | ||
53 | compat_clock_t _utime; | ||
54 | compat_clock_t _stime; | ||
55 | } _sigchld; | ||
56 | |||
57 | /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */ | ||
58 | struct { | ||
59 | unsigned int _addr; /* faulting insn/memory ref. */ | ||
60 | } _sigfault; | ||
61 | |||
62 | /* SIGPOLL */ | ||
63 | struct { | ||
64 | int _band; /* POLL_IN, POLL_OUT, POLL_MSG */ | ||
65 | int _fd; | ||
66 | } _sigpoll; | ||
67 | } _sifields; | ||
68 | } compat_siginfo_t; | ||
69 | |||
70 | #define __old_sigaction32 old_sigaction32 | ||
71 | |||
72 | struct __old_sigaction32 { | ||
73 | compat_uptr_t sa_handler; | ||
74 | compat_old_sigset_t sa_mask; | ||
75 | unsigned int sa_flags; | ||
76 | compat_uptr_t sa_restorer; /* not used by Linux/SPARC yet */ | ||
77 | }; | ||
78 | |||
79 | |||
80 | |||
81 | struct sigaction32 { | ||
82 | compat_uptr_t sa_handler; /* Really a pointer, but need to deal with 32 bits */ | ||
83 | unsigned int sa_flags; | ||
84 | compat_uptr_t sa_restorer; /* Another 32 bit pointer */ | ||
85 | compat_sigset_t sa_mask; /* A 32 bit mask */ | ||
86 | }; | ||
87 | |||
88 | typedef struct sigaltstack_32 { | ||
89 | unsigned int ss_sp; | ||
90 | int ss_flags; | ||
91 | compat_size_t ss_size; | ||
92 | } stack_32_t; | ||
93 | |||
94 | struct sigcontext32 { | ||
95 | unsigned int _unused[4]; | ||
96 | int signal; | ||
97 | compat_uptr_t handler; | ||
98 | unsigned int oldmask; | ||
99 | compat_uptr_t regs; /* 4 byte pointer to the pt_regs32 structure. */ | ||
100 | }; | ||
101 | |||
102 | struct mcontext32 { | ||
103 | elf_gregset_t32 mc_gregs; | ||
104 | elf_fpregset_t mc_fregs; | ||
105 | unsigned int mc_pad[2]; | ||
106 | elf_vrregset_t32 mc_vregs __attribute__((__aligned__(16))); | ||
107 | }; | ||
108 | |||
109 | struct ucontext32 { | ||
110 | unsigned int uc_flags; | ||
111 | unsigned int uc_link; | ||
112 | stack_32_t uc_stack; | ||
113 | int uc_pad[7]; | ||
114 | compat_uptr_t uc_regs; /* points to uc_mcontext field */ | ||
115 | compat_sigset_t uc_sigmask; /* mask last for extensibility */ | ||
116 | /* glibc has 1024-bit signal masks, ours are 64-bit */ | ||
117 | int uc_maskext[30]; | ||
118 | int uc_pad2[3]; | ||
119 | struct mcontext32 uc_mcontext; | ||
120 | }; | ||
121 | |||
122 | #endif /* _PPC64_PPC32_H */ | ||
diff --git a/include/asm-ppc64/ptrace.h b/include/asm-ppc64/ptrace.h deleted file mode 100644 index 3a55377f1fd3..000000000000 --- a/include/asm-ppc64/ptrace.h +++ /dev/null | |||
@@ -1,213 +0,0 @@ | |||
1 | #ifndef _PPC64_PTRACE_H | ||
2 | #define _PPC64_PTRACE_H | ||
3 | |||
4 | /* | ||
5 | * Copyright (C) 2001 PPC64 Team, IBM Corp | ||
6 | * | ||
7 | * This struct defines the way the registers are stored on the | ||
8 | * kernel stack during a system call or other kernel entry. | ||
9 | * | ||
10 | * this should only contain volatile regs | ||
11 | * since we can keep non-volatile in the thread_struct | ||
12 | * should set this up when only volatiles are saved | ||
13 | * by intr code. | ||
14 | * | ||
15 | * Since this is going on the stack, *CARE MUST BE TAKEN* to insure | ||
16 | * that the overall structure is a multiple of 16 bytes in length. | ||
17 | * | ||
18 | * Note that the offsets of the fields in this struct correspond with | ||
19 | * the PT_* values below. This simplifies arch/ppc64/kernel/ptrace.c. | ||
20 | * | ||
21 | * This program is free software; you can redistribute it and/or | ||
22 | * modify it under the terms of the GNU General Public License | ||
23 | * as published by the Free Software Foundation; either version | ||
24 | * 2 of the License, or (at your option) any later version. | ||
25 | */ | ||
26 | |||
27 | #ifndef __ASSEMBLY__ | ||
28 | |||
29 | struct pt_regs { | ||
30 | unsigned long gpr[32]; | ||
31 | unsigned long nip; | ||
32 | unsigned long msr; | ||
33 | unsigned long orig_gpr3; /* Used for restarting system calls */ | ||
34 | unsigned long ctr; | ||
35 | unsigned long link; | ||
36 | unsigned long xer; | ||
37 | unsigned long ccr; | ||
38 | unsigned long softe; /* Soft enabled/disabled */ | ||
39 | unsigned long trap; /* Reason for being here */ | ||
40 | unsigned long dar; /* Fault registers */ | ||
41 | unsigned long dsisr; | ||
42 | unsigned long result; /* Result of a system call */ | ||
43 | }; | ||
44 | |||
45 | struct pt_regs32 { | ||
46 | unsigned int gpr[32]; | ||
47 | unsigned int nip; | ||
48 | unsigned int msr; | ||
49 | unsigned int orig_gpr3; /* Used for restarting system calls */ | ||
50 | unsigned int ctr; | ||
51 | unsigned int link; | ||
52 | unsigned int xer; | ||
53 | unsigned int ccr; | ||
54 | unsigned int mq; /* 601 only (not used at present) */ | ||
55 | unsigned int trap; /* Reason for being here */ | ||
56 | unsigned int dar; /* Fault registers */ | ||
57 | unsigned int dsisr; | ||
58 | unsigned int result; /* Result of a system call */ | ||
59 | }; | ||
60 | |||
61 | #ifdef __KERNEL__ | ||
62 | |||
63 | #define instruction_pointer(regs) ((regs)->nip) | ||
64 | |||
65 | #ifdef CONFIG_SMP | ||
66 | extern unsigned long profile_pc(struct pt_regs *regs); | ||
67 | #else | ||
68 | #define profile_pc(regs) instruction_pointer(regs) | ||
69 | #endif | ||
70 | |||
71 | #define user_mode(regs) ((((regs)->msr) >> MSR_PR_LG) & 0x1) | ||
72 | |||
73 | #define force_successful_syscall_return() \ | ||
74 | (current_thread_info()->syscall_noerror = 1) | ||
75 | |||
76 | /* | ||
77 | * We use the least-significant bit of the trap field to indicate | ||
78 | * whether we have saved the full set of registers, or only a | ||
79 | * partial set. A 1 there means the partial set. | ||
80 | */ | ||
81 | #define FULL_REGS(regs) (((regs)->trap & 1) == 0) | ||
82 | #define TRAP(regs) ((regs)->trap & ~0xF) | ||
83 | #define CHECK_FULL_REGS(regs) BUG_ON(regs->trap & 1) | ||
84 | |||
85 | #endif /* __KERNEL__ */ | ||
86 | |||
87 | #endif /* __ASSEMBLY__ */ | ||
88 | |||
89 | #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ | ||
90 | |||
91 | /* Size of dummy stack frame allocated when calling signal handler. */ | ||
92 | #define __SIGNAL_FRAMESIZE 128 | ||
93 | #define __SIGNAL_FRAMESIZE32 64 | ||
94 | |||
95 | /* | ||
96 | * Offsets used by 'ptrace' system call interface. | ||
97 | */ | ||
98 | #define PT_R0 0 | ||
99 | #define PT_R1 1 | ||
100 | #define PT_R2 2 | ||
101 | #define PT_R3 3 | ||
102 | #define PT_R4 4 | ||
103 | #define PT_R5 5 | ||
104 | #define PT_R6 6 | ||
105 | #define PT_R7 7 | ||
106 | #define PT_R8 8 | ||
107 | #define PT_R9 9 | ||
108 | #define PT_R10 10 | ||
109 | #define PT_R11 11 | ||
110 | #define PT_R12 12 | ||
111 | #define PT_R13 13 | ||
112 | #define PT_R14 14 | ||
113 | #define PT_R15 15 | ||
114 | #define PT_R16 16 | ||
115 | #define PT_R17 17 | ||
116 | #define PT_R18 18 | ||
117 | #define PT_R19 19 | ||
118 | #define PT_R20 20 | ||
119 | #define PT_R21 21 | ||
120 | #define PT_R22 22 | ||
121 | #define PT_R23 23 | ||
122 | #define PT_R24 24 | ||
123 | #define PT_R25 25 | ||
124 | #define PT_R26 26 | ||
125 | #define PT_R27 27 | ||
126 | #define PT_R28 28 | ||
127 | #define PT_R29 29 | ||
128 | #define PT_R30 30 | ||
129 | #define PT_R31 31 | ||
130 | |||
131 | #define PT_NIP 32 | ||
132 | #define PT_MSR 33 | ||
133 | #ifdef __KERNEL__ | ||
134 | #define PT_ORIG_R3 34 | ||
135 | #endif | ||
136 | #define PT_CTR 35 | ||
137 | #define PT_LNK 36 | ||
138 | #define PT_XER 37 | ||
139 | #define PT_CCR 38 | ||
140 | #define PT_SOFTE 39 | ||
141 | #define PT_TRAP 40 | ||
142 | #define PT_DAR 41 | ||
143 | #define PT_DSISR 42 | ||
144 | #define PT_RESULT 43 | ||
145 | |||
146 | #define PT_FPR0 48 | ||
147 | |||
148 | /* | ||
149 | * Kernel and userspace will both use this PT_FPSCR value. 32-bit apps will | ||
150 | * have visibility to the asm-ppc/ptrace.h header instead of this one. | ||
151 | */ | ||
152 | #define PT_FPSCR (PT_FPR0 + 32) /* each FP reg occupies 1 slot in 64-bit space */ | ||
153 | |||
154 | #ifdef __KERNEL__ | ||
155 | #define PT_FPSCR32 (PT_FPR0 + 2*32 + 1) /* each FP reg occupies 2 32-bit userspace slots */ | ||
156 | #endif | ||
157 | |||
158 | #define PT_VR0 82 /* each Vector reg occupies 2 slots in 64-bit */ | ||
159 | #define PT_VSCR (PT_VR0 + 32*2 + 1) | ||
160 | #define PT_VRSAVE (PT_VR0 + 33*2) | ||
161 | |||
162 | #ifdef __KERNEL__ | ||
163 | #define PT_VR0_32 164 /* each Vector reg occupies 4 slots in 32-bit */ | ||
164 | #define PT_VSCR_32 (PT_VR0 + 32*4 + 3) | ||
165 | #define PT_VRSAVE_32 (PT_VR0 + 33*4) | ||
166 | #endif | ||
167 | |||
168 | /* | ||
169 | * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go. | ||
170 | * The transfer totals 34 quadword. Quadwords 0-31 contain the | ||
171 | * corresponding vector registers. Quadword 32 contains the vscr as the | ||
172 | * last word (offset 12) within that quadword. Quadword 33 contains the | ||
173 | * vrsave as the first word (offset 0) within the quadword. | ||
174 | * | ||
175 | * This definition of the VMX state is compatible with the current PPC32 | ||
176 | * ptrace interface. This allows signal handling and ptrace to use the same | ||
177 | * structures. This also simplifies the implementation of a bi-arch | ||
178 | * (combined (32- and 64-bit) gdb. | ||
179 | */ | ||
180 | #define PTRACE_GETVRREGS 18 | ||
181 | #define PTRACE_SETVRREGS 19 | ||
182 | |||
183 | /* | ||
184 | * While we dont have 64bit book E processors, we need to reserve the | ||
185 | * relevant ptrace calls for 32bit compatibility. | ||
186 | */ | ||
187 | #if 0 | ||
188 | #define PTRACE_GETEVRREGS 20 | ||
189 | #define PTRACE_SETEVRREGS 21 | ||
190 | #endif | ||
191 | |||
192 | /* | ||
193 | * Get or set a debug register. The first 16 are DABR registers and the | ||
194 | * second 16 are IABR registers. | ||
195 | */ | ||
196 | #define PTRACE_GET_DEBUGREG 25 | ||
197 | #define PTRACE_SET_DEBUGREG 26 | ||
198 | |||
199 | /* Additional PTRACE requests implemented on PowerPC. */ | ||
200 | #define PPC_PTRACE_GETREGS 0x99 /* Get GPRs 0 - 31 */ | ||
201 | #define PPC_PTRACE_SETREGS 0x98 /* Set GPRs 0 - 31 */ | ||
202 | #define PPC_PTRACE_GETFPREGS 0x97 /* Get FPRs 0 - 31 */ | ||
203 | #define PPC_PTRACE_SETFPREGS 0x96 /* Set FPRs 0 - 31 */ | ||
204 | |||
205 | /* Calls to trace a 64bit program from a 32bit program */ | ||
206 | #define PPC_PTRACE_PEEKTEXT_3264 0x95 | ||
207 | #define PPC_PTRACE_PEEKDATA_3264 0x94 | ||
208 | #define PPC_PTRACE_POKETEXT_3264 0x93 | ||
209 | #define PPC_PTRACE_POKEDATA_3264 0x92 | ||
210 | #define PPC_PTRACE_PEEKUSR_3264 0x91 | ||
211 | #define PPC_PTRACE_POKEUSR_3264 0x90 | ||
212 | |||
213 | #endif /* _PPC64_PTRACE_H */ | ||
diff --git a/include/asm-ppc64/sigcontext.h b/include/asm-ppc64/sigcontext.h deleted file mode 100644 index 6f8aee768c5e..000000000000 --- a/include/asm-ppc64/sigcontext.h +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | #ifndef _ASM_PPC64_SIGCONTEXT_H | ||
2 | #define _ASM_PPC64_SIGCONTEXT_H | ||
3 | |||
4 | /* | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License | ||
7 | * as published by the Free Software Foundation; either version | ||
8 | * 2 of the License, or (at your option) any later version. | ||
9 | */ | ||
10 | #include <linux/compiler.h> | ||
11 | #include <asm/ptrace.h> | ||
12 | #include <asm/elf.h> | ||
13 | |||
14 | |||
15 | struct sigcontext { | ||
16 | unsigned long _unused[4]; | ||
17 | int signal; | ||
18 | int _pad0; | ||
19 | unsigned long handler; | ||
20 | unsigned long oldmask; | ||
21 | struct pt_regs __user *regs; | ||
22 | elf_gregset_t gp_regs; | ||
23 | elf_fpregset_t fp_regs; | ||
24 | /* | ||
25 | * To maintain compatibility with current implementations the sigcontext is | ||
26 | * extended by appending a pointer (v_regs) to a quadword type (elf_vrreg_t) | ||
27 | * followed by an unstructured (vmx_reserve) field of 69 doublewords. This | ||
28 | * allows the array of vector registers to be quadword aligned independent of | ||
29 | * the alignment of the containing sigcontext or ucontext. It is the | ||
30 | * responsibility of the code setting the sigcontext to set this pointer to | ||
31 | * either NULL (if this processor does not support the VMX feature) or the | ||
32 | * address of the first quadword within the allocated (vmx_reserve) area. | ||
33 | * | ||
34 | * The pointer (v_regs) of vector type (elf_vrreg_t) is type compatible with | ||
35 | * an array of 34 quadword entries (elf_vrregset_t). The entries with | ||
36 | * indexes 0-31 contain the corresponding vector registers. The entry with | ||
37 | * index 32 contains the vscr as the last word (offset 12) within the | ||
38 | * quadword. This allows the vscr to be stored as either a quadword (since | ||
39 | * it must be copied via a vector register to/from storage) or as a word. | ||
40 | * The entry with index 33 contains the vrsave as the first word (offset 0) | ||
41 | * within the quadword. | ||
42 | */ | ||
43 | elf_vrreg_t __user *v_regs; | ||
44 | long vmx_reserve[ELF_NVRREG+ELF_NVRREG+1]; | ||
45 | }; | ||
46 | |||
47 | #endif /* _ASM_PPC64_SIGCONTEXT_H */ | ||
diff --git a/include/asm-ppc64/stat.h b/include/asm-ppc64/stat.h deleted file mode 100644 index 973a5f97951d..000000000000 --- a/include/asm-ppc64/stat.h +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | #ifndef _PPC64_STAT_H | ||
2 | #define _PPC64_STAT_H | ||
3 | |||
4 | /* | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License | ||
7 | * as published by the Free Software Foundation; either version | ||
8 | * 2 of the License, or (at your option) any later version. | ||
9 | */ | ||
10 | |||
11 | #include <linux/types.h> | ||
12 | |||
13 | struct stat { | ||
14 | unsigned long st_dev; | ||
15 | ino_t st_ino; | ||
16 | nlink_t st_nlink; | ||
17 | mode_t st_mode; | ||
18 | uid_t st_uid; | ||
19 | gid_t st_gid; | ||
20 | unsigned long st_rdev; | ||
21 | off_t st_size; | ||
22 | unsigned long st_blksize; | ||
23 | unsigned long st_blocks; | ||
24 | unsigned long st_atime; | ||
25 | unsigned long st_atime_nsec; | ||
26 | unsigned long st_mtime; | ||
27 | unsigned long st_mtime_nsec; | ||
28 | unsigned long st_ctime; | ||
29 | unsigned long st_ctime_nsec; | ||
30 | unsigned long __unused4; | ||
31 | unsigned long __unused5; | ||
32 | unsigned long __unused6; | ||
33 | }; | ||
34 | |||
35 | #define STAT_HAVE_NSEC 1 | ||
36 | |||
37 | /* This matches struct stat64 in glibc2.1. Only used for 32 bit. */ | ||
38 | struct stat64 { | ||
39 | unsigned long st_dev; /* Device. */ | ||
40 | unsigned long st_ino; /* File serial number. */ | ||
41 | unsigned int st_mode; /* File mode. */ | ||
42 | unsigned int st_nlink; /* Link count. */ | ||
43 | unsigned int st_uid; /* User ID of the file's owner. */ | ||
44 | unsigned int st_gid; /* Group ID of the file's group. */ | ||
45 | unsigned long st_rdev; /* Device number, if device. */ | ||
46 | unsigned short __pad2; | ||
47 | long st_size; /* Size of file, in bytes. */ | ||
48 | int st_blksize; /* Optimal block size for I/O. */ | ||
49 | |||
50 | long st_blocks; /* Number 512-byte blocks allocated. */ | ||
51 | int st_atime; /* Time of last access. */ | ||
52 | int st_atime_nsec; | ||
53 | int st_mtime; /* Time of last modification. */ | ||
54 | int st_mtime_nsec; | ||
55 | int st_ctime; /* Time of last status change. */ | ||
56 | int st_ctime_nsec; | ||
57 | unsigned int __unused4; | ||
58 | unsigned int __unused5; | ||
59 | }; | ||
60 | #endif | ||
diff --git a/include/asm-ppc64/ucontext.h b/include/asm-ppc64/ucontext.h deleted file mode 100644 index ef8cc5b37542..000000000000 --- a/include/asm-ppc64/ucontext.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef _ASMPPC64_UCONTEXT_H | ||
2 | #define _ASMPPC64_UCONTEXT_H | ||
3 | |||
4 | #include <asm/sigcontext.h> | ||
5 | |||
6 | /* | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License | ||
9 | * as published by the Free Software Foundation; either version | ||
10 | * 2 of the License, or (at your option) any later version. | ||
11 | */ | ||
12 | |||
13 | struct ucontext { | ||
14 | unsigned long uc_flags; | ||
15 | struct ucontext *uc_link; | ||
16 | stack_t uc_stack; | ||
17 | sigset_t uc_sigmask; | ||
18 | sigset_t __unsued[15]; /* Allow for uc_sigmask growth */ | ||
19 | struct sigcontext uc_mcontext; /* last for extensibility */ | ||
20 | }; | ||
21 | |||
22 | #endif /* _ASMPPC64_UCONTEXT_H */ | ||