glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move subcall decoding configuration out of the common code

Browse Source 
* Makefile.am (EXTRA_DIST): Add linux/subcall.h.
* linux/syscall.h (SYS_socket_subcall): Remove.
(SYS_socket_nsubcalls, SYS_ipc_subcall, SYS_ipc_nsubcalls): Move to ...
* linux/subcall.h: ... new file.
* linux/arm/syscallent.h: Define SYS_socket_subcall, include subcall.h.
* linux/i386/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/s390/syscallent.h: Likewise.
* linux/s390x/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.

Suggested by Mike Frysinger and Chris Metcalf.
This commit is contained in:
Дмитрий Левин 2013-05-07 18:38:01 +04:00
parent ebe3d3a640
commit de462cf99b
12 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -151,6 +151,7 @@ EXTRA_DIST = \
linux/sparc64/syscallent.h \
linux/sparc64/syscallent1.h \
linux/sparc64/syscallent2.h \
linux/subcall.h \
linux/syscall.h \
linux/tile/ioctlent.h.in \
linux/tile/syscallent.h \

5
linux/arm/syscallent.h
View File

@ -431,9 +431,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
# if SYS_socket_subcall != 400
# error fix me
# endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

6
linux/i386/syscallent.h
View File

@ -428,10 +428,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
#if SYS_socket_subcall != 400
#error fix me
#endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

6
linux/m68k/syscallent.h
View File

@ -426,10 +426,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
#if SYS_socket_subcall != 400
#error fix me
#endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

6
linux/powerpc/syscallent.h
View File

@ -426,10 +426,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
#if SYS_socket_subcall != 400
#error fix me
#endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

6
linux/s390/syscallent.h
View File

@ -428,10 +428,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
#if SYS_socket_subcall != 400
#error fix me
#endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

6
linux/s390x/syscallent.h
View File

@ -427,10 +427,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
#if SYS_socket_subcall != 400
#error fix me
#endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

6
linux/sh/syscallent.h
View File

@ -430,10 +430,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
#if SYS_socket_subcall != 400
#error fix me
#endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

6
linux/sh64/syscallent.h
View File

@ -426,10 +426,8 @@
{ 5, 0, NULL, NULL }, /* 397 */
{ 5, 0, NULL, NULL }, /* 398 */
{ 5, 0, NULL, NULL }, /* 399 */
#if SYS_socket_subcall != 400
#error fix me
#endif
#define SYS_socket_subcall 400
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 400 */
{ 3, TN, sys_socket, "socket" }, /* 401 */
{ 3, TN, sys_bind, "bind" }, /* 402 */

5
linux/sparc/syscallent.h
View File

@ -351,9 +351,8 @@
{ 5, 0, NULL, NULL }, /* 350 */
{ 5, 0, NULL, NULL }, /* 351 */
{ 5, 0, NULL, NULL }, /* 352 */
#if SYS_socket_subcall != 353
#error fix me
#endif
#define SYS_socket_subcall 353
#include "subcall.h"
{ 6, 0, printargs, "socket_subcall"}, /* 353 */
{ 3, TN, sys_socket, "socket" }, /* 354 */
{ 3, TN, sys_bind, "bind" }, /* 355 */

6
linux/subcall.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef SYS_socket_subcall
# error SYS_socket_subcall is not defined
#endif
#define SYS_socket_nsubcalls 20
#define SYS_ipc_subcall ((SYS_socket_subcall)+(SYS_socket_nsubcalls))
#define SYS_ipc_nsubcalls 25

24
linux/syscall.h
View File

@ -313,30 +313,6 @@ int sys_osf_utimes();
int sys_osf_wait4();
#endif
#if defined ALPHA \
|| defined __ARM_EABI__ \
|| defined BFIN \
|| defined HPPA \
|| defined METAG \
|| defined MIPS \
|| defined TILE \
|| defined XTENSA
/*
* This architecture does not have a socketcall or ipc subcall,
* it has dedicated syscalls instead, so there is no need
* to implement socket or ipc subcall decoding.
*/
#else
# if defined SPARC || defined SPARC64
# define SYS_socket_subcall 353
# else
# define SYS_socket_subcall 400
# endif
# define SYS_socket_nsubcalls 20
# define SYS_ipc_subcall ((SYS_socket_subcall)+(SYS_socket_nsubcalls))
# define SYS_ipc_nsubcalls 25
#endif
#if defined(ALPHA) || defined(IA64) || defined(SPARC) || defined(SPARC64)
int sys_getpagesize();
#endif