Skip to content

Commit

Permalink
linux/x32/syscallent.h: change 64-bit syscall designation
Browse files Browse the repository at this point in the history 
Current way of designation of 64-bit specific syscalls in x32
personality not only conflicts with fault injection specification
syntax, but also makes it impossible to specify such syscalls at all
(since everything that starts from a digit is considered a syscall
number specification).  So, let's change prefix to suffix and use
octothorpe instead of colon as a separator.

* linux/x32/syscallent.h (13, 15, 16, 19, 20, 45, 46, 47, 54, 55, 59,
101, 127, 128. 129, 131, 134, 156, 174, 177, 178, 180, 205, 206, 209,
211, 214, 215, 222, 236, 244, 246, 247, 273, 274, 278, 279, 295, 296,
297, 299, 307, 310, 311, 32, 327, 328): Change "64:" prefix to "strace#64"
suffix in syscall name.

Closes: strace#36
  • Loading branch information
@esyr
esyr committed May 16, 2018
1 parent e037547 commit 1241c19
Showing 1 changed file with 47 additions and 47 deletions.
94 changes: 47 additions & 47 deletions linux/x32/syscallent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
[ 10] = { 3, TM|SI, SEN(mprotect), "mprotect" },
[ 11] = { 2, TM|SI, SEN(munmap), "munmap" },
[ 12] = { 1, TM|SI, SEN(brk), "brk" },
[ 13] = { 4, TS, SEN(printargs), "64:rt_sigaction" },
[ 13] = { 4, TS, SEN(printargs), "rt_sigaction#64" },
[ 14] = { 4, TS, SEN(rt_sigprocmask), "rt_sigprocmask" },
[ 15] = { 0, TS, SEN(rt_sigreturn), "64:rt_sigreturn" },
[ 16] = { 3, TD, SEN(printargs), "64:ioctl" },
[ 15] = { 0, TS, SEN(rt_sigreturn), "rt_sigreturn#64" },
[ 16] = { 3, TD, SEN(printargs), "ioctl#64" },
[ 17] = { 4, TD, SEN(pread), "pread64" },
[ 18] = { 4, TD, SEN(pwrite), "pwrite64" },
[ 19] = { 3, TD, SEN(printargs), "64:readv" },
[ 20] = { 3, TD, SEN(printargs), "64:writev" },
[ 19] = { 3, TD, SEN(printargs), "readv#64" },
[ 20] = { 3, TD, SEN(printargs), "writev#64" },
[ 21] = { 2, TF, SEN(access), "access" },
[ 22] = { 1, TD, SEN(pipe), "pipe" },
[ 23] = { 5, TD, SEN(select), "select" },
Expand All @@ -43,21 +43,21 @@
[ 42] = { 3, TN, SEN(connect), "connect" },
[ 43] = { 3, TN, SEN(accept), "accept" },
[ 44] = { 6, TN, SEN(sendto), "sendto" },
[ 45] = { 6, TN, SEN(printargs), "64:recvfrom" },
[ 46] = { 3, TN, SEN(printargs), "64:sendmsg" },
[ 47] = { 3, TN, SEN(printargs), "64:recvmsg" },
[ 45] = { 6, TN, SEN(printargs), "recvfrom#64" },
[ 46] = { 3, TN, SEN(printargs), "sendmsg#64" },
[ 47] = { 3, TN, SEN(printargs), "recvmsg#64" },
[ 48] = { 2, TN, SEN(shutdown), "shutdown" },
[ 49] = { 3, TN, SEN(bind), "bind" },
[ 50] = { 2, TN, SEN(listen), "listen" },
[ 51] = { 3, TN, SEN(getsockname), "getsockname" },
[ 52] = { 3, TN, SEN(getpeername), "getpeername" },
[ 53] = { 4, TN, SEN(socketpair), "socketpair" },
[ 54] = { 5, TN, SEN(printargs), "64:setsockopt" },
[ 55] = { 5, TN, SEN(printargs), "64:getsockopt" },
[ 54] = { 5, TN, SEN(printargs), "setsockopt#64" },
[ 55] = { 5, TN, SEN(printargs), "getsockopt#64" },
[ 56] = { 5, TP, SEN(clone), "clone" },
[ 57] = { 0, TP, SEN(fork), "fork" },
[ 58] = { 0, TP, SEN(vfork), "vfork" },
[ 59] = { 3, TF|TP|SE|SI, SEN(printargs), "64:execve" },
[ 59] = { 3, TF|TP|SE|SI, SEN(printargs), "execve#64" },
[ 60] = { 1, TP|SE, SEN(exit), "exit" },
[ 61] = { 4, TP, SEN(wait4), "wait4" },
[ 62] = { 2, TS, SEN(kill), "kill" },
Expand Down Expand Up @@ -99,7 +99,7 @@
[ 98] = { 2, 0, SEN(getrusage), "getrusage" },
[ 99] = { 1, 0, SEN(sysinfo), "sysinfo" },
[100] = { 1, 0, SEN(times), "times" },
[101] = { 4, 0, SEN(printargs), "64:ptrace" },
[101] = { 4, 0, SEN(printargs), "ptrace#64" },
[102] = { 0, PU|NF, SEN(getuid), "getuid" },
[103] = { 3, 0, SEN(syslog), "syslog" },
[104] = { 0, PU|NF, SEN(getgid), "getgid" },
Expand All @@ -125,14 +125,14 @@
[124] = { 1, 0, SEN(getsid), "getsid" },
[125] = { 2, 0, SEN(capget), "capget" },
[126] = { 2, 0, SEN(capset), "capset" },
[127] = { 2, TS, SEN(printargs), "64:rt_sigpending" },
[128] = { 4, TS, SEN(printargs), "64:rt_sigtimedwait" },
[129] = { 3, TS, SEN(printargs), "64:rt_sigqueueinfo" },
[127] = { 2, TS, SEN(printargs), "rt_sigpending#64" },
[128] = { 4, TS, SEN(printargs), "rt_sigtimedwait#64" },
[129] = { 3, TS, SEN(printargs), "rt_sigqueueinfo#64" },
[130] = { 2, TS, SEN(rt_sigsuspend), "rt_sigsuspend" },
[131] = { 2, TS, SEN(printargs), "64:sigaltstack" },
[131] = { 2, TS, SEN(printargs), "sigaltstack#64" },
[132] = { 2, TF, SEN(utime), "utime" },
[133] = { 3, TF, SEN(mknod), "mknod" },
[134] = { 1, TF, SEN(printargs), "64:uselib" },
[134] = { 1, TF, SEN(printargs), "uselib#64" },
[135] = { 1, NF, SEN(personality), "personality" },
[136] = { 2, TSFA, SEN(ustat), "ustat" },
[137] = { 2, TF|TSF|TSFA, SEN(statfs), "statfs" },
Expand All @@ -154,7 +154,7 @@
[153] = { 0, 0, SEN(vhangup), "vhangup" },
[154] = { 3, 0, SEN(modify_ldt), "modify_ldt" },
[155] = { 2, TF, SEN(pivotroot), "pivot_root" },
[156] = { 1, 0, SEN(printargs), "64:_sysctl" },
[156] = { 1, 0, SEN(printargs), "_sysctl#64" },
[157] = { 5, 0, SEN(prctl), "prctl" },
[158] = { 2, TP, SEN(arch_prctl), "arch_prctl" },
[159] = { 1, 0, SEN(adjtimex), "adjtimex" },
Expand All @@ -172,13 +172,13 @@
[171] = { 2, 0, SEN(setdomainname), "setdomainname" },
[172] = { 1, 0, SEN(iopl), "iopl" },
[173] = { 3, 0, SEN(ioperm), "ioperm" },
[174] = { 2, 0, SEN(printargs), "64:create_module" },
[174] = { 2, 0, SEN(printargs), "create_module#64" },
[175] = { 3, 0, SEN(init_module), "init_module" },
[176] = { 2, 0, SEN(delete_module), "delete_module" },
[177] = { 1, 0, SEN(printargs), "64:get_kernel_syms" },
[178] = { 5, 0, SEN(printargs), "64:query_module" },
[177] = { 1, 0, SEN(printargs), "get_kernel_syms#64" },
[178] = { 5, 0, SEN(printargs), "query_module#64" },
[179] = { 4, TF, SEN(quotactl), "quotactl" },
[180] = { 3, 0, SEN(printargs), "64:nfsservctl" },
[180] = { 3, 0, SEN(printargs), "nfsservctl#64" },
[181] = { 5, TN, SEN(getpmsg), "getpmsg" },
[182] = { 5, TN, SEN(putpmsg), "putpmsg" },
[183] = { 5, 0, SEN(afs_syscall), "afs_syscall" },
Expand All @@ -203,24 +203,24 @@
[202] = { 6, 0, SEN(futex), "futex" },
[203] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" },
[204] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" },
[205] = { 1, 0, SEN(printargs), "64:set_thread_area" },
[206] = { 2, TM, SEN(printargs), "64:io_setup" },
[205] = { 1, 0, SEN(printargs), "set_thread_area#64" },
[206] = { 2, TM, SEN(printargs), "io_setup#64" },
[207] = { 1, TM, SEN(io_destroy), "io_destroy" },
[208] = { 5, 0, SEN(io_getevents), "io_getevents" },
[209] = { 3, 0, SEN(printargs), "64:io_submit" },
[209] = { 3, 0, SEN(printargs), "io_submit#64" },
[210] = { 3, 0, SEN(io_cancel), "io_cancel" },
[211] = { 1, 0, SEN(printargs), "64:get_thread_area" },
[211] = { 1, 0, SEN(printargs), "get_thread_area#64" },
[212] = { 3, 0, SEN(lookup_dcookie), "lookup_dcookie" },
[213] = { 1, TD, SEN(epoll_create), "epoll_create" },
[214] = { 4, 0, SEN(printargs), "64:epoll_ctl_old" },
[215] = { 4, 0, SEN(printargs), "64:epoll_wait_old" },
[214] = { 4, 0, SEN(printargs), "epoll_ctl_old#64" },
[215] = { 4, 0, SEN(printargs), "epoll_wait_old#64" },
[216] = { 5, TM|SI, SEN(remap_file_pages), "remap_file_pages" },
[217] = { 3, TD, SEN(getdents64), "getdents64" },
[218] = { 1, 0, SEN(set_tid_address), "set_tid_address" },
[219] = { 0, 0, SEN(restart_syscall), "restart_syscall" },
[220] = { 4, TI, SEN(semtimedop), "semtimedop" },
[221] = { 4, TD, SEN(fadvise64), "fadvise64" },
[222] = { 3, 0, SEN(printargs), "64:timer_create" },
[222] = { 3, 0, SEN(printargs), "timer_create#64" },
[223] = { 4, 0, SEN(timer_settime), "timer_settime" },
[224] = { 2, 0, SEN(timer_gettime), "timer_gettime" },
[225] = { 1, 0, SEN(timer_getoverrun), "timer_getoverrun" },
Expand All @@ -234,18 +234,18 @@
[233] = { 4, TD, SEN(epoll_ctl), "epoll_ctl" },
[234] = { 3, TS, SEN(tgkill), "tgkill" },
[235] = { 2, TF, SEN(utimes), "utimes" },
[236] = { 5, 0, SEN(printargs), "64:vserver" },
[236] = { 5, 0, SEN(printargs), "vserver#64" },
[237] = { 6, TM, SEN(mbind), "mbind" },
[238] = { 3, TM, SEN(set_mempolicy), "set_mempolicy" },
[239] = { 5, TM, SEN(get_mempolicy), "get_mempolicy" },
[240] = { 4, TD, SEN(mq_open), "mq_open" },
[241] = { 1, 0, SEN(mq_unlink), "mq_unlink" },
[242] = { 5, TD, SEN(mq_timedsend), "mq_timedsend" },
[243] = { 5, TD, SEN(mq_timedreceive), "mq_timedreceive" },
[244] = { 2, 0, SEN(printargs), "64:mq_notify" },
[244] = { 2, 0, SEN(printargs), "mq_notify#64" },
[245] = { 3, TD, SEN(mq_getsetattr), "mq_getsetattr" },
[246] = { 4, 0, SEN(printargs), "64:kexec_load" },
[247] = { 5, TP, SEN(printargs), "64:waitid" },
[246] = { 4, 0, SEN(printargs), "kexec_load#64" },
[247] = { 5, TP, SEN(printargs), "waitid#64" },
[248] = { 5, 0, SEN(add_key), "add_key" },
[249] = { 4, 0, SEN(request_key), "request_key" },
[250] = { 5, 0, SEN(keyctl), "keyctl" },
Expand All @@ -271,13 +271,13 @@
[270] = { 6, TD, SEN(pselect6), "pselect6" },
[271] = { 5, TD, SEN(ppoll), "ppoll" },
[272] = { 1, TP, SEN(unshare), "unshare" },
[273] = { 2, 0, SEN(printargs), "64:set_robust_list" },
[274] = { 3, 0, SEN(printargs), "64:get_robust_list" },
[273] = { 2, 0, SEN(printargs), "set_robust_list#64" },
[274] = { 3, 0, SEN(printargs), "get_robust_list#64" },
[275] = { 6, TD, SEN(splice), "splice" },
[276] = { 4, TD, SEN(tee), "tee" },
[277] = { 4, TD, SEN(sync_file_range), "sync_file_range" },
[278] = { 4, TD, SEN(printargs), "64:vmsplice" },
[279] = { 6, TM, SEN(printargs), "64:move_pages" },
[278] = { 4, TD, SEN(printargs), "vmsplice#64" },
[279] = { 6, TM, SEN(printargs), "move_pages#64" },
[280] = { 4, TD|TF, SEN(utimensat), "utimensat" },
[281] = { 6, TD, SEN(epoll_pwait), "epoll_pwait" },
[282] = { 3, TD|TS, SEN(signalfd), "signalfd" },
Expand All @@ -293,23 +293,23 @@
[292] = { 3, TD, SEN(dup3), "dup3" },
[293] = { 2, TD, SEN(pipe2), "pipe2" },
[294] = { 1, TD, SEN(inotify_init1), "inotify_init1" },
[295] = { 4, TD, SEN(printargs), "64:preadv" },
[296] = { 4, TD, SEN(printargs), "64:pwritev" },
[297] = { 4, TP|TS, SEN(printargs), "64:rt_tgsigqueueinfo" },
[295] = { 4, TD, SEN(printargs), "preadv#64" },
[296] = { 4, TD, SEN(printargs), "pwritev#64" },
[297] = { 4, TP|TS, SEN(printargs), "rt_tgsigqueueinfo#64" },
[298] = { 5, TD, SEN(perf_event_open), "perf_event_open" },
[299] = { 5, TN, SEN(printargs), "64:recvmmsg" },
[299] = { 5, TN, SEN(printargs), "recvmmsg#64" },
[300] = { 2, TD, SEN(fanotify_init), "fanotify_init" },
[301] = { 5, TD|TF, SEN(fanotify_mark), "fanotify_mark" },
[302] = { 4, 0, SEN(prlimit64), "prlimit64" },
[303] = { 5, TD|TF, SEN(name_to_handle_at), "name_to_handle_at" },
[304] = { 3, TD, SEN(open_by_handle_at), "open_by_handle_at" },
[305] = { 2, 0, SEN(clock_adjtime), "clock_adjtime" },
[306] = { 1, TD, SEN(syncfs), "syncfs" },
[307] = { 4, TN, SEN(printargs), "64:sendmmsg" },
[307] = { 4, TN, SEN(printargs), "sendmmsg#64" },
[308] = { 2, TD, SEN(setns), "setns" },
[309] = { 3, 0, SEN(getcpu), "getcpu" },
[310] = { 6, 0, SEN(printargs), "64:process_vm_readv" },
[311] = { 6, 0, SEN(printargs), "64:process_vm_writev" },
[310] = { 6, 0, SEN(printargs), "process_vm_readv#64" },
[311] = { 6, 0, SEN(printargs), "process_vm_writev#64" },
[312] = { 5, 0, SEN(kcmp), "kcmp" },
[313] = { 3, TD, SEN(finit_module), "finit_module" },
[314] = { 3, 0, SEN(sched_setattr), "sched_setattr" },
Expand All @@ -320,13 +320,13 @@
[319] = { 2, TD, SEN(memfd_create), "memfd_create" },
[320] = { 5, TD, SEN(kexec_file_load), "kexec_file_load" },
[321] = { 3, TD, SEN(bpf), "bpf" },
[322] = { 5, TD|TF|TP|SE|SI, SEN(printargs), "64:execveat" },
[322] = { 5, TD|TF|TP|SE|SI, SEN(printargs), "execveat#64" },
[323] = { 1, TD, SEN(userfaultfd), "userfaultfd" },
[324] = { 2, 0, SEN(membarrier), "membarrier" },
[325] = { 3, TM, SEN(mlock2), "mlock2" },
[326] = { 6, TD, SEN(copy_file_range), "copy_file_range" },
[327] = { 6, TD, SEN(printargs), "64:preadv2" },
[328] = { 6, TD, SEN(printargs), "64:pwritev2" },
[327] = { 6, TD, SEN(printargs), "preadv2#64" },
[328] = { 6, TD, SEN(printargs), "pwritev2#64" },
[329] = { 4, TM|SI, SEN(pkey_mprotect), "pkey_mprotect" },
[330] = { 2, 0, SEN(pkey_alloc), "pkey_alloc" },
[331] = { 1, 0, SEN(pkey_free), "pkey_free" },
Expand Down

0 comments on commit 1241c19

Please sign in to comment.