]>
Commit | Line | Data |
---|---|---|
ed799d14 AM |
1 | diff -urN strace-4.3.org/linux/sparc/syscall.h strace-4.3/linux/sparc/syscall.h |
2 | --- strace-4.3.org/linux/sparc/syscall.h Wed Apr 4 19:25:52 2001 | |
3 | +++ strace-4.3/linux/sparc/syscall.h Wed Apr 4 19:52:01 2001 | |
de4e0a62 JR |
4 | @@ -105,25 +105,45 @@ |
5 | ||
6 | /* 2.3.1 SystemV-compatible IPC */ | |
7 | int sys_semsys(), sys_semctl(), sys_semget(); | |
8 | -#define SYS_semsys_subcall 200 | |
9 | +#define SYS_semsys_subcall 256 | |
10 | #define SYS_semsys_nsubcalls 3 | |
11 | #define SYS_semctl (SYS_semsys_subcall + 0) | |
12 | #define SYS_semget (SYS_semsys_subcall + 1) | |
13 | #define SYS_semop (SYS_semsys_subcall + 2) | |
14 | int sys_msgsys(), sys_msgget(), sys_msgctl(), sys_msgrcv(), sys_msgsnd(); | |
15 | -#define SYS_msgsys_subcall 203 | |
16 | +#define SYS_msgsys_subcall 259 | |
17 | #define SYS_msgsys_nsubcalls 4 | |
18 | #define SYS_msgget (SYS_msgsys_subcall + 0) | |
19 | #define SYS_msgctl (SYS_msgsys_subcall + 1) | |
20 | #define SYS_msgrcv (SYS_msgsys_subcall + 2) | |
21 | #define SYS_msgsnd (SYS_msgsys_subcall + 3) | |
22 | int sys_shmsys(), sys_shmat(), sys_shmctl(), sys_shmdt(), sys_shmget(); | |
23 | -#define SYS_shmsys_subcall 207 | |
24 | +#define SYS_shmsys_subcall 263 | |
25 | #define SYS_shmsys_nsubcalls 4 | |
26 | #define SYS_shmat (SYS_shmsys_subcall + 0) | |
27 | #define SYS_shmctl (SYS_shmsys_subcall + 1) | |
28 | #define SYS_shmdt (SYS_shmsys_subcall + 2) | |
29 | #define SYS_shmget (SYS_shmsys_subcall + 3) | |
30 | + | |
31 | +#define SYS_socket_subcall 267 | |
32 | +#define SYS_socket_nsubcalls 16 | |
33 | +/* | |
34 | +#define SYS_socket (SYS_socket_subcall + 1) | |
35 | +#define SYS_bind (SYS_socket_subcall + 2) | |
36 | +#define SYS_connect (SYS_socket_subcall + 3) | |
37 | +#define SYS_listen (SYS_socket_subcall + 4) | |
38 | +#define SYS_accept (SYS_socket_subcall + 5) | |
39 | +#define SYS_getsockname (SYS_socket_subcall + 6) | |
40 | +#define SYS_getpeername (SYS_socket_subcall + 7) | |
41 | +#define SYS_socketpair (SYS_socket_subcall + 8) | |
42 | +#define SYS_send (SYS_socket_subcall + 9) | |
43 | +#define SYS_recv (SYS_socket_subcall + 10) | |
44 | +#define SYS_sendto (SYS_socket_subcall + 11) | |
45 | +#define SYS_recvfrom (SYS_socket_subcall + 12) | |
46 | +#define SYS_shutdown (SYS_socket_subcall + 13) | |
47 | +#define SYS_setsockopt (SYS_socket_subcall + 14) | |
48 | +#define SYS_getsockopt (SYS_socket_subcall + 15) | |
49 | + */ | |
50 | ||
51 | /* 2.4 processes */ | |
52 | int sys_ptrace(); | |
ed799d14 AM |
53 | diff -urN strace-4.3.org/linux/sparc/syscall.h.2 strace-4.3/linux/sparc/syscall.h.2 |
54 | --- strace-4.3.org/linux/sparc/syscall.h.2 Wed Apr 4 19:25:52 2001 | |
55 | +++ strace-4.3/linux/sparc/syscall.h.2 Wed Apr 4 19:52:01 2001 | |
de4e0a62 JR |
56 | @@ -1,142 +0,0 @@ |
57 | -/* | |
58 | - * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl> | |
59 | - * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com> | |
60 | - * All rights reserved. | |
61 | - * | |
62 | - * Redistribution and use in source and binary forms, with or without | |
63 | - * modification, are permitted provided that the following conditions | |
64 | - * are met: | |
65 | - * 1. Redistributions of source code must retain the above copyright | |
66 | - * notice, this list of conditions and the following disclaimer. | |
67 | - * 2. Redistributions in binary form must reproduce the above copyright | |
68 | - * notice, this list of conditions and the following disclaimer in the | |
69 | - * documentation and/or other materials provided with the distribution. | |
70 | - * 3. The name of the author may not be used to endorse or promote products | |
71 | - * derived from this software without specific prior written permission. | |
72 | - * | |
73 | - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
74 | - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
75 | - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
76 | - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
77 | - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
78 | - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
79 | - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
80 | - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
81 | - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
82 | - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
83 | - * | |
84 | - * $Id$ | |
85 | - */ | |
86 | - | |
87 | -#include "dummy.h" | |
88 | - | |
89 | -/* primary syscalls */ | |
90 | - | |
91 | -int sys_setup(), sys_exit(), sys_fork(), sys_read(), sys_write(); | |
92 | -int sys_open(), sys_close(), sys_waitpid(), sys_creat(), sys_link(); | |
93 | -int sys_unlink(), sys_execve(), sys_chdir(), sys_time(), sys_mknod(); | |
94 | -int sys_chmod(), sys_chown(), sys_break(), sys_oldstat(); | |
95 | -int sys_lseek(), sys_getpid(), sys_mount(), sys_umount(); | |
96 | -int sys_setuid(), sys_getuid(), sys_stime(), sys_ptrace(); | |
97 | -int sys_alarm(), sys_oldfstat(), sys_pause(), sys_utime(); | |
98 | -int sys_stty(), sys_gtty(), sys_access(), sys_nice(), sys_ftime(); | |
99 | -int sys_sync(), sys_kill(), sys_rename(), sys_mkdir(), sys_rmdir(); | |
100 | -int sys_dup(), sys_pipe(), sys_times(), sys_prof(), sys_brk(); | |
101 | -int sys_setgid(), sys_getgid(), sys_signal(), sys_geteuid(); | |
102 | -int sys_getegid(), sys_acct(), sys_phys(), sys_lock(), sys_ioctl(); | |
103 | -int sys_fcntl(), sys_mpx(), sys_setpgid(), sys_ulimit(); | |
104 | -int sys_olduname(), sys_umask(), sys_chroot(), sys_ustat(); | |
105 | -int sys_dup2(), sys_getppid(), sys_getpgrp(), sys_setsid(); | |
106 | -int sys_sigaction(), sys_siggetmask(), sys_sigsetmask(); | |
107 | -int sys_setreuid(), sys_setregid(), sys_sigsuspend(); | |
108 | -int sys_sigpending(), sys_sethostname(), sys_setrlimit(); | |
109 | -int sys_getrlimit(), sys_getrusage(), sys_gettimeofday(); | |
110 | -int sys_settimeofday(), sys_getgroups(), sys_setgroups(); | |
111 | -int sys_oldselect(), sys_symlink(), sys_oldlstat(), sys_readlink(); | |
112 | -int sys_uselib(), sys_swapon(), sys_reboot(), sys_readdir(); | |
113 | -int sys_mmap(), sys_munmap(), sys_truncate(), sys_ftruncate(); | |
114 | -int sys_fchmod(), sys_fchown(), sys_getpriority(); | |
115 | -int sys_setpriority(), sys_profil(), sys_statfs(), sys_fstatfs(); | |
116 | -int sys_ioperm(), sys_socketcall(), sys_syslog(), sys_setitimer(); | |
117 | -int sys_getitimer(), sys_stat(), sys_lstat(), sys_fstat(); | |
118 | -int sys_uname(), sys_iopl(), sys_vhangup(), sys_idle(), sys_vm86(); | |
119 | -int sys_wait4(), sys_swapoff(), sys_ipc(), sys_sigreturn(); | |
120 | -int sys_fsync(), sys_clone(), sys_setdomainname(), sys_sysinfo(); | |
121 | -int sys_modify_ldt(), sys_adjtimex(), sys_mprotect(); | |
122 | -int sys_sigprocmask(), sys_create_module(), sys_init_module(); | |
123 | -int sys_delete_module(), sys_get_kernel_syms(), sys_quotactl(); | |
124 | -int sys_getpgid(), sys_fchdir(), sys_bdflush(); | |
125 | -int sys_sysfs(), sys_personality(), sys_afs_syscall(); | |
126 | -int sys_setfsuid(), sys_setfsgid(), sys_llseek(); | |
127 | -int sys_getdents(), sys_flock(), sys_msync(); | |
128 | -int sys_readv(), sys_writev(), sys_select(); | |
129 | -int sys_getsid(), sys_fdatasync(), sys_sysctl(); | |
130 | -int sys_mlock(), sys_munlock(), sys_mlockall(), sys_munlockall(); | |
131 | -int sys_sched_setparam(), sys_sched_getparam(); | |
132 | -int sys_sched_setscheduler(), sys_sched_getscheduler(), sys_sched_yield(); | |
133 | -int sys_sched_get_priority_max(), sys_sched_get_priority_min(); | |
134 | -int sys_sched_rr_get_interval(), sys_nanosleep(), sys_mremap(); | |
135 | -int sys_sendmsg(), sys_recvmsg(); | |
136 | - | |
137 | -/* sys_socketcall subcalls */ | |
138 | - | |
139 | -int sys_socket(), sys_bind(), sys_connect(), sys_listen(); | |
140 | -int sys_accept(), sys_getsockname(), sys_getpeername(), sys_socketpair(); | |
141 | -int sys_send(), sys_recv(), sys_sendto(), sys_recvfrom(); | |
142 | -int sys_shutdown(), sys_setsockopt(), sys_getsockopt(); | |
143 | - | |
144 | -#ifndef ALPHA | |
145 | -#define SYS_socket_subcall 180 | |
146 | -#define SYS_socket (SYS_socket_subcall + 1) | |
147 | -#define SYS_bind (SYS_socket_subcall + 2) | |
148 | -#define SYS_connect (SYS_socket_subcall + 3) | |
149 | -#define SYS_listen (SYS_socket_subcall + 4) | |
150 | -#define SYS_accept (SYS_socket_subcall + 5) | |
151 | -#define SYS_getsockname (SYS_socket_subcall + 6) | |
152 | -#define SYS_getpeername (SYS_socket_subcall + 7) | |
153 | -#define SYS_socketpair (SYS_socket_subcall + 8) | |
154 | -#define SYS_send (SYS_socket_subcall + 9) | |
155 | -#define SYS_recv (SYS_socket_subcall + 10) | |
156 | -#define SYS_sendto (SYS_socket_subcall + 11) | |
157 | -#define SYS_recvfrom (SYS_socket_subcall + 12) | |
158 | -#define SYS_shutdown (SYS_socket_subcall + 13) | |
159 | -#define SYS_setsockopt (SYS_socket_subcall + 14) | |
160 | -#define SYS_getsockopt (SYS_socket_subcall + 15) | |
161 | - | |
162 | -#define SYS_socket_nsubcalls 16 | |
163 | -#endif /* !ALPHA */ | |
164 | - | |
165 | -/* sys_ipc subcalls */ | |
166 | - | |
167 | -int sys_semget(), sys_semctl(); | |
168 | -int sys_msgsnd(), sys_msgrcv(), sys_msgget(), sys_msgctl(); | |
169 | -int sys_shmat(), sys_shmdt(), sys_shmget(), sys_shmctl(); | |
170 | - | |
171 | -#ifndef ALPHA | |
172 | -#define SYS_ipc_subcall 200 | |
173 | -#define SYS_semop (SYS_ipc_subcall + 1) | |
174 | -#define SYS_semget (SYS_ipc_subcall + 2) | |
175 | -#define SYS_semctl (SYS_ipc_subcall + 3) | |
176 | -#define SYS_msgsnd (SYS_ipc_subcall + 11) | |
177 | -#define SYS_msgrcv (SYS_ipc_subcall + 12) | |
178 | -#define SYS_msgget (SYS_ipc_subcall + 13) | |
179 | -#define SYS_msgctl (SYS_ipc_subcall + 14) | |
180 | -#define SYS_shmat (SYS_ipc_subcall + 21) | |
181 | -#define SYS_shmdt (SYS_ipc_subcall + 22) | |
182 | -#define SYS_shmget (SYS_ipc_subcall + 23) | |
183 | -#define SYS_shmctl (SYS_ipc_subcall + 24) | |
184 | - | |
185 | -#define SYS_ipc_nsubcalls 25 | |
186 | -#endif /* ALPHA */ | |
187 | - | |
188 | -#ifdef ALPHA | |
189 | -int osf_statfs(), osf_fstatfs(), sys_getpagesize(), sys_madvise(); | |
190 | -int sys_setpgrp(), sys_gethostname(), sys_getdtablesize(), sys_utimes(); | |
191 | -#endif | |
192 | - | |
193 | -int sys__llseek(), sys__newselect(), sys__sysctl(), sys_klog(); | |
194 | -int sys_prev_fstat(), sys_prev_lstat(), sys_prev_mknod(), sys_prev_stat(); | |
195 | -int sys_prev_ustat(), sys_syscall_flock(), sys_syscall_readv(); | |
196 | -int sys_syscall_writev(); | |
197 | - | |
198 | -#include "syscall1.h" | |
ed799d14 AM |
199 | diff -urN strace-4.3.org/linux/sparc/syscallent.h strace-4.3/linux/sparc/syscallent.h |
200 | --- strace-4.3.org/linux/sparc/syscallent.h Wed Apr 4 19:25:52 2001 | |
201 | +++ strace-4.3/linux/sparc/syscallent.h Wed Apr 4 19:52:01 2001 | |
202 | @@ -269,22 +269,24 @@ | |
de4e0a62 JR |
203 | { 5, 0, printargs, "SYS_264" }, /* 264 */ |
204 | { 5, 0, printargs, "SYS_265" }, /* 265 */ | |
205 | { 5, 0, printargs, "SYS_266" }, /* 266 */ | |
206 | + | |
207 | { 5, 0, printargs, "SYS_267" }, /* 267 */ | |
208 | - { 5, 0, printargs, "SYS_268" }, /* 268 */ | |
209 | - { 5, 0, printargs, "SYS_269" }, /* 269 */ | |
210 | - { 5, 0, printargs, "SYS_270" }, /* 270 */ | |
211 | - { 5, 0, printargs, "SYS_271" }, /* 271 */ | |
212 | - { 5, 0, printargs, "SYS_272" }, /* 272 */ | |
213 | - { 5, 0, printargs, "SYS_273" }, /* 273 */ | |
214 | - { 5, 0, printargs, "SYS_274" }, /* 274 */ | |
215 | - { 5, 0, printargs, "SYS_275" }, /* 275 */ | |
216 | - { 5, 0, printargs, "SYS_276" }, /* 276 */ | |
217 | - { 5, 0, printargs, "SYS_277" }, /* 277 */ | |
218 | - { 5, 0, printargs, "SYS_278" }, /* 278 */ | |
219 | - { 5, 0, printargs, "SYS_279" }, /* 279 */ | |
220 | - { 5, 0, printargs, "SYS_280" }, /* 280 */ | |
221 | - { 5, 0, printargs, "SYS_281" }, /* 281 */ | |
222 | - { 5, 0, printargs, "SYS_282" }, /* 282 */ | |
223 | + { 3, TN, sys_socket, "socket" }, /* 268 */ | |
224 | + { 3, TN, sys_bind, "bind" }, /* 269 */ | |
225 | + { 3, TN, sys_connect, "connect" }, /* 270 */ | |
226 | + { 2, TN, sys_listen, "listen" }, /* 271 */ | |
227 | + { 3, TN, sys_accept, "accept" }, /* 272 */ | |
228 | + { 3, TN, sys_getsockname,"getsockname" }, /* 273 */ | |
229 | + { 3, TN, sys_getpeername,"getpeername" }, /* 274 */ | |
230 | + { 5, TN, sys_socketpair, "socketpair" }, /* 275 */ | |
231 | + { 4, TN, sys_send, "send" }, /* 276 */ | |
232 | + { 4, TN, sys_recv, "recv" }, /* 277 */ | |
233 | + { 6, TN, sys_sendto, "sendto" }, /* 278 */ | |
234 | + { 6, TN, sys_recvfrom, "recvfrom" }, /* 279 */ | |
235 | + { 2, TN, sys_shutdown, "shutdown" }, /* 280 */ | |
236 | + { 5, TN, sys_setsockopt, "setsockopt" }, /* 281 */ | |
237 | + { 5, TN, sys_getsockopt, "getsockopt" }, /* 282 */ | |
238 | + | |
239 | { 5, 0, printargs, "SYS_283" }, /* 283 */ | |
240 | { 5, 0, printargs, "SYS_284" }, /* 284 */ | |
241 | { 5, 0, printargs, "SYS_285" }, /* 285 */ | |
ed799d14 AM |
242 | diff -urN strace-4.3.org/syscall.c strace-4.3/syscall.c |
243 | --- strace-4.3.org/syscall.c Wed Apr 4 19:25:52 2001 | |
244 | +++ strace-4.3/syscall.c Wed Apr 4 19:57:33 2001 | |
245 | @@ -444,48 +444,6 @@ | |
de4e0a62 | 246 | |
ed799d14 | 247 | #if !(defined(LINUX) && ( defined(ALPHA) || defined(IA64) || defined(MIPS) )) |
de4e0a62 JR |
248 | |
249 | -const int socket_map [] = { | |
250 | - /* SYS_SOCKET */ 97, | |
251 | - /* SYS_BIND */ 104, | |
252 | - /* SYS_CONNECT */ 98, | |
253 | - /* SYS_LISTEN */ 106, | |
254 | - /* SYS_ACCEPT */ 99, | |
255 | - /* SYS_GETSOCKNAME */ 150, | |
256 | - /* SYS_GETPEERNAME */ 141, | |
257 | - /* SYS_SOCKETPAIR */ 135, | |
258 | - /* SYS_SEND */ 101, | |
259 | - /* SYS_RECV */ 102, | |
260 | - /* SYS_SENDTO */ 133, | |
261 | - /* SYS_RECVFROM */ 125, | |
262 | - /* SYS_SHUTDOWN */ 134, | |
263 | - /* SYS_SETSOCKOPT */ 105, | |
264 | - /* SYS_GETSOCKOPT */ 118, | |
265 | - /* SYS_SENDMSG */ 114, | |
266 | - /* SYS_RECVMSG */ 113 | |
267 | -}; | |
268 | - | |
269 | -void | |
270 | -sparc_socket_decode (tcp) | |
271 | -struct tcb *tcp; | |
272 | -{ | |
273 | - volatile long addr; | |
274 | - volatile int i, n; | |
275 | - | |
276 | - if (tcp->u_arg [0] < 1 || tcp->u_arg [0] > sizeof(socket_map)/sizeof(int)+1){ | |
277 | - return; | |
278 | - } | |
279 | - tcp->scno = socket_map [tcp->u_arg [0]-1]; | |
280 | - n = tcp->u_nargs = sysent [tcp->scno].nargs; | |
281 | - addr = tcp->u_arg [1]; | |
282 | - for (i = 0; i < n; i++){ | |
283 | - int arg; | |
284 | - if (umoven (tcp, addr, sizeof (arg), (void *) &arg) < 0) | |
285 | - arg = 0; | |
286 | - tcp->u_arg [i] = arg; | |
287 | - addr += sizeof (arg); | |
288 | - } | |
289 | -} | |
290 | - | |
291 | static void | |
292 | decode_subcall(tcp, subcall, nsubcalls, style) | |
293 | struct tcb *tcp; | |
ed799d14 AM |
294 | @@ -1564,21 +1522,18 @@ |
295 | ||
296 | switch (tcp->scno + NR_SYSCALL_BASE) { | |
de4e0a62 | 297 | #ifdef LINUX |
ed799d14 AM |
298 | -#if !defined (ALPHA) && !defined(IA64) && !defined(SPARC) && !defined(MIPS) && !defined(HPPA) |
299 | +#if !defined (ALPHA) && !defined(IA64) && !defined(MIPS) && !defined(HPPA) | |
de4e0a62 JR |
300 | case SYS_socketcall: |
301 | decode_subcall(tcp, SYS_socket_subcall, | |
302 | SYS_socket_nsubcalls, deref_style); | |
303 | break; | |
ed799d14 AM |
304 | +#endif /* !ALPHA && !IA64 && !MIPS */ |
305 | +#if !defined (ALPHA) && !defined(IA64) && !defined(SPARC) && !defined(MIPS) && !defined(HPPA) | |
de4e0a62 JR |
306 | case SYS_ipc: |
307 | decode_subcall(tcp, SYS_ipc_subcall, | |
308 | SYS_ipc_nsubcalls, shift_style); | |
309 | break; | |
ed799d14 | 310 | #endif /* !ALPHA && !IA64 && !MIPS && !SPARC */ |
de4e0a62 JR |
311 | -#ifdef SPARC |
312 | - case SYS_socketcall: | |
313 | - sparc_socket_decode (tcp); | |
314 | - break; | |
315 | -#endif | |
de4e0a62 JR |
316 | #endif /* LINUX */ |
317 | #ifdef SVR4 | |
318 | #ifdef SYS_pgrpsys_subcall |