From: Ezequiel G. <eze...@va...> - 2014-01-27 01:22:49
|
* Makefile.am, configure.ac: Add nios2 architecture * defs.h: Add nios2 to use register reading system * linux/nios2/ioctlent.h.in: Use i386 ioctls * linux/nios2/syscallent.h: New file * process.c: Add nios2 register defs to struct_user_offsets[] * syscall.c: Add nios2 support, for get_scno, get_regs, get_syscall_args and get_error * util.c: Add dummy handling * system.c: Add nios2 specific syscalls. Signed-off-by: Ezequiel Garcia <eze...@va...> --- Makefile.am | 2 + configure.ac | 4 + defs.h | 3 +- linux/nios2/ioctlent.h.in | 1 + linux/nios2/syscallent.h | 370 ++++++++++++++++++++++++++++++++++++++++++++++ linux/syscall.h | 6 + process.c | 38 +++++ syscall.c | 32 ++++ system.c | 29 ++++ util.c | 2 + 10 files changed, 486 insertions(+), 1 deletion(-) create mode 100644 linux/nios2/ioctlent.h.in create mode 100644 linux/nios2/syscallent.h diff --git a/Makefile.am b/Makefile.am index c98d8b9..2ccde2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,6 +112,8 @@ EXTRA_DIST = \ linux/metag/syscallent.h \ linux/microblaze/ioctlent.h.in \ linux/microblaze/syscallent.h \ + linux/nios2/ioctlent.h.in \ + linux/nios2/syscallent.h \ linux/mips/errnoent.h \ linux/mips/ioctlent.h.in \ linux/mips/ioctlent.sh \ diff --git a/configure.ac b/configure.ac index be28ebe..90edb32 100644 --- a/configure.ac +++ b/configure.ac @@ -125,6 +125,10 @@ microblaze*) arch=microblaze AC_DEFINE([MICROBLAZE], 1, [Define for the MicroBlaze architecture.]) ;; +nios2*) + arch=nios2 + AC_DEFINE([NIOS2], 1, [Define for the Nios-II architecture.]) + ;; or1k*) arch=or1k AC_DEFINE([OR1K], 1, [Define for the OpenRISC 1000 architecture.]) diff --git a/defs.h b/defs.h index 95d2571..61c5fda 100644 --- a/defs.h +++ b/defs.h @@ -598,7 +598,8 @@ extern void call_summary(FILE *); || defined(OR1K) \ || defined(METAG) \ || defined(ARC) \ - || defined(POWERPC) + || defined(POWERPC) \ + || defined(NIOS2) extern long get_regs_error; # define clear_regs() (get_regs_error = -1) extern void get_regs(pid_t pid); diff --git a/linux/nios2/ioctlent.h.in b/linux/nios2/ioctlent.h.in new file mode 100644 index 0000000..52ac99b --- /dev/null +++ b/linux/nios2/ioctlent.h.in @@ -0,0 +1 @@ +#include "../i386/ioctlent.h.in" diff --git a/linux/nios2/syscallent.h b/linux/nios2/syscallent.h new file mode 100644 index 0000000..95fd619 --- /dev/null +++ b/linux/nios2/syscallent.h @@ -0,0 +1,370 @@ +/* + * Copyright (c) 2014 Ezequiel Garcia <eze...@va...> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ + { 1, TP, sys_exit, "_exit" }, /* 1 */ + { 0, TP, sys_fork, "fork" }, /* 2 */ + { 3, TD, sys_read, "read" }, /* 3 */ + { 3, TD, sys_write, "write" }, /* 4 */ + { 3, TD|TF, sys_open, "open" }, /* 5 */ + { 1, TD, sys_close, "close" }, /* 6 */ + { 3, TP, sys_waitpid, "waitpid" }, /* 7 */ + { 2, TD|TF, sys_creat, "creat" }, /* 8 */ + { 2, TF, sys_link, "link" }, /* 9 */ + { 1, TF, sys_unlink, "unlink" }, /* 10 */ + { 3, TF|TP, sys_execve, "execve" }, /* 11 */ + { 1, TF, sys_chdir, "chdir" }, /* 12 */ + { 1, 0, sys_time, "time" }, /* 13 */ + { 3, TF, sys_mknod, "mknod" }, /* 14 */ + { 2, TF, sys_chmod, "chmod" }, /* 15 */ + { 3, TF, sys_chown, "lchown" }, /* 16 */ + { 0, TM, NULL, NULL }, /* 17 */ + { 2, TF, NULL, NULL }, /* 18 */ + { 3, TD, sys_lseek, "lseek" }, /* 19 */ + { 0, 0, sys_getpid, "getpid" }, /* 20 */ + { 5, TF, sys_mount, "mount" }, /* 21 */ + { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, 0, sys_setuid, "setuid" }, /* 23 */ + { 0, NF, sys_getuid, "getuid" }, /* 24 */ + { 1, 0, sys_stime, "stime" }, /* 25 */ + { 4, 0, sys_ptrace, "ptrace" }, /* 26 */ + { 1, 0, sys_alarm, "alarm" }, /* 27 */ + { 2, TD, NULL, NULL }, /* 28 */ + { 0, TS, sys_pause, "pause" }, /* 29 */ + { 2, TF, sys_utime, "utime" }, /* 30 */ + { 2, 0, NULL, NULL }, /* 31 */ + { 2, 0, NULL, NULL }, /* 32 */ + { 2, TF, sys_access, "access" }, /* 33 */ + { 1, 0, sys_nice, "nice" }, /* 34 */ + { 0, 0, NULL, NULL }, /* 35 */ + { 0, 0, sys_sync, "sync" }, /* 36 */ + { 2, TS, sys_kill, "kill" }, /* 37 */ + { 2, TF, sys_rename, "rename" }, /* 38 */ + { 2, TF, sys_mkdir, "mkdir" }, /* 39 */ + { 1, TF, sys_rmdir, "rmdir" }, /* 40 */ + { 1, TD, sys_dup, "dup" }, /* 41 */ + { 1, TD, sys_pipe, "pipe" }, /* 42 */ + { 1, 0, sys_times, "times" }, /* 43 */ + { 0, 0, NULL, NULL }, /* 44 */ + { 1, TM, sys_brk, "brk" }, /* 45 */ + { 1, 0, sys_setgid, "setgid" }, /* 46 */ + { 0, NF, sys_getgid, "getgid" }, /* 47 */ + { 3, TS, NULL, NULL }, /* 48 */ + { 0, NF, sys_geteuid, "geteuid" }, /* 49 */ + { 0, NF, sys_getegid, "getegid" }, /* 50 */ + { 1, TF, sys_acct, "acct" }, /* 51 */ + { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 0, 0, NULL, NULL }, /* 53 */ + { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ + { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ + { 0, 0, NULL, NULL }, /* 56 */ + { 2, 0, sys_setpgid, "setpgid" }, /* 57 */ + { 2, 0, NULL, NULL }, /* 58 */ + { 1, 0, NULL, NULL }, /* 59 */ + { 1, 0, sys_umask, "umask" }, /* 60 */ + { 1, TF, sys_chroot, "chroot" }, /* 61 */ + { 2, 0, sys_ustat, "ustat" }, /* 62 */ + { 2, TD, sys_dup2, "dup2" }, /* 63 */ + { 0, 0, sys_getppid, "getppid" }, /* 64 */ + { 0, 0, sys_getpgrp, "getpgrp" }, /* 65 */ + { 0, 0, sys_setsid, "setsid" }, /* 66 */ + { 3, TS, sys_sigaction, "sigaction" }, /* 67 */ + { 0, TS, NULL, NULL }, /* 68 */ + { 1, TS, NULL, NULL }, /* 69 */ + { 2, 0, sys_setreuid, "setreuid" }, /* 70 */ + { 2, 0, sys_setregid, "setregid" }, /* 71 */ + { 3, TS, sys_sigsuspend, "sigsuspend" }, /* 72 */ + { 1, TS, sys_sigpending, "sigpending" }, /* 73 */ + { 2, 0, sys_sethostname, "sethostname" }, /* 74 */ + { 2, 0, sys_setrlimit, "setrlimit" }, /* 75 */ + { 2, 0, NULL, NULL }, /* 76 */ + { 2, 0, sys_getrusage, "getrusage" }, /* 77 */ + { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 78 */ + { 2, 0, sys_settimeofday, "settimeofday" }, /* 79 */ + { 2, 0, sys_getgroups, "getgroups" }, /* 80 */ + { 2, 0, sys_setgroups, "setgroups" }, /* 81 */ + { 1, TD, sys_oldselect, "oldselect" }, /* 82 */ + { 2, TF, sys_symlink, "symlink" }, /* 83 */ + { 2, TF, NULL, NULL }, /* 84 */ + { 3, TF, sys_readlink, "readlink" }, /* 85 */ + { 1, TF, sys_uselib, "uselib" }, /* 86 */ + { 2, TF, sys_swapon, "swapon" }, /* 87 */ + { 4, 0, sys_reboot, "reboot" }, /* 88 */ + { 3, TD, NULL, NULL }, /* 89 */ + { 6, TD|TM, sys_mmap, "old_mmap" }, /* 90 */ + { 2, TM, sys_munmap, "munmap" }, /* 91 */ + { 2, TF, sys_truncate, "truncate" }, /* 92 */ + { 2, TD, sys_ftruncate, "ftruncate" }, /* 93 */ + { 2, TD, sys_fchmod, "fchmod" }, /* 94 */ + { 3, TD, sys_fchown, "fchown" }, /* 95 */ + { 2, 0, sys_getpriority, "getpriority" }, /* 96 */ + { 3, 0, sys_setpriority, "setpriority" }, /* 97 */ + { 4, 0, NULL, NULL }, /* 98 */ + { 2, TF, sys_statfs, "statfs" }, /* 99 */ + { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ + { 3, 0, NULL, NULL }, /* 101 */ + { 2, TD, sys_socketcall, "socketcall" }, /* 102 */ + { 3, 0, sys_syslog, "syslog" }, /* 103 */ + { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ + { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ + { 2, TF, sys_stat, "stat" }, /* 106 */ + { 2, TF, sys_lstat, "lstat" }, /* 107 */ + { 2, TD, sys_fstat, "fstat" }, /* 108 */ + { 1, 0, NULL, NULL }, /* 109 */ + { 1, 0, NULL, NULL }, /* 110 */ + { 0, 0, sys_vhangup, "vhangup" }, /* 111 */ + { 0, 0, NULL, NULL }, /* 112 */ + { 1, 0, sys_nios2cmpxchg, "nios2_cmpxchg" }, /* 113 */ + { 4, TP, sys_wait4, "wait4" }, /* 114 */ + { 1, TF, sys_swapoff, "swapoff" }, /* 115 */ + { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ + { 6, TI, sys_ipc, "ipc" }, /* 117 */ + { 1, TD, sys_fsync, "fsync" }, /* 118 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 5, TP, sys_clone, "clone" }, /* 120 */ + { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ + { 1, 0, sys_uname, "uname" }, /* 122 */ + { 3, 0, sys_cacheflush, "cacheflush" }, /* 123 */ + { 1, 0, sys_adjtimex, "adjtimex" }, /* 124 */ + { 3, TM, sys_mprotect, "mprotect" }, /* 125 */ + { 3, TS, sys_sigprocmask, "sigprocmask" }, /* 126 */ + { 2, 0, NULL, NULL }, /* 127 */ + { 3, 0, sys_init_module, "init_module" }, /* 128 */ + { 2, 0, sys_delete_module, "delete_module" }, /* 129 */ + { 1, 0, NULL, NULL }, /* 130 */ + { 4, TF, sys_quotactl, "quotactl" }, /* 131 */ + { 1, 0, sys_getpgid, "getpgid" }, /* 132 */ + { 1, TD, sys_fchdir, "fchdir" }, /* 133 */ + { 0, 0, sys_bdflush, "bdflush" }, /* 134 */ + { 3, 0, sys_sysfs, "sysfs" }, /* 135 */ + { 1, 0, sys_personality, "personality" }, /* 136 */ + { 5, 0, NULL, NULL }, /* 137 */ + { 1, NF, sys_setfsuid, "setfsuid" }, /* 138 */ + { 1, NF, sys_setfsgid, "setfsgid" }, /* 139 */ + { 5, TD, sys_llseek, "_llseek" }, /* 140 */ + { 3, TD, sys_getdents, "getdents" }, /* 141 */ + { 5, TD, sys_select, "select" }, /* 142 */ + { 2, TD, sys_flock, "flock" }, /* 143 */ + { 3, TM, sys_msync, "msync" }, /* 144 */ + { 3, TD, sys_readv, "readv" }, /* 145 */ + { 3, TD, sys_writev, "writev" }, /* 146 */ + { 1, 0, sys_getsid, "getsid" }, /* 147 */ + { 1, TD, sys_fdatasync, "fdatasync" }, /* 148 */ + { 1, 0, sys_sysctl, "_sysctl" }, /* 149 */ + { 2, TM, sys_mlock, "mlock" }, /* 150 */ + { 2, TM, sys_munlock, "munlock" }, /* 151 */ + { 1, TM, sys_mlockall, "mlockall" }, /* 152 */ + { 0, TM, sys_munlockall, "munlockall" }, /* 153 */ + { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 154 */ + { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 155 */ + { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 156 */ + { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 157 */ + { 0, 0, sys_sched_yield, "sched_yield"}, /* 158 */ + { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */ + { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */ + { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */ + { 2, 0, sys_nanosleep, "nanosleep" }, /* 162 */ + { 5, TM, sys_mremap, "mremap" }, /* 163 */ + { 3, 0, sys_setresuid, "setresuid" }, /* 164 */ + { 3, 0, sys_getresuid, "getresuid" }, /* 165 */ + { 5, 0, sys_getpagesize, "getpagesize" }, /* 166 */ + { 5, 0, NULL, NULL }, /* 167 */ + { 3, TD, sys_poll, "poll" }, /* 168 */ + { 3, 0, NULL, NULL }, /* 169 */ + { 3, 0, sys_setresgid, "setresgid" }, /* 170 */ + { 3, 0, sys_getresgid, "getresgid" }, /* 171 */ + { 5, 0, sys_prctl, "prctl" }, /* 172 */ + { 0, TS, sys_rt_sigreturn, "rt_sigreturn" }, /* 173 */ + { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */ + { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 175 */ + { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */ + { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 177 */ + { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 178 */ + { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 179 */ + { 5, TD, sys_pread, "pread64" }, /* 180 */ + { 5, TD, sys_pwrite, "pwrite64" }, /* 181 */ + { 3, TF, sys_chown, "chown" }, /* 182 */ + { 2, TF, sys_getcwd, "getcwd" }, /* 183 */ + { 2, 0, sys_capget, "capget" }, /* 184 */ + { 2, 0, sys_capset, "capset" }, /* 185 */ + { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ + { 5, 0, NULL, NULL }, /* 188 */ + { 5, 0, NULL, NULL }, /* 189 */ + { 0, TP, sys_vfork, "vfork" }, /* 190 */ + { 2, 0, sys_getrlimit, "getrlimit" }, /* 191 */ + { 6, TD|TM, sys_mmap_pgoff, "mmap2" }, /* 192 */ + { 3, TF, sys_truncate64, "truncate64" }, /* 193 */ + { 3, TD, sys_ftruncate64, "ftruncate64" }, /* 194 */ + { 2, TF, sys_stat64, "stat64" }, /* 195 */ + { 2, TF, sys_lstat64, "lstat64" }, /* 196 */ + { 2, TD, sys_fstat64, "fstat64" }, /* 197 */ + { 3, TF, sys_chown, "lchown32" }, /* 198 */ + { 0, NF, sys_getuid, "getuid32" }, /* 199 */ + { 0, NF, sys_getgid, "getgid32" }, /* 200 */ + { 0, NF, sys_geteuid, "geteuid32" }, /* 201 */ + { 0, NF, sys_getegid, "getegid32" }, /* 202 */ + { 2, 0, sys_setreuid, "setreuid32" }, /* 203 */ + { 2, 0, sys_setregid, "setregid32" }, /* 204 */ + { 2, 0, sys_getgroups32, "getgroups32" }, /* 205 */ + { 2, 0, sys_setgroups32, "setgroups32" }, /* 206 */ + { 3, TD, sys_fchown, "fchown32" }, /* 207 */ + { 3, 0, sys_setresuid, "setresuid32" }, /* 208 */ + { 3, 0, sys_getresuid, "getresuid32" }, /* 209 */ + { 3, 0, sys_setresgid, "setresgid32" }, /* 210 */ + { 3, 0, sys_getresgid, "getresgid32" }, /* 211 */ + { 3, TF, sys_chown, "chown32" }, /* 212 */ + { 1, 0, sys_setuid, "setuid32" }, /* 213 */ + { 1, 0, sys_setgid, "setgid32" }, /* 214 */ + { 1, NF, sys_setfsuid, "setfsuid32" }, /* 215 */ + { 1, NF, sys_setfsgid, "setfsgid32" }, /* 216 */ + { 2, TF, sys_pivotroot, "pivot_root" }, /* 217 */ + { 3, TM, NULL, NULL }, /* 218 */ + { 3, TM, NULL, NULL }, /* 219 */ + { 3, TD, sys_getdents64, "getdents64" }, /* 220 */ + { 3, TD, sys_gettid, "gettid" }, /* 221 */ + { 2, TS, sys_kill, "tkill" }, /* 222 */ + { 5, TF, sys_setxattr, "setxattr" }, /* 223 */ + { 5, TF, sys_setxattr, "lsetxattr" }, /* 224 */ + { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 225 */ + { 4, TF, sys_getxattr, "getxattr" }, /* 226 */ + { 4, TF, sys_getxattr, "lgetxattr" }, /* 237 */ + { 4, TD, sys_fgetxattr, "fgetxattr" }, /* 228 */ + { 3, TF, sys_listxattr, "listxattr" }, /* 229 */ + { 3, TF, sys_listxattr, "llistxattr" }, /* 230 */ + { 3, TD, sys_flistxattr, "flistxattr" }, /* 231 */ + { 2, TF, sys_removexattr, "removexattr" }, /* 232 */ + { 2, TF, sys_removexattr, "lremovexattr" }, /* 233 */ + { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 234 */ + { 6, 0, sys_futex, "futex" }, /* 235 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 236 */ + { 3, TM, sys_mincore, "mincore" }, /* 237 */ + { 3, TM, sys_madvise, "madvise" }, /* 238 */ + { 3, TD, sys_fcntl, "fcntl64" }, /* 239 */ + { 4, TD, sys_readahead, "readahead" }, /* 240 */ + { 2, 0, sys_io_setup, "io_setup" }, /* 241 */ + { 1, 0, sys_io_destroy, "io_destroy" }, /* 242 */ + { 5, 0, sys_io_getevents, "io_getevents" }, /* 243 */ + { 3, 0, sys_io_submit, "io_submit" }, /* 244 */ + { 3, 0, sys_io_cancel, "io_cancel" }, /* 245 */ + { 5, TD, sys_fadvise64, "fadvise64" }, /* 246 */ + { 1, TP, sys_exit, "exit_group" }, /* 247 */ + { 4, 0, sys_lookup_dcookie, "lookup_dcookie"}, /* 248 */ + { 1, TD, sys_epoll_create, "epoll_create" }, /* 249 */ + { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 250 */ + { 4, TD, sys_epoll_wait, "epoll_wait" }, /* 251 */ + { 5, TM, sys_remap_file_pages, "remap_file_pages"}, /* 252 */ + { 1, 0, sys_set_tid_address, "set_tid_address"}, /* 253 */ + { 3, 0, sys_timer_create, "timer_create" }, /* 254 */ + { 4, 0, sys_timer_settime, "timer_settime" }, /* 255 */ + { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 256 */ + { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 257 */ + { 1, 0, sys_timer_delete, "timer_delete" }, /* 258 */ + { 2, 0, sys_clock_settime, "clock_settime" }, /* 259 */ + { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 260 */ + { 2, 0, sys_clock_getres, "clock_getres" }, /* 261 */ + { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 262 */ + { 3, TF, sys_statfs64, "statfs64" }, /* 263 */ + { 3, TD, sys_fstatfs64, "fstatfs64" }, /* 264 */ + { 3, TS, sys_tgkill, "tgkill" }, /* 265 */ + { 2, TF, sys_utimes, "utimes" }, /* 266 */ + { 6, TD, sys_fadvise64_64, "fadvise64_64" }, /* 267 */ + { 6, TM, sys_mbind, "mbind" }, /* 268 */ + { 5, TM, sys_get_mempolicy, "get_mempolicy" }, /* 269 */ + { 3, TM, sys_set_mempolicy, "set_mempolicy" }, /* 270 */ + { 4, 0, sys_mq_open, "mq_open" }, /* 271 */ + { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 272 */ + { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 273 */ + { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 274 */ + { 2, 0, sys_mq_notify, "mq_notify" }, /* 275 */ + { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 276 */ + { 5, TP, sys_waitid, "waitid" }, /* 277 */ + { 6, 0, NULL, NULL }, /* 278 */ + { 5, 0, sys_add_key, "add_key" }, /* 279 */ + { 4, 0, sys_request_key, "request_key" }, /* 280 */ + { 5, 0, sys_keyctl, "keyctl" }, /* 281 */ + { 3, 0, sys_ioprio_set, "ioprio_set" }, /* 282 */ + { 2, 0, sys_ioprio_get, "ioprio_get" }, /* 283 */ + { 0, TD, sys_inotify_init, "inotify_init" }, /* 284 */ + { 3, TD, sys_inotify_add_watch, "inotify_add_watch" }, /* 285 */ + { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 286 */ + { 4, TM, sys_migrate_pages, "migrate_pages" }, /* 287 */ + { 4, TD|TF, sys_openat, "openat" }, /* 288 */ + { 3, TD|TF, sys_mkdirat, "mkdirat" }, /* 289 */ + { 4, TD|TF, sys_mknodat, "mknodat" }, /* 290 */ + { 5, TD|TF, sys_fchownat, "fchownat" }, /* 291 */ + { 3, TD|TF, sys_futimesat, "futimesat" }, /* 292 */ + { 4, TD|TF, sys_newfstatat, "fstatat64" }, /* 293 */ + { 3, TD|TF, sys_unlinkat, "unlinkat" }, /* 294 */ + { 4, TD|TF, sys_renameat, "renameat" }, /* 295 */ + { 5, TD|TF, sys_linkat, "linkat" }, /* 296 */ + { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 297 */ + { 4, TD|TF, sys_readlinkat, "readlinkat" }, /* 298 */ + { 3, TD|TF, sys_fchmodat, "fchmodat" }, /* 299 */ + { 3, TD|TF, sys_faccessat, "faccessat" }, /* 300 */ + { 6, TD, sys_pselect6, "pselect6" }, /* 301 */ + { 5, TD, sys_ppoll, "ppoll" }, /* 302 */ + { 1, TP, sys_unshare, "unshare" }, /* 303 */ + { 2, 0, sys_set_robust_list, "set_robust_list" }, /* 304 */ + { 3, 0, sys_get_robust_list, "get_robust_list" }, /* 305 */ + { 6, TD, sys_splice, "splice" }, /* 306 */ + { 6, TD, sys_sync_file_range, "sync_file_range" }, /* 307 */ + { 4, TD, sys_tee, "tee" }, /* 308 */ + { 4, TD, sys_vmsplice, "vmsplice" }, /* 309 */ + { 6, TM, sys_move_pages, "move_pages" }, /* 310 */ + { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 311 */ + { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 312 */ + { 4, 0, sys_kexec_load, "kexec_load" }, /* 313 */ + { 3, 0, sys_getcpu, "getcpu" }, /* 314 */ + { 6, TD, sys_epoll_pwait, "epoll_pwait" }, /* 315 */ + { 4, TD|TF, sys_utimensat, "utimensat" }, /* 316 */ + { 3, TD|TS, sys_signalfd, "signalfd" }, /* 317 */ + { 2, TD, sys_timerfd_create, "timerfd_create"}, /* 318 */ + { 1, TD, sys_eventfd, "eventfd" }, /* 319 */ + { 5, TD, sys_pread, "pread64" }, /* 320 */ + { 5, TD, sys_pwrite, "pwrite64" }, /* 321 */ + { 6, TD, sys_fallocate, "fallocate" }, /* 322 */ + { 4, TD, sys_timerfd_settime, "timerfd_settime"}, /* 323 */ + { 2, TD, sys_timerfd_gettime, "timerfd_gettime"}, /* 324 */ + { 4, TD|TS, sys_signalfd4, "signalfd4" }, /* 325 */ + { 2, TD, sys_eventfd2, "eventfd2" }, /* 326 */ + { 1, TD, sys_epoll_create1, "epoll_create1" }, /* 327 */ + { 3, TD, sys_dup3, "dup3" }, /* 328 */ + { 2, TD, sys_pipe2, "pipe2" }, /* 329 */ + { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 330 */ + { 5, TD, sys_preadv, "preadv" }, /* 331 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 332 */ + { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 333 */ + { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 334 */ + { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 335 */ + { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 336 */ + { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 337 */ + { 4, 0, sys_prlimit64, "prlimit64" }, /* 338 */ + { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 339 */ + { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 340 */ + { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 341 */ + { 1, TD, sys_syncfs, "syncfs" }, /* 342 */ diff --git a/linux/syscall.h b/linux/syscall.h index 502e8eb..ce7e7e2 100644 --- a/linux/syscall.h +++ b/linux/syscall.h @@ -346,3 +346,9 @@ int sys_execv(); int sys_getmsg(); int sys_putmsg(); #endif + +#ifdef NIOS2 +int sys_getpagesize(); +int sys_cacheflush(); +int sys_nios2cmpxchg(); +#endif diff --git a/process.c b/process.c index 5a648a9..1519e69 100644 --- a/process.c +++ b/process.c @@ -2373,6 +2373,42 @@ const struct xlat struct_user_offsets[] = { { REG_A_BASE+14, "a14" }, { REG_A_BASE+15, "a15" }, #endif +#ifdef NIOS2 + { 4*0, "r0" }, + { 4*1, "r1" }, + { 4*2, "r2" }, + { 4*3, "r3" }, + { 4*4, "r4" }, + { 4*5, "r5" }, + { 4*6, "r6" }, + { 4*7, "r7" }, + { 4*8, "r8" }, + { 4*9, "r9" }, + { 4*10, "r10" }, + { 4*11, "r11" }, + { 4*12, "r12" }, + { 4*13, "r13" }, + { 4*14, "r14" }, + { 4*15, "r15" }, + { 4*16, "r16" }, + { 4*17, "r17" }, + { 4*18, "r18" }, + { 4*19, "r19" }, + { 4*20, "r20" }, + { 4*21, "r21" }, + { 4*22, "r22" }, + { 4*23, "r23" }, + { 4*24, "r24" }, + { 4*25, "r25" }, + { 4*26, "r26" }, + { 4*27, "r27" }, + { 4*28, "r28" }, + { 4*29, "r29" }, + { 4*30, "r30" }, + { 4*31, "r31" }, + { 4*32, "pc" }, + { 4*33, "sr" }, +#endif /* Other fields in "struct user" */ #if defined(S390) || defined(S390X) @@ -2507,6 +2543,8 @@ const struct xlat struct_user_offsets[] = { { sizeof(struct user), "sizeof(struct user)" }, #elif defined(OR1K) /* nothing */ +#elif defined(NIOS2) + /* nothing */ #elif defined(METAG) /* nothing */ #elif defined(XTENSA) diff --git a/syscall.c b/syscall.c index 4b6b4eb..bd3aa7f 100644 --- a/syscall.c +++ b/syscall.c @@ -778,6 +778,8 @@ static long xtensa_a2; # elif defined(ARC) static struct user_regs_struct arc_regs; # define ARCH_REGS_FOR_GETREGSET arc_regs +#elif defined(NIOS2) +static struct user_regs nios2_regs; #endif void @@ -1052,6 +1054,8 @@ get_regs(pid_t pid) get_regs_error = ptrace(PTRACE_GETREGS, pid, NULL, &tile_regs); # elif defined(SPARC) || defined(SPARC64) get_regs_error = ptrace(PTRACE_GETREGS, pid, (char *)&sparc_regs, 0); +# elif defined(NIOS2) + get_regs_error = ptrace(PTRACE_GETREGS, pid, NULL, &nios2_regs); # elif defined(POWERPC) static bool old_kernel = 0; if (old_kernel) @@ -1551,6 +1555,8 @@ get_scno(struct tcb *tcp) return -1; # elif defined(ARC) scno = arc_regs.scratch.r8; +#elif defined(NIOS2) + scno = nios2_regs.uregs[2]; #endif tcp->scno = scno; @@ -1946,6 +1952,15 @@ get_syscall_args(struct tcb *tcp) for (i = 0; i < nargs; ++i) tcp->u_arg[i] = *arc_args--; +#elif defined(NIOS2) + (void)i; + (void)nargs; + tcp->u_arg[0] = nios2_regs.uregs[4]; + tcp->u_arg[1] = nios2_regs.uregs[5]; + tcp->u_arg[2] = nios2_regs.uregs[6]; + tcp->u_arg[3] = nios2_regs.uregs[7]; + tcp->u_arg[4] = nios2_regs.uregs[8]; + tcp->u_arg[5] = nios2_regs.uregs[9]; #else /* Other architecture (32bits specific) */ for (i = 0; i < nargs; ++i) if (upeek(tcp->pid, i*4, &tcp->u_arg[i]) < 0) @@ -2146,6 +2161,8 @@ get_syscall_result(struct tcb *tcp) return -1; #elif defined(ARC) /* already done by get_regs */ +#elif defined(NIOS2) + /* already done by get_regs */ #endif return 1; } @@ -2459,6 +2476,21 @@ get_error(struct tcb *tcp) else { tcp->u_rval = arc_regs.scratch.r0; } +#elif defined(NIOS2) + /* + * The system call convention specifies that r2 contains the return + * value on success or a positive error number on failure. A flag + * indicating successful completion is written to r7; r7=0 indicates + * the system call success, r7=1 indicates an error. The positive + * errno value written in r2. + */ + if (check_errno && nios2_regs.uregs[7]) { + tcp->u_rval = -1; + u_error = nios2_regs.uregs[2]; + } + else { + tcp->u_rval = nios2_regs.uregs[2]; + } #endif tcp->u_error = u_error; } diff --git a/system.c b/system.c index 26d0d7f..cb64845 100644 --- a/system.c +++ b/system.c @@ -1086,3 +1086,32 @@ int sys_or1k_atomic(struct tcb *tcp) } #endif /* OR1K */ + +#ifdef NIOS2 + +int sys_getpagesize(struct tcb *tcp) +{ + return 0; +} + +int sys_cacheflush(struct tcb *tcp) +{ + if (entering(tcp)) { + /* addr and len */ + tprintf("%#lx, %lu", tcp->u_arg[0], tcp->u_arg[3]); + /* scope and flags (cache type) is currently ignored */ + } + return 0; +} + +/* Nios-II specific compare and exchange syscall for atomic operations */ +int sys_nios2cmpxchg(struct tcb *tcp) +{ + if (entering(tcp)) { + tprintf(", 0x%lx, %#lx, %#lx", tcp->u_arg[0], tcp->u_arg[1], + tcp->u_arg[2]); + } + + return RVAL_HEX; +} +#endif /* NIOS2 */ diff --git a/util.c b/util.c index 85bb94c..da82c7a 100644 --- a/util.c +++ b/util.c @@ -1448,6 +1448,8 @@ change_syscall(struct tcb *tcp, arg_setup_state *state, int new) /* microblaze is only supported since about linux-2.6.30 */ #elif defined(OR1K) /* never reached; OR1K is only supported by kernels since 3.1.0. */ +#elif defined(NIOS2) + /* never reached; Nios-II is only supported by kernels since 3.7.0. */ #elif defined(METAG) /* setbpt/clearbpt never used: */ /* Meta is only supported since linux-3.7 */ -- 1.8.1.5 |
From: Ezequiel G. <eze...@va...> - 2014-02-06 17:54:12
|
This commit adds strace support for Altera's Nios-II official kernel port as found in: git://git.rocketboards.org/linux-socfpga.git Notice that this an out-of-tree kernel architectural port, and uses the legacy (non-generic) system call ABI. In particular, the port doesn't support PTRACE_GETREGSET, so the implementation is based on PTRACE_GETREGS. Given it's mandatory for new architectures to support the generic syscall ABI and PTRACE_GETREGSET, if the nios2 architecure is ever mainlined, the strace support will have to be re-factored accordingly. Changelog: * Makefile.am, configure.ac: Add nios2 architecture * defs.h: Add nios2 to use register reading system * linux/nios2/ioctlent.h.in: Use i386 ioctls * linux/nios2/syscallent.h: New file * process.c: Add nios2 register defs to struct_user_offsets[] * syscall.c: Add nios2 support, for get_scno, get_regs, get_syscall_args and get_error * util.c: Add dummy handling * mem.c: Use sys_getpagesize. * system.c: Add nios2 specific syscalls. Signed-off-by: Ezequiel Garcia <eze...@va...> --- Makefile.am | 2 + configure.ac | 4 + defs.h | 3 +- linux/nios2/ioctlent.h.in | 1 + linux/nios2/syscallent.h | 370 ++++++++++++++++++++++++++++++++++++++++++++++ linux/syscall.h | 6 + mem.c | 3 +- process.c | 38 +++++ syscall.c | 27 +++- system.c | 24 +++ util.c | 2 + 11 files changed, 477 insertions(+), 3 deletions(-) create mode 100644 linux/nios2/ioctlent.h.in create mode 100644 linux/nios2/syscallent.h diff --git a/Makefile.am b/Makefile.am index c98d8b9..2ce18d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,6 +122,8 @@ EXTRA_DIST = \ linux/mips/syscallent-o32.h \ linux/mips/syscallent.h \ linux/mtd-abi.h \ + linux/nios2/ioctlent.h.in \ + linux/nios2/syscallent.h \ linux/or1k/ioctlent.h.in \ linux/or1k/syscallent.h \ linux/powerpc/errnoent1.h \ diff --git a/configure.ac b/configure.ac index be28ebe..90edb32 100644 --- a/configure.ac +++ b/configure.ac @@ -125,6 +125,10 @@ microblaze*) arch=microblaze AC_DEFINE([MICROBLAZE], 1, [Define for the MicroBlaze architecture.]) ;; +nios2*) + arch=nios2 + AC_DEFINE([NIOS2], 1, [Define for the Nios-II architecture.]) + ;; or1k*) arch=or1k AC_DEFINE([OR1K], 1, [Define for the OpenRISC 1000 architecture.]) diff --git a/defs.h b/defs.h index 95d2571..61c5fda 100644 --- a/defs.h +++ b/defs.h @@ -598,7 +598,8 @@ extern void call_summary(FILE *); || defined(OR1K) \ || defined(METAG) \ || defined(ARC) \ - || defined(POWERPC) + || defined(POWERPC) \ + || defined(NIOS2) extern long get_regs_error; # define clear_regs() (get_regs_error = -1) extern void get_regs(pid_t pid); diff --git a/linux/nios2/ioctlent.h.in b/linux/nios2/ioctlent.h.in new file mode 100644 index 0000000..52ac99b --- /dev/null +++ b/linux/nios2/ioctlent.h.in @@ -0,0 +1 @@ +#include "../i386/ioctlent.h.in" diff --git a/linux/nios2/syscallent.h b/linux/nios2/syscallent.h new file mode 100644 index 0000000..95fd619 --- /dev/null +++ b/linux/nios2/syscallent.h @@ -0,0 +1,370 @@ +/* + * Copyright (c) 2014 Ezequiel Garcia <eze...@va...> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ + { 1, TP, sys_exit, "_exit" }, /* 1 */ + { 0, TP, sys_fork, "fork" }, /* 2 */ + { 3, TD, sys_read, "read" }, /* 3 */ + { 3, TD, sys_write, "write" }, /* 4 */ + { 3, TD|TF, sys_open, "open" }, /* 5 */ + { 1, TD, sys_close, "close" }, /* 6 */ + { 3, TP, sys_waitpid, "waitpid" }, /* 7 */ + { 2, TD|TF, sys_creat, "creat" }, /* 8 */ + { 2, TF, sys_link, "link" }, /* 9 */ + { 1, TF, sys_unlink, "unlink" }, /* 10 */ + { 3, TF|TP, sys_execve, "execve" }, /* 11 */ + { 1, TF, sys_chdir, "chdir" }, /* 12 */ + { 1, 0, sys_time, "time" }, /* 13 */ + { 3, TF, sys_mknod, "mknod" }, /* 14 */ + { 2, TF, sys_chmod, "chmod" }, /* 15 */ + { 3, TF, sys_chown, "lchown" }, /* 16 */ + { 0, TM, NULL, NULL }, /* 17 */ + { 2, TF, NULL, NULL }, /* 18 */ + { 3, TD, sys_lseek, "lseek" }, /* 19 */ + { 0, 0, sys_getpid, "getpid" }, /* 20 */ + { 5, TF, sys_mount, "mount" }, /* 21 */ + { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, 0, sys_setuid, "setuid" }, /* 23 */ + { 0, NF, sys_getuid, "getuid" }, /* 24 */ + { 1, 0, sys_stime, "stime" }, /* 25 */ + { 4, 0, sys_ptrace, "ptrace" }, /* 26 */ + { 1, 0, sys_alarm, "alarm" }, /* 27 */ + { 2, TD, NULL, NULL }, /* 28 */ + { 0, TS, sys_pause, "pause" }, /* 29 */ + { 2, TF, sys_utime, "utime" }, /* 30 */ + { 2, 0, NULL, NULL }, /* 31 */ + { 2, 0, NULL, NULL }, /* 32 */ + { 2, TF, sys_access, "access" }, /* 33 */ + { 1, 0, sys_nice, "nice" }, /* 34 */ + { 0, 0, NULL, NULL }, /* 35 */ + { 0, 0, sys_sync, "sync" }, /* 36 */ + { 2, TS, sys_kill, "kill" }, /* 37 */ + { 2, TF, sys_rename, "rename" }, /* 38 */ + { 2, TF, sys_mkdir, "mkdir" }, /* 39 */ + { 1, TF, sys_rmdir, "rmdir" }, /* 40 */ + { 1, TD, sys_dup, "dup" }, /* 41 */ + { 1, TD, sys_pipe, "pipe" }, /* 42 */ + { 1, 0, sys_times, "times" }, /* 43 */ + { 0, 0, NULL, NULL }, /* 44 */ + { 1, TM, sys_brk, "brk" }, /* 45 */ + { 1, 0, sys_setgid, "setgid" }, /* 46 */ + { 0, NF, sys_getgid, "getgid" }, /* 47 */ + { 3, TS, NULL, NULL }, /* 48 */ + { 0, NF, sys_geteuid, "geteuid" }, /* 49 */ + { 0, NF, sys_getegid, "getegid" }, /* 50 */ + { 1, TF, sys_acct, "acct" }, /* 51 */ + { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 0, 0, NULL, NULL }, /* 53 */ + { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ + { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ + { 0, 0, NULL, NULL }, /* 56 */ + { 2, 0, sys_setpgid, "setpgid" }, /* 57 */ + { 2, 0, NULL, NULL }, /* 58 */ + { 1, 0, NULL, NULL }, /* 59 */ + { 1, 0, sys_umask, "umask" }, /* 60 */ + { 1, TF, sys_chroot, "chroot" }, /* 61 */ + { 2, 0, sys_ustat, "ustat" }, /* 62 */ + { 2, TD, sys_dup2, "dup2" }, /* 63 */ + { 0, 0, sys_getppid, "getppid" }, /* 64 */ + { 0, 0, sys_getpgrp, "getpgrp" }, /* 65 */ + { 0, 0, sys_setsid, "setsid" }, /* 66 */ + { 3, TS, sys_sigaction, "sigaction" }, /* 67 */ + { 0, TS, NULL, NULL }, /* 68 */ + { 1, TS, NULL, NULL }, /* 69 */ + { 2, 0, sys_setreuid, "setreuid" }, /* 70 */ + { 2, 0, sys_setregid, "setregid" }, /* 71 */ + { 3, TS, sys_sigsuspend, "sigsuspend" }, /* 72 */ + { 1, TS, sys_sigpending, "sigpending" }, /* 73 */ + { 2, 0, sys_sethostname, "sethostname" }, /* 74 */ + { 2, 0, sys_setrlimit, "setrlimit" }, /* 75 */ + { 2, 0, NULL, NULL }, /* 76 */ + { 2, 0, sys_getrusage, "getrusage" }, /* 77 */ + { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 78 */ + { 2, 0, sys_settimeofday, "settimeofday" }, /* 79 */ + { 2, 0, sys_getgroups, "getgroups" }, /* 80 */ + { 2, 0, sys_setgroups, "setgroups" }, /* 81 */ + { 1, TD, sys_oldselect, "oldselect" }, /* 82 */ + { 2, TF, sys_symlink, "symlink" }, /* 83 */ + { 2, TF, NULL, NULL }, /* 84 */ + { 3, TF, sys_readlink, "readlink" }, /* 85 */ + { 1, TF, sys_uselib, "uselib" }, /* 86 */ + { 2, TF, sys_swapon, "swapon" }, /* 87 */ + { 4, 0, sys_reboot, "reboot" }, /* 88 */ + { 3, TD, NULL, NULL }, /* 89 */ + { 6, TD|TM, sys_mmap, "old_mmap" }, /* 90 */ + { 2, TM, sys_munmap, "munmap" }, /* 91 */ + { 2, TF, sys_truncate, "truncate" }, /* 92 */ + { 2, TD, sys_ftruncate, "ftruncate" }, /* 93 */ + { 2, TD, sys_fchmod, "fchmod" }, /* 94 */ + { 3, TD, sys_fchown, "fchown" }, /* 95 */ + { 2, 0, sys_getpriority, "getpriority" }, /* 96 */ + { 3, 0, sys_setpriority, "setpriority" }, /* 97 */ + { 4, 0, NULL, NULL }, /* 98 */ + { 2, TF, sys_statfs, "statfs" }, /* 99 */ + { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ + { 3, 0, NULL, NULL }, /* 101 */ + { 2, TD, sys_socketcall, "socketcall" }, /* 102 */ + { 3, 0, sys_syslog, "syslog" }, /* 103 */ + { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ + { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ + { 2, TF, sys_stat, "stat" }, /* 106 */ + { 2, TF, sys_lstat, "lstat" }, /* 107 */ + { 2, TD, sys_fstat, "fstat" }, /* 108 */ + { 1, 0, NULL, NULL }, /* 109 */ + { 1, 0, NULL, NULL }, /* 110 */ + { 0, 0, sys_vhangup, "vhangup" }, /* 111 */ + { 0, 0, NULL, NULL }, /* 112 */ + { 1, 0, sys_nios2cmpxchg, "nios2_cmpxchg" }, /* 113 */ + { 4, TP, sys_wait4, "wait4" }, /* 114 */ + { 1, TF, sys_swapoff, "swapoff" }, /* 115 */ + { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ + { 6, TI, sys_ipc, "ipc" }, /* 117 */ + { 1, TD, sys_fsync, "fsync" }, /* 118 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 5, TP, sys_clone, "clone" }, /* 120 */ + { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ + { 1, 0, sys_uname, "uname" }, /* 122 */ + { 3, 0, sys_cacheflush, "cacheflush" }, /* 123 */ + { 1, 0, sys_adjtimex, "adjtimex" }, /* 124 */ + { 3, TM, sys_mprotect, "mprotect" }, /* 125 */ + { 3, TS, sys_sigprocmask, "sigprocmask" }, /* 126 */ + { 2, 0, NULL, NULL }, /* 127 */ + { 3, 0, sys_init_module, "init_module" }, /* 128 */ + { 2, 0, sys_delete_module, "delete_module" }, /* 129 */ + { 1, 0, NULL, NULL }, /* 130 */ + { 4, TF, sys_quotactl, "quotactl" }, /* 131 */ + { 1, 0, sys_getpgid, "getpgid" }, /* 132 */ + { 1, TD, sys_fchdir, "fchdir" }, /* 133 */ + { 0, 0, sys_bdflush, "bdflush" }, /* 134 */ + { 3, 0, sys_sysfs, "sysfs" }, /* 135 */ + { 1, 0, sys_personality, "personality" }, /* 136 */ + { 5, 0, NULL, NULL }, /* 137 */ + { 1, NF, sys_setfsuid, "setfsuid" }, /* 138 */ + { 1, NF, sys_setfsgid, "setfsgid" }, /* 139 */ + { 5, TD, sys_llseek, "_llseek" }, /* 140 */ + { 3, TD, sys_getdents, "getdents" }, /* 141 */ + { 5, TD, sys_select, "select" }, /* 142 */ + { 2, TD, sys_flock, "flock" }, /* 143 */ + { 3, TM, sys_msync, "msync" }, /* 144 */ + { 3, TD, sys_readv, "readv" }, /* 145 */ + { 3, TD, sys_writev, "writev" }, /* 146 */ + { 1, 0, sys_getsid, "getsid" }, /* 147 */ + { 1, TD, sys_fdatasync, "fdatasync" }, /* 148 */ + { 1, 0, sys_sysctl, "_sysctl" }, /* 149 */ + { 2, TM, sys_mlock, "mlock" }, /* 150 */ + { 2, TM, sys_munlock, "munlock" }, /* 151 */ + { 1, TM, sys_mlockall, "mlockall" }, /* 152 */ + { 0, TM, sys_munlockall, "munlockall" }, /* 153 */ + { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 154 */ + { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 155 */ + { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 156 */ + { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 157 */ + { 0, 0, sys_sched_yield, "sched_yield"}, /* 158 */ + { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */ + { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */ + { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */ + { 2, 0, sys_nanosleep, "nanosleep" }, /* 162 */ + { 5, TM, sys_mremap, "mremap" }, /* 163 */ + { 3, 0, sys_setresuid, "setresuid" }, /* 164 */ + { 3, 0, sys_getresuid, "getresuid" }, /* 165 */ + { 5, 0, sys_getpagesize, "getpagesize" }, /* 166 */ + { 5, 0, NULL, NULL }, /* 167 */ + { 3, TD, sys_poll, "poll" }, /* 168 */ + { 3, 0, NULL, NULL }, /* 169 */ + { 3, 0, sys_setresgid, "setresgid" }, /* 170 */ + { 3, 0, sys_getresgid, "getresgid" }, /* 171 */ + { 5, 0, sys_prctl, "prctl" }, /* 172 */ + { 0, TS, sys_rt_sigreturn, "rt_sigreturn" }, /* 173 */ + { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */ + { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 175 */ + { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */ + { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 177 */ + { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 178 */ + { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 179 */ + { 5, TD, sys_pread, "pread64" }, /* 180 */ + { 5, TD, sys_pwrite, "pwrite64" }, /* 181 */ + { 3, TF, sys_chown, "chown" }, /* 182 */ + { 2, TF, sys_getcwd, "getcwd" }, /* 183 */ + { 2, 0, sys_capget, "capget" }, /* 184 */ + { 2, 0, sys_capset, "capset" }, /* 185 */ + { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ + { 5, 0, NULL, NULL }, /* 188 */ + { 5, 0, NULL, NULL }, /* 189 */ + { 0, TP, sys_vfork, "vfork" }, /* 190 */ + { 2, 0, sys_getrlimit, "getrlimit" }, /* 191 */ + { 6, TD|TM, sys_mmap_pgoff, "mmap2" }, /* 192 */ + { 3, TF, sys_truncate64, "truncate64" }, /* 193 */ + { 3, TD, sys_ftruncate64, "ftruncate64" }, /* 194 */ + { 2, TF, sys_stat64, "stat64" }, /* 195 */ + { 2, TF, sys_lstat64, "lstat64" }, /* 196 */ + { 2, TD, sys_fstat64, "fstat64" }, /* 197 */ + { 3, TF, sys_chown, "lchown32" }, /* 198 */ + { 0, NF, sys_getuid, "getuid32" }, /* 199 */ + { 0, NF, sys_getgid, "getgid32" }, /* 200 */ + { 0, NF, sys_geteuid, "geteuid32" }, /* 201 */ + { 0, NF, sys_getegid, "getegid32" }, /* 202 */ + { 2, 0, sys_setreuid, "setreuid32" }, /* 203 */ + { 2, 0, sys_setregid, "setregid32" }, /* 204 */ + { 2, 0, sys_getgroups32, "getgroups32" }, /* 205 */ + { 2, 0, sys_setgroups32, "setgroups32" }, /* 206 */ + { 3, TD, sys_fchown, "fchown32" }, /* 207 */ + { 3, 0, sys_setresuid, "setresuid32" }, /* 208 */ + { 3, 0, sys_getresuid, "getresuid32" }, /* 209 */ + { 3, 0, sys_setresgid, "setresgid32" }, /* 210 */ + { 3, 0, sys_getresgid, "getresgid32" }, /* 211 */ + { 3, TF, sys_chown, "chown32" }, /* 212 */ + { 1, 0, sys_setuid, "setuid32" }, /* 213 */ + { 1, 0, sys_setgid, "setgid32" }, /* 214 */ + { 1, NF, sys_setfsuid, "setfsuid32" }, /* 215 */ + { 1, NF, sys_setfsgid, "setfsgid32" }, /* 216 */ + { 2, TF, sys_pivotroot, "pivot_root" }, /* 217 */ + { 3, TM, NULL, NULL }, /* 218 */ + { 3, TM, NULL, NULL }, /* 219 */ + { 3, TD, sys_getdents64, "getdents64" }, /* 220 */ + { 3, TD, sys_gettid, "gettid" }, /* 221 */ + { 2, TS, sys_kill, "tkill" }, /* 222 */ + { 5, TF, sys_setxattr, "setxattr" }, /* 223 */ + { 5, TF, sys_setxattr, "lsetxattr" }, /* 224 */ + { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 225 */ + { 4, TF, sys_getxattr, "getxattr" }, /* 226 */ + { 4, TF, sys_getxattr, "lgetxattr" }, /* 237 */ + { 4, TD, sys_fgetxattr, "fgetxattr" }, /* 228 */ + { 3, TF, sys_listxattr, "listxattr" }, /* 229 */ + { 3, TF, sys_listxattr, "llistxattr" }, /* 230 */ + { 3, TD, sys_flistxattr, "flistxattr" }, /* 231 */ + { 2, TF, sys_removexattr, "removexattr" }, /* 232 */ + { 2, TF, sys_removexattr, "lremovexattr" }, /* 233 */ + { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 234 */ + { 6, 0, sys_futex, "futex" }, /* 235 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 236 */ + { 3, TM, sys_mincore, "mincore" }, /* 237 */ + { 3, TM, sys_madvise, "madvise" }, /* 238 */ + { 3, TD, sys_fcntl, "fcntl64" }, /* 239 */ + { 4, TD, sys_readahead, "readahead" }, /* 240 */ + { 2, 0, sys_io_setup, "io_setup" }, /* 241 */ + { 1, 0, sys_io_destroy, "io_destroy" }, /* 242 */ + { 5, 0, sys_io_getevents, "io_getevents" }, /* 243 */ + { 3, 0, sys_io_submit, "io_submit" }, /* 244 */ + { 3, 0, sys_io_cancel, "io_cancel" }, /* 245 */ + { 5, TD, sys_fadvise64, "fadvise64" }, /* 246 */ + { 1, TP, sys_exit, "exit_group" }, /* 247 */ + { 4, 0, sys_lookup_dcookie, "lookup_dcookie"}, /* 248 */ + { 1, TD, sys_epoll_create, "epoll_create" }, /* 249 */ + { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 250 */ + { 4, TD, sys_epoll_wait, "epoll_wait" }, /* 251 */ + { 5, TM, sys_remap_file_pages, "remap_file_pages"}, /* 252 */ + { 1, 0, sys_set_tid_address, "set_tid_address"}, /* 253 */ + { 3, 0, sys_timer_create, "timer_create" }, /* 254 */ + { 4, 0, sys_timer_settime, "timer_settime" }, /* 255 */ + { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 256 */ + { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 257 */ + { 1, 0, sys_timer_delete, "timer_delete" }, /* 258 */ + { 2, 0, sys_clock_settime, "clock_settime" }, /* 259 */ + { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 260 */ + { 2, 0, sys_clock_getres, "clock_getres" }, /* 261 */ + { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 262 */ + { 3, TF, sys_statfs64, "statfs64" }, /* 263 */ + { 3, TD, sys_fstatfs64, "fstatfs64" }, /* 264 */ + { 3, TS, sys_tgkill, "tgkill" }, /* 265 */ + { 2, TF, sys_utimes, "utimes" }, /* 266 */ + { 6, TD, sys_fadvise64_64, "fadvise64_64" }, /* 267 */ + { 6, TM, sys_mbind, "mbind" }, /* 268 */ + { 5, TM, sys_get_mempolicy, "get_mempolicy" }, /* 269 */ + { 3, TM, sys_set_mempolicy, "set_mempolicy" }, /* 270 */ + { 4, 0, sys_mq_open, "mq_open" }, /* 271 */ + { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 272 */ + { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 273 */ + { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 274 */ + { 2, 0, sys_mq_notify, "mq_notify" }, /* 275 */ + { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 276 */ + { 5, TP, sys_waitid, "waitid" }, /* 277 */ + { 6, 0, NULL, NULL }, /* 278 */ + { 5, 0, sys_add_key, "add_key" }, /* 279 */ + { 4, 0, sys_request_key, "request_key" }, /* 280 */ + { 5, 0, sys_keyctl, "keyctl" }, /* 281 */ + { 3, 0, sys_ioprio_set, "ioprio_set" }, /* 282 */ + { 2, 0, sys_ioprio_get, "ioprio_get" }, /* 283 */ + { 0, TD, sys_inotify_init, "inotify_init" }, /* 284 */ + { 3, TD, sys_inotify_add_watch, "inotify_add_watch" }, /* 285 */ + { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 286 */ + { 4, TM, sys_migrate_pages, "migrate_pages" }, /* 287 */ + { 4, TD|TF, sys_openat, "openat" }, /* 288 */ + { 3, TD|TF, sys_mkdirat, "mkdirat" }, /* 289 */ + { 4, TD|TF, sys_mknodat, "mknodat" }, /* 290 */ + { 5, TD|TF, sys_fchownat, "fchownat" }, /* 291 */ + { 3, TD|TF, sys_futimesat, "futimesat" }, /* 292 */ + { 4, TD|TF, sys_newfstatat, "fstatat64" }, /* 293 */ + { 3, TD|TF, sys_unlinkat, "unlinkat" }, /* 294 */ + { 4, TD|TF, sys_renameat, "renameat" }, /* 295 */ + { 5, TD|TF, sys_linkat, "linkat" }, /* 296 */ + { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 297 */ + { 4, TD|TF, sys_readlinkat, "readlinkat" }, /* 298 */ + { 3, TD|TF, sys_fchmodat, "fchmodat" }, /* 299 */ + { 3, TD|TF, sys_faccessat, "faccessat" }, /* 300 */ + { 6, TD, sys_pselect6, "pselect6" }, /* 301 */ + { 5, TD, sys_ppoll, "ppoll" }, /* 302 */ + { 1, TP, sys_unshare, "unshare" }, /* 303 */ + { 2, 0, sys_set_robust_list, "set_robust_list" }, /* 304 */ + { 3, 0, sys_get_robust_list, "get_robust_list" }, /* 305 */ + { 6, TD, sys_splice, "splice" }, /* 306 */ + { 6, TD, sys_sync_file_range, "sync_file_range" }, /* 307 */ + { 4, TD, sys_tee, "tee" }, /* 308 */ + { 4, TD, sys_vmsplice, "vmsplice" }, /* 309 */ + { 6, TM, sys_move_pages, "move_pages" }, /* 310 */ + { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 311 */ + { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 312 */ + { 4, 0, sys_kexec_load, "kexec_load" }, /* 313 */ + { 3, 0, sys_getcpu, "getcpu" }, /* 314 */ + { 6, TD, sys_epoll_pwait, "epoll_pwait" }, /* 315 */ + { 4, TD|TF, sys_utimensat, "utimensat" }, /* 316 */ + { 3, TD|TS, sys_signalfd, "signalfd" }, /* 317 */ + { 2, TD, sys_timerfd_create, "timerfd_create"}, /* 318 */ + { 1, TD, sys_eventfd, "eventfd" }, /* 319 */ + { 5, TD, sys_pread, "pread64" }, /* 320 */ + { 5, TD, sys_pwrite, "pwrite64" }, /* 321 */ + { 6, TD, sys_fallocate, "fallocate" }, /* 322 */ + { 4, TD, sys_timerfd_settime, "timerfd_settime"}, /* 323 */ + { 2, TD, sys_timerfd_gettime, "timerfd_gettime"}, /* 324 */ + { 4, TD|TS, sys_signalfd4, "signalfd4" }, /* 325 */ + { 2, TD, sys_eventfd2, "eventfd2" }, /* 326 */ + { 1, TD, sys_epoll_create1, "epoll_create1" }, /* 327 */ + { 3, TD, sys_dup3, "dup3" }, /* 328 */ + { 2, TD, sys_pipe2, "pipe2" }, /* 329 */ + { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 330 */ + { 5, TD, sys_preadv, "preadv" }, /* 331 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 332 */ + { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 333 */ + { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 334 */ + { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 335 */ + { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 336 */ + { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 337 */ + { 4, 0, sys_prlimit64, "prlimit64" }, /* 338 */ + { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 339 */ + { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 340 */ + { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 341 */ + { 1, TD, sys_syncfs, "syncfs" }, /* 342 */ diff --git a/linux/syscall.h b/linux/syscall.h index 502e8eb..ce7e7e2 100644 --- a/linux/syscall.h +++ b/linux/syscall.h @@ -346,3 +346,9 @@ int sys_execv(); int sys_getmsg(); int sys_putmsg(); #endif + +#ifdef NIOS2 +int sys_getpagesize(); +int sys_cacheflush(); +int sys_nios2cmpxchg(); +#endif diff --git a/mem.c b/mem.c index 2c51cc7..7e89966 100644 --- a/mem.c +++ b/mem.c @@ -533,7 +533,8 @@ sys_mincore(struct tcb *tcp) return 0; } -#if defined(ALPHA) || defined(IA64) || defined(SPARC) || defined(SPARC64) +#if defined(ALPHA) || defined(IA64) || defined(NIOS2) || \ + defined(SPARC) || defined(SPARC64) int sys_getpagesize(struct tcb *tcp) { diff --git a/process.c b/process.c index 5a648a9..9a529be 100644 --- a/process.c +++ b/process.c @@ -2373,6 +2373,42 @@ const struct xlat struct_user_offsets[] = { { REG_A_BASE+14, "a14" }, { REG_A_BASE+15, "a15" }, #endif +#ifdef NIOS2 + { 4*0, "r0" }, + { 4*1, "r1" }, + { 4*2, "r2" }, + { 4*3, "r3" }, + { 4*4, "r4" }, + { 4*5, "r5" }, + { 4*6, "r6" }, + { 4*7, "r7" }, + { 4*8, "r8" }, + { 4*9, "r9" }, + { 4*10, "r10" }, + { 4*11, "r11" }, + { 4*12, "r12" }, + { 4*13, "r13" }, + { 4*14, "r14" }, + { 4*15, "r15" }, + { 4*16, "r16" }, + { 4*17, "r17" }, + { 4*18, "r18" }, + { 4*19, "r19" }, + { 4*20, "r20" }, + { 4*21, "r21" }, + { 4*22, "r22" }, + { 4*23, "r23" }, + { 4*24, "r24" }, + { 4*25, "r25" }, + { 4*26, "r26" }, + { 4*27, "r27" }, + { 4*28, "r28" }, + { 4*29, "r29" }, + { 4*30, "r30" }, + { 4*31, "r31" }, + { 4*32, "pc" }, + { 4*33, "sr" }, +#endif /* Other fields in "struct user" */ #if defined(S390) || defined(S390X) @@ -2513,6 +2549,8 @@ const struct xlat struct_user_offsets[] = { /* nothing */ #elif defined(ARC) /* nothing */ +#elif defined(NIOS2) + /* nothing */ #endif { 0, NULL }, }; diff --git a/syscall.c b/syscall.c index 4b6b4eb..7a4ba8b 100644 --- a/syscall.c +++ b/syscall.c @@ -778,6 +778,8 @@ static long xtensa_a2; # elif defined(ARC) static struct user_regs_struct arc_regs; # define ARCH_REGS_FOR_GETREGSET arc_regs +#elif defined(NIOS2) +static struct user_regs nios2_regs; #endif void @@ -1052,6 +1054,8 @@ get_regs(pid_t pid) get_regs_error = ptrace(PTRACE_GETREGS, pid, NULL, &tile_regs); # elif defined(SPARC) || defined(SPARC64) get_regs_error = ptrace(PTRACE_GETREGS, pid, (char *)&sparc_regs, 0); +# elif defined(NIOS2) + get_regs_error = ptrace(PTRACE_GETREGS, pid, NULL, &nios2_regs); # elif defined(POWERPC) static bool old_kernel = 0; if (old_kernel) @@ -1551,6 +1555,8 @@ get_scno(struct tcb *tcp) return -1; # elif defined(ARC) scno = arc_regs.scratch.r8; +#elif defined(NIOS2) + scno = nios2_regs.uregs[2]; #endif tcp->scno = scno; @@ -1945,7 +1951,9 @@ get_syscall_args(struct tcb *tcp) long *arc_args = &arc_regs.scratch.r0; for (i = 0; i < nargs; ++i) tcp->u_arg[i] = *arc_args--; - +#elif defined(NIOS2) + for (i = 0; i < nargs; i++) + tcp->u_arg[i] = nios2_regs.uregs[i + 4]; #else /* Other architecture (32bits specific) */ for (i = 0; i < nargs; ++i) if (upeek(tcp->pid, i*4, &tcp->u_arg[i]) < 0) @@ -2146,6 +2154,8 @@ get_syscall_result(struct tcb *tcp) return -1; #elif defined(ARC) /* already done by get_regs */ +#elif defined(NIOS2) + /* already done by get_regs */ #endif return 1; } @@ -2459,6 +2469,21 @@ get_error(struct tcb *tcp) else { tcp->u_rval = arc_regs.scratch.r0; } +#elif defined(NIOS2) + /* + * The system call convention specifies that r2 contains the return + * value on success or a positive error number on failure. A flag + * indicating successful completion is written to r7; r7=0 indicates + * the system call success, r7=1 indicates an error. The positive + * errno value written in r2. + */ + if (check_errno && nios2_regs.uregs[7]) { + tcp->u_rval = -1; + u_error = nios2_regs.uregs[2]; + } + else { + tcp->u_rval = nios2_regs.uregs[2]; + } #endif tcp->u_error = u_error; } diff --git a/system.c b/system.c index 26d0d7f..7bef422 100644 --- a/system.c +++ b/system.c @@ -1086,3 +1086,27 @@ int sys_or1k_atomic(struct tcb *tcp) } #endif /* OR1K */ + +#ifdef NIOS2 + +int sys_cacheflush(struct tcb *tcp) +{ + if (entering(tcp)) { + /* addr and len */ + tprintf("%#lx, %lu", tcp->u_arg[0], tcp->u_arg[3]); + /* scope and flags (cache type) are currently ignored */ + } + return 0; +} + +/* Nios-II specific compare and exchange syscall for atomic operations */ +int sys_nios2cmpxchg(struct tcb *tcp) +{ + if (entering(tcp)) { + tprintf("%#lx, %#lx, %#lx", tcp->u_arg[0], tcp->u_arg[1], + tcp->u_arg[2]); + } + + return RVAL_HEX; +} +#endif /* NIOS2 */ diff --git a/util.c b/util.c index 85bb94c..9f339b6 100644 --- a/util.c +++ b/util.c @@ -1457,6 +1457,8 @@ change_syscall(struct tcb *tcp, arg_setup_state *state, int new) #elif defined(ARC) /* setbpt/clearbpt never used: */ /* ARC only supported since 3.9 */ +#elif defined(NIOS2) + /* never reached; Nios-II is only supported by kernels since 3.7.0. */ #else #warning Do not know how to handle change_syscall for this architecture #endif /* architecture */ -- 1.8.1.5 |
From: Ezequiel G. <eze...@va...> - 2015-04-18 21:00:46
|
This commit adds strace support for Altera's Nios-II. The architecture is supported by Linux since v3.19, and it implements the generic syscall ABI. * Makefile.am, configure.ac: add nios2 files and support * cacheflush.c: support nios2 cacheflush syscall * linux/nios2/: arch-specific port Signed-off-by: Ezequiel Garcia <eze...@va...> --- Makefile.am | 8 ++++++++ cacheflush.c | 12 ++++++++++++ configure.ac | 5 +++++ linux/nios2/arch_regs.c | 2 ++ linux/nios2/get_error.c | 14 ++++++++++++++ linux/nios2/get_scno.c | 1 + linux/nios2/get_syscall_args.c | 6 ++++++ linux/nios2/ioctls_arch0.h | 1 + linux/nios2/ioctls_inc0.h | 1 + linux/nios2/print_pc.c | 1 + linux/nios2/syscallent.h | 4 ++++ 11 files changed, 55 insertions(+) create mode 100644 linux/nios2/arch_regs.c create mode 100644 linux/nios2/get_error.c create mode 100644 linux/nios2/get_scno.c create mode 100644 linux/nios2/get_syscall_args.c create mode 100644 linux/nios2/ioctls_arch0.h create mode 100644 linux/nios2/ioctls_inc0.h create mode 100644 linux/nios2/print_pc.c create mode 100644 linux/nios2/syscallent.h diff --git a/Makefile.am b/Makefile.am index 549aebc..425df6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -341,6 +341,14 @@ EXTRA_DIST = \ linux/mips/syscallent.h \ linux/mips/userent.h \ linux/mtd-abi.h \ + linux/nios2/arch_regs.c \ + linux/nios2/get_error.c \ + linux/nios2/get_scno.c \ + linux/nios2/get_syscall_args.c \ + linux/nios2/ioctls_arch0.h \ + linux/nios2/ioctls_inc0.h \ + linux/nios2/print_pc.c \ + linux/nios2/syscallent.h \ linux/or1k/arch_regs.c \ linux/or1k/get_error.c \ linux/or1k/get_scno.c \ diff --git a/cacheflush.c b/cacheflush.c index 727d49b..1ad3a15 100644 --- a/cacheflush.c +++ b/cacheflush.c @@ -89,3 +89,15 @@ SYS_FUNC(cacheflush) return 0; } #endif /* SH */ + +#ifdef NIOS2 +SYS_FUNC(cacheflush) +{ + if (entering(tcp)) { + /* addr and len */ + tprintf("%#lx, %lu", tcp->u_arg[0], tcp->u_arg[3]); + /* scope and flags (cache type) are currently ignored */ + } + return 0; +} +#endif /* NIOS2 */ diff --git a/configure.ac b/configure.ac index d829e18..4713c9a 100644 --- a/configure.ac +++ b/configure.ac @@ -125,6 +125,11 @@ microblaze*) arch=microblaze AC_DEFINE([MICROBLAZE], 1, [Define for the MicroBlaze architecture.]) ;; +nios2*) + arch=nios2 + AC_DEFINE([NIOS2], 1, [Define for the Nios-II architecture.]) + ;; + or1k*) arch=or1k AC_DEFINE([OR1K], 1, [Define for the OpenRISC 1000 architecture.]) diff --git a/linux/nios2/arch_regs.c b/linux/nios2/arch_regs.c new file mode 100644 index 0000000..62827f9 --- /dev/null +++ b/linux/nios2/arch_regs.c @@ -0,0 +1,2 @@ +static struct user_pt_regs nios2_regs; +# define ARCH_REGS_FOR_GETREGSET nios2_regs diff --git a/linux/nios2/get_error.c b/linux/nios2/get_error.c new file mode 100644 index 0000000..e2c46d0 --- /dev/null +++ b/linux/nios2/get_error.c @@ -0,0 +1,14 @@ +/* + * The system call convention specifies that r2 contains the return + * value on success or a positive error number on failure. A flag + * indicating successful completion is written to r7; r7=0 indicates + * the system call success, r7=1 indicates an error. The positive + * errno value written in r2. + */ +if (check_errno && nios2_regs.regs[7]) { + tcp->u_rval = -1; + tcp->u_error = nios2_regs.regs[2]; +} +else { + tcp->u_rval = nios2_regs.regs[2]; +} diff --git a/linux/nios2/get_scno.c b/linux/nios2/get_scno.c new file mode 100644 index 0000000..c820bce --- /dev/null +++ b/linux/nios2/get_scno.c @@ -0,0 +1 @@ +scno = nios2_regs.regs[2]; diff --git a/linux/nios2/get_syscall_args.c b/linux/nios2/get_syscall_args.c new file mode 100644 index 0000000..d12c2f7 --- /dev/null +++ b/linux/nios2/get_syscall_args.c @@ -0,0 +1,6 @@ +tcp->u_arg[0] = nios2_regs.regs[4]; +tcp->u_arg[1] = nios2_regs.regs[5]; +tcp->u_arg[2] = nios2_regs.regs[6]; +tcp->u_arg[3] = nios2_regs.regs[7]; +tcp->u_arg[4] = nios2_regs.regs[8]; +tcp->u_arg[5] = nios2_regs.regs[9]; diff --git a/linux/nios2/ioctls_arch0.h b/linux/nios2/ioctls_arch0.h new file mode 100644 index 0000000..f015def --- /dev/null +++ b/linux/nios2/ioctls_arch0.h @@ -0,0 +1 @@ +/* Generated by ioctls_gen.sh from definitions found in $linux/arch/nios2/include/ tree. */ diff --git a/linux/nios2/ioctls_inc0.h b/linux/nios2/ioctls_inc0.h new file mode 100644 index 0000000..4aecf98 --- /dev/null +++ b/linux/nios2/ioctls_inc0.h @@ -0,0 +1 @@ +#include "32/ioctls_inc.h" diff --git a/linux/nios2/print_pc.c b/linux/nios2/print_pc.c new file mode 100644 index 0000000..d22e8f7 --- /dev/null +++ b/linux/nios2/print_pc.c @@ -0,0 +1 @@ +tprintf(fmt, nios2_regs.regs[PTR_EA]); diff --git a/linux/nios2/syscallent.h b/linux/nios2/syscallent.h new file mode 100644 index 0000000..de208f2 --- /dev/null +++ b/linux/nios2/syscallent.h @@ -0,0 +1,4 @@ +#define ARCH_sys_mmap sys_mmap_pgoff +#include "32/syscallent.h" +[244] = {4, 0, sys_cacheflush, "cacheflush"}, +[245 ... 259] = { }, -- 2.3.3 |
From: Ezequiel G. <eze...@va...> - 2015-04-18 21:50:09
|
On 04/18/2015 05:33 PM, Ezequiel Garcia wrote: > This commit adds strace support for Altera's Nios-II. The architecture > is supported by Linux since v3.19, and it implements the generic syscall ABI. > > * Makefile.am, configure.ac: add nios2 files and support > * cacheflush.c: support nios2 cacheflush syscall > * linux/nios2/: arch-specific port > > Signed-off-by: Ezequiel Garcia <eze...@va...> > --- > Makefile.am | 8 ++++++++ > cacheflush.c | 12 ++++++++++++ > configure.ac | 5 +++++ > linux/nios2/arch_regs.c | 2 ++ > linux/nios2/get_error.c | 14 ++++++++++++++ > linux/nios2/get_scno.c | 1 + > linux/nios2/get_syscall_args.c | 6 ++++++ > linux/nios2/ioctls_arch0.h | 1 + > linux/nios2/ioctls_inc0.h | 1 + > linux/nios2/print_pc.c | 1 + > linux/nios2/syscallent.h | 4 ++++ > 11 files changed, 55 insertions(+) BTW, forgot to version this correctly. Current patch is v4. For those interested, here's a link to the previous version: http://marc.info/?l=strace&m=139170929111223&w=2 This v4 patch had to be completely re-written, for two reasons. First, the Nios-II Linux port landed in mainline and now uses the generic syscall ABI. And also, strace arch-specific code was re-organized. The diffstat speaks for itself about the advantages of using the generic syscall ABI and the impact of the strace cleanup (consider v3 had roughly 500 insertions!). Finally, here's a tiny example of strace running Nios-II: # strace ls execve("/bin/ls", ["ls"], [/* 16 vars */]) = 0 brk(0) = 0xb9000 uname({sysname="Linux", nodename="buildroot", ...}) = 0 faccessat(AT_FDCWD, "/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 fstat64(3, {st_mode=S_IFREG|0644, st_size=64, ...}) = 0 mmap2(NULL, 64, PROT_READ, MAP_PRIVATE, 3, 0) = 0x2aac8000 close(3) = 0 openat(AT_FDCWD, "/lib/tls/libc.so.6", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) fstatat64(AT_FDCWD, "/lib/tls", 0x7fb43588, 0) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/lib/libc.so.6", O_RDONLY|O_CLOEXEC) = 3 read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0q\0\1\0\0\0\274l\2\0004\0\0\0"..., 512) = 512 fstat64(3, {st_mode=S_IFREG|0755, st_size=1438528, ...}) = 0 mmap2(NULL, 1445956, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2aac9000 mmap2(0x2ac14000, 81920, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x14a000) = 0x2ac14000 mmap2(0x2ac28000, 8260, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2ac28000 close(3) = 0 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2ac2b000 mprotect(0x2ac14000, 61440, PROT_READ) = 0 mprotect(0x2aac5000, 4096, PROT_READ) = 0 munmap(0x2aac8000, 64) = 0 getuid() = 0 gettimeofday({1167609616, 759566}, NULL) = 0 ioctl(0, TIOCGWINSZ, {ws_row=0, ws_col=0, ws_xpixel=0, ws_ypixel=0}) = 0 ioctl(1, TCGETS, {B115200 opost isig icanon echo ...}) = 0 ioctl(1, TCGETS, {B115200 opost isig icanon echo ...}) = 0 brk(0) = 0xb9000 brk(0xda000) = 0xda000 fstatat64(AT_FDCWD, ".", {st_mode=S_IFDIR|0700, st_size=0, ...}, 0) = 0 openat(AT_FDCWD, ".", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 3 getdents64(3, /* 6 entries */, 32768) = 192 getdents64(3, /* 0 entries */, 32768) = 0 close(3) = 0 exit_group(0) = ? +++ exited with 0 +++ Enjoy! -- Ezequiel Garcia, VanguardiaSur www.vanguardiasur.com.ar |
From: Dmitry V. L. <ld...@al...> - 2015-04-18 21:56:46
|
On Sat, Apr 18, 2015 at 05:46:19PM -0300, Ezequiel Garcia wrote: > On 04/18/2015 05:33 PM, Ezequiel Garcia wrote: > > This commit adds strace support for Altera's Nios-II. The architecture > > is supported by Linux since v3.19, and it implements the generic syscall ABI. > > > > * Makefile.am, configure.ac: add nios2 files and support > > * cacheflush.c: support nios2 cacheflush syscall > > * linux/nios2/: arch-specific port > > > > Signed-off-by: Ezequiel Garcia <eze...@va...> > > --- > > Makefile.am | 8 ++++++++ > > cacheflush.c | 12 ++++++++++++ > > configure.ac | 5 +++++ > > linux/nios2/arch_regs.c | 2 ++ > > linux/nios2/get_error.c | 14 ++++++++++++++ > > linux/nios2/get_scno.c | 1 + > > linux/nios2/get_syscall_args.c | 6 ++++++ > > linux/nios2/ioctls_arch0.h | 1 + > > linux/nios2/ioctls_inc0.h | 1 + > > linux/nios2/print_pc.c | 1 + > > linux/nios2/syscallent.h | 4 ++++ > > 11 files changed, 55 insertions(+) > > BTW, forgot to version this correctly. Current patch > is v4. For those interested, here's a link to the previous > version: > > http://marc.info/?l=strace&m=139170929111223&w=2 > > This v4 patch had to be completely re-written, for two reasons. > First, the Nios-II Linux port landed in mainline and now uses the > generic syscall ABI. And also, strace arch-specific code was re-organized. > > The diffstat speaks for itself about the advantages of using the generic > syscall ABI and the impact of the strace cleanup (consider v3 had roughly > 500 insertions!). That's nice. > Finally, here's a tiny example of strace running Nios-II: > > # strace ls > execve("/bin/ls", ["ls"], [/* 16 vars */]) = 0 Does it pass "make check" tests? -- ldv |
From: Ezequiel G. <eze...@va...> - 2015-04-19 18:39:38
Attachments:
signature.asc
|
On 04/18/2015 06:56 PM, Dmitry V. Levin wrote: > On Sat, Apr 18, 2015 at 05:46:19PM -0300, Ezequiel Garcia wrote: >> On 04/18/2015 05:33 PM, Ezequiel Garcia wrote: >>> This commit adds strace support for Altera's Nios-II. The architecture >>> is supported by Linux since v3.19, and it implements the generic syscall ABI. >>> >>> * Makefile.am, configure.ac: add nios2 files and support >>> * cacheflush.c: support nios2 cacheflush syscall >>> * linux/nios2/: arch-specific port >>> >>> Signed-off-by: Ezequiel Garcia <eze...@va...> >>> --- >>> Makefile.am | 8 ++++++++ >>> cacheflush.c | 12 ++++++++++++ >>> configure.ac | 5 +++++ >>> linux/nios2/arch_regs.c | 2 ++ >>> linux/nios2/get_error.c | 14 ++++++++++++++ >>> linux/nios2/get_scno.c | 1 + >>> linux/nios2/get_syscall_args.c | 6 ++++++ >>> linux/nios2/ioctls_arch0.h | 1 + >>> linux/nios2/ioctls_inc0.h | 1 + >>> linux/nios2/print_pc.c | 1 + >>> linux/nios2/syscallent.h | 4 ++++ >>> 11 files changed, 55 insertions(+) >> >> BTW, forgot to version this correctly. Current patch >> is v4. For those interested, here's a link to the previous >> version: >> >> http://marc.info/?l=strace&m=139170929111223&w=2 >> >> This v4 patch had to be completely re-written, for two reasons. >> First, the Nios-II Linux port landed in mainline and now uses the >> generic syscall ABI. And also, strace arch-specific code was re-organized. >> >> The diffstat speaks for itself about the advantages of using the generic >> syscall ABI and the impact of the strace cleanup (consider v3 had roughly >> 500 insertions!). > > That's nice. > >> Finally, here's a tiny example of strace running Nios-II: >> >> # strace ls >> execve("/bin/ls", ["ls"], [/* 16 vars */]) = 0 > > Does it pass "make check" tests? > > Hm... I have a very limited test platform here. Can only boot limited size initramfs. I could try to fix my bootloader to allow bigger initramfs, but this might take a lot of time. Am I required to run 'make check' to merge this? (Or maybe someone with NFSroot can give it a shot) -- Ezequiel Garcia, VanguardiaSur www.vanguardiasur.com.ar |
From: Dmitry V. L. <ld...@al...> - 2015-04-20 21:29:09
|
On Sun, Apr 19, 2015 at 03:36:31PM -0300, Ezequiel Garcia wrote: > On 04/18/2015 06:56 PM, Dmitry V. Levin wrote: > > On Sat, Apr 18, 2015 at 05:46:19PM -0300, Ezequiel Garcia wrote: > >> On 04/18/2015 05:33 PM, Ezequiel Garcia wrote: > >>> This commit adds strace support for Altera's Nios-II. The architecture > >>> is supported by Linux since v3.19, and it implements the generic syscall ABI. > >>> > >>> * Makefile.am, configure.ac: add nios2 files and support > >>> * cacheflush.c: support nios2 cacheflush syscall > >>> * linux/nios2/: arch-specific port > >>> > >>> Signed-off-by: Ezequiel Garcia <eze...@va...> > >>> --- > >>> Makefile.am | 8 ++++++++ > >>> cacheflush.c | 12 ++++++++++++ > >>> configure.ac | 5 +++++ > >>> linux/nios2/arch_regs.c | 2 ++ > >>> linux/nios2/get_error.c | 14 ++++++++++++++ > >>> linux/nios2/get_scno.c | 1 + > >>> linux/nios2/get_syscall_args.c | 6 ++++++ > >>> linux/nios2/ioctls_arch0.h | 1 + > >>> linux/nios2/ioctls_inc0.h | 1 + > >>> linux/nios2/print_pc.c | 1 + > >>> linux/nios2/syscallent.h | 4 ++++ > >>> 11 files changed, 55 insertions(+) > >> > >> BTW, forgot to version this correctly. Current patch > >> is v4. For those interested, here's a link to the previous > >> version: > >> > >> http://marc.info/?l=strace&m=139170929111223&w=2 > >> > >> This v4 patch had to be completely re-written, for two reasons. > >> First, the Nios-II Linux port landed in mainline and now uses the > >> generic syscall ABI. And also, strace arch-specific code was re-organized. > >> > >> The diffstat speaks for itself about the advantages of using the generic > >> syscall ABI and the impact of the strace cleanup (consider v3 had roughly > >> 500 insertions!). > > > > That's nice. > > > >> Finally, here's a tiny example of strace running Nios-II: > >> > >> # strace ls > >> execve("/bin/ls", ["ls"], [/* 16 vars */]) = 0 > > > > Does it pass "make check" tests? > > Hm... I have a very limited test platform here. > > Can only boot limited size initramfs. I could try to fix my bootloader > to allow bigger initramfs, but this might take a lot of time. > > Am I required to run 'make check' to merge this? No, this is not a strict requirement, but how do you know that the new port works well? -- ldv |
From: Ezequiel G. <eze...@va...> - 2015-04-21 18:21:30
Attachments:
signature.asc
|
On 04/20/2015 06:29 PM, Dmitry V. Levin wrote: > On Sun, Apr 19, 2015 at 03:36:31PM -0300, Ezequiel Garcia wrote: >> On 04/18/2015 06:56 PM, Dmitry V. Levin wrote: >>> On Sat, Apr 18, 2015 at 05:46:19PM -0300, Ezequiel Garcia wrote: >>>> On 04/18/2015 05:33 PM, Ezequiel Garcia wrote: >>>>> This commit adds strace support for Altera's Nios-II. The architecture >>>>> is supported by Linux since v3.19, and it implements the generic syscall ABI. >>>>> >>>>> * Makefile.am, configure.ac: add nios2 files and support >>>>> * cacheflush.c: support nios2 cacheflush syscall >>>>> * linux/nios2/: arch-specific port >>>>> >>>>> Signed-off-by: Ezequiel Garcia <eze...@va...> >>>>> --- >>>>> Makefile.am | 8 ++++++++ >>>>> cacheflush.c | 12 ++++++++++++ >>>>> configure.ac | 5 +++++ >>>>> linux/nios2/arch_regs.c | 2 ++ >>>>> linux/nios2/get_error.c | 14 ++++++++++++++ >>>>> linux/nios2/get_scno.c | 1 + >>>>> linux/nios2/get_syscall_args.c | 6 ++++++ >>>>> linux/nios2/ioctls_arch0.h | 1 + >>>>> linux/nios2/ioctls_inc0.h | 1 + >>>>> linux/nios2/print_pc.c | 1 + >>>>> linux/nios2/syscallent.h | 4 ++++ >>>>> 11 files changed, 55 insertions(+) >>>> >>>> BTW, forgot to version this correctly. Current patch >>>> is v4. For those interested, here's a link to the previous >>>> version: >>>> >>>> http://marc.info/?l=strace&m=139170929111223&w=2 >>>> >>>> This v4 patch had to be completely re-written, for two reasons. >>>> First, the Nios-II Linux port landed in mainline and now uses the >>>> generic syscall ABI. And also, strace arch-specific code was re-organized. >>>> >>>> The diffstat speaks for itself about the advantages of using the generic >>>> syscall ABI and the impact of the strace cleanup (consider v3 had roughly >>>> 500 insertions!). >>> >>> That's nice. >>> >>>> Finally, here's a tiny example of strace running Nios-II: >>>> >>>> # strace ls >>>> execve("/bin/ls", ["ls"], [/* 16 vars */]) = 0 >>> >>> Does it pass "make check" tests? >> >> Hm... I have a very limited test platform here. >> >> Can only boot limited size initramfs. I could try to fix my bootloader >> to allow bigger initramfs, but this might take a lot of time. >> >> Am I required to run 'make check' to merge this? > > No, this is not a strict requirement, but how do you know > that the new port works well? > Well, I did run a few tests before posting this. Not rigorously, though. I can see about running some more tests... or I'll try to run make check natively next week-end and will report the results. -- Ezequiel Garcia, VanguardiaSur www.vanguardiasur.com.ar |
From: Ezequiel G. <eze...@va...> - 2014-02-05 22:20:59
|
* Makefile.am, configure.ac: Add nios2 architecture * defs.h: Add nios2 to use register reading system * linux/nios2/ioctlent.h.in: Use i386 ioctls * linux/nios2/syscallent.h: New file * process.c: Add nios2 register defs to struct_user_offsets[] * syscall.c: Add nios2 support, for get_scno, get_regs, get_syscall_args and get_error * util.c: Add dummy handling * mem.c: Use sys_getpagesize. * system.c: Add nios2 specific syscalls. Signed-off-by: Ezequiel Garcia <eze...@va...> --- Makefile.am | 2 + configure.ac | 4 + defs.h | 3 +- linux/nios2/ioctlent.h.in | 1 + linux/nios2/syscallent.h | 370 ++++++++++++++++++++++++++++++++++++++++++++++ linux/syscall.h | 6 + mem.c | 3 +- process.c | 38 +++++ syscall.c | 27 +++- system.c | 24 +++ util.c | 2 + 11 files changed, 477 insertions(+), 3 deletions(-) create mode 100644 linux/nios2/ioctlent.h.in create mode 100644 linux/nios2/syscallent.h diff --git a/Makefile.am b/Makefile.am index c98d8b9..2ccde2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,6 +112,8 @@ EXTRA_DIST = \ linux/metag/syscallent.h \ linux/microblaze/ioctlent.h.in \ linux/microblaze/syscallent.h \ + linux/nios2/ioctlent.h.in \ + linux/nios2/syscallent.h \ linux/mips/errnoent.h \ linux/mips/ioctlent.h.in \ linux/mips/ioctlent.sh \ diff --git a/configure.ac b/configure.ac index be28ebe..90edb32 100644 --- a/configure.ac +++ b/configure.ac @@ -125,6 +125,10 @@ microblaze*) arch=microblaze AC_DEFINE([MICROBLAZE], 1, [Define for the MicroBlaze architecture.]) ;; +nios2*) + arch=nios2 + AC_DEFINE([NIOS2], 1, [Define for the Nios-II architecture.]) + ;; or1k*) arch=or1k AC_DEFINE([OR1K], 1, [Define for the OpenRISC 1000 architecture.]) diff --git a/defs.h b/defs.h index 95d2571..61c5fda 100644 --- a/defs.h +++ b/defs.h @@ -598,7 +598,8 @@ extern void call_summary(FILE *); || defined(OR1K) \ || defined(METAG) \ || defined(ARC) \ - || defined(POWERPC) + || defined(POWERPC) \ + || defined(NIOS2) extern long get_regs_error; # define clear_regs() (get_regs_error = -1) extern void get_regs(pid_t pid); diff --git a/linux/nios2/ioctlent.h.in b/linux/nios2/ioctlent.h.in new file mode 100644 index 0000000..52ac99b --- /dev/null +++ b/linux/nios2/ioctlent.h.in @@ -0,0 +1 @@ +#include "../i386/ioctlent.h.in" diff --git a/linux/nios2/syscallent.h b/linux/nios2/syscallent.h new file mode 100644 index 0000000..95fd619 --- /dev/null +++ b/linux/nios2/syscallent.h @@ -0,0 +1,370 @@ +/* + * Copyright (c) 2014 Ezequiel Garcia <eze...@va...> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + { 0, 0, sys_restart_syscall, "restart_syscall" }, /* 0 */ + { 1, TP, sys_exit, "_exit" }, /* 1 */ + { 0, TP, sys_fork, "fork" }, /* 2 */ + { 3, TD, sys_read, "read" }, /* 3 */ + { 3, TD, sys_write, "write" }, /* 4 */ + { 3, TD|TF, sys_open, "open" }, /* 5 */ + { 1, TD, sys_close, "close" }, /* 6 */ + { 3, TP, sys_waitpid, "waitpid" }, /* 7 */ + { 2, TD|TF, sys_creat, "creat" }, /* 8 */ + { 2, TF, sys_link, "link" }, /* 9 */ + { 1, TF, sys_unlink, "unlink" }, /* 10 */ + { 3, TF|TP, sys_execve, "execve" }, /* 11 */ + { 1, TF, sys_chdir, "chdir" }, /* 12 */ + { 1, 0, sys_time, "time" }, /* 13 */ + { 3, TF, sys_mknod, "mknod" }, /* 14 */ + { 2, TF, sys_chmod, "chmod" }, /* 15 */ + { 3, TF, sys_chown, "lchown" }, /* 16 */ + { 0, TM, NULL, NULL }, /* 17 */ + { 2, TF, NULL, NULL }, /* 18 */ + { 3, TD, sys_lseek, "lseek" }, /* 19 */ + { 0, 0, sys_getpid, "getpid" }, /* 20 */ + { 5, TF, sys_mount, "mount" }, /* 21 */ + { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, 0, sys_setuid, "setuid" }, /* 23 */ + { 0, NF, sys_getuid, "getuid" }, /* 24 */ + { 1, 0, sys_stime, "stime" }, /* 25 */ + { 4, 0, sys_ptrace, "ptrace" }, /* 26 */ + { 1, 0, sys_alarm, "alarm" }, /* 27 */ + { 2, TD, NULL, NULL }, /* 28 */ + { 0, TS, sys_pause, "pause" }, /* 29 */ + { 2, TF, sys_utime, "utime" }, /* 30 */ + { 2, 0, NULL, NULL }, /* 31 */ + { 2, 0, NULL, NULL }, /* 32 */ + { 2, TF, sys_access, "access" }, /* 33 */ + { 1, 0, sys_nice, "nice" }, /* 34 */ + { 0, 0, NULL, NULL }, /* 35 */ + { 0, 0, sys_sync, "sync" }, /* 36 */ + { 2, TS, sys_kill, "kill" }, /* 37 */ + { 2, TF, sys_rename, "rename" }, /* 38 */ + { 2, TF, sys_mkdir, "mkdir" }, /* 39 */ + { 1, TF, sys_rmdir, "rmdir" }, /* 40 */ + { 1, TD, sys_dup, "dup" }, /* 41 */ + { 1, TD, sys_pipe, "pipe" }, /* 42 */ + { 1, 0, sys_times, "times" }, /* 43 */ + { 0, 0, NULL, NULL }, /* 44 */ + { 1, TM, sys_brk, "brk" }, /* 45 */ + { 1, 0, sys_setgid, "setgid" }, /* 46 */ + { 0, NF, sys_getgid, "getgid" }, /* 47 */ + { 3, TS, NULL, NULL }, /* 48 */ + { 0, NF, sys_geteuid, "geteuid" }, /* 49 */ + { 0, NF, sys_getegid, "getegid" }, /* 50 */ + { 1, TF, sys_acct, "acct" }, /* 51 */ + { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 0, 0, NULL, NULL }, /* 53 */ + { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ + { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ + { 0, 0, NULL, NULL }, /* 56 */ + { 2, 0, sys_setpgid, "setpgid" }, /* 57 */ + { 2, 0, NULL, NULL }, /* 58 */ + { 1, 0, NULL, NULL }, /* 59 */ + { 1, 0, sys_umask, "umask" }, /* 60 */ + { 1, TF, sys_chroot, "chroot" }, /* 61 */ + { 2, 0, sys_ustat, "ustat" }, /* 62 */ + { 2, TD, sys_dup2, "dup2" }, /* 63 */ + { 0, 0, sys_getppid, "getppid" }, /* 64 */ + { 0, 0, sys_getpgrp, "getpgrp" }, /* 65 */ + { 0, 0, sys_setsid, "setsid" }, /* 66 */ + { 3, TS, sys_sigaction, "sigaction" }, /* 67 */ + { 0, TS, NULL, NULL }, /* 68 */ + { 1, TS, NULL, NULL }, /* 69 */ + { 2, 0, sys_setreuid, "setreuid" }, /* 70 */ + { 2, 0, sys_setregid, "setregid" }, /* 71 */ + { 3, TS, sys_sigsuspend, "sigsuspend" }, /* 72 */ + { 1, TS, sys_sigpending, "sigpending" }, /* 73 */ + { 2, 0, sys_sethostname, "sethostname" }, /* 74 */ + { 2, 0, sys_setrlimit, "setrlimit" }, /* 75 */ + { 2, 0, NULL, NULL }, /* 76 */ + { 2, 0, sys_getrusage, "getrusage" }, /* 77 */ + { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 78 */ + { 2, 0, sys_settimeofday, "settimeofday" }, /* 79 */ + { 2, 0, sys_getgroups, "getgroups" }, /* 80 */ + { 2, 0, sys_setgroups, "setgroups" }, /* 81 */ + { 1, TD, sys_oldselect, "oldselect" }, /* 82 */ + { 2, TF, sys_symlink, "symlink" }, /* 83 */ + { 2, TF, NULL, NULL }, /* 84 */ + { 3, TF, sys_readlink, "readlink" }, /* 85 */ + { 1, TF, sys_uselib, "uselib" }, /* 86 */ + { 2, TF, sys_swapon, "swapon" }, /* 87 */ + { 4, 0, sys_reboot, "reboot" }, /* 88 */ + { 3, TD, NULL, NULL }, /* 89 */ + { 6, TD|TM, sys_mmap, "old_mmap" }, /* 90 */ + { 2, TM, sys_munmap, "munmap" }, /* 91 */ + { 2, TF, sys_truncate, "truncate" }, /* 92 */ + { 2, TD, sys_ftruncate, "ftruncate" }, /* 93 */ + { 2, TD, sys_fchmod, "fchmod" }, /* 94 */ + { 3, TD, sys_fchown, "fchown" }, /* 95 */ + { 2, 0, sys_getpriority, "getpriority" }, /* 96 */ + { 3, 0, sys_setpriority, "setpriority" }, /* 97 */ + { 4, 0, NULL, NULL }, /* 98 */ + { 2, TF, sys_statfs, "statfs" }, /* 99 */ + { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ + { 3, 0, NULL, NULL }, /* 101 */ + { 2, TD, sys_socketcall, "socketcall" }, /* 102 */ + { 3, 0, sys_syslog, "syslog" }, /* 103 */ + { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ + { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ + { 2, TF, sys_stat, "stat" }, /* 106 */ + { 2, TF, sys_lstat, "lstat" }, /* 107 */ + { 2, TD, sys_fstat, "fstat" }, /* 108 */ + { 1, 0, NULL, NULL }, /* 109 */ + { 1, 0, NULL, NULL }, /* 110 */ + { 0, 0, sys_vhangup, "vhangup" }, /* 111 */ + { 0, 0, NULL, NULL }, /* 112 */ + { 1, 0, sys_nios2cmpxchg, "nios2_cmpxchg" }, /* 113 */ + { 4, TP, sys_wait4, "wait4" }, /* 114 */ + { 1, TF, sys_swapoff, "swapoff" }, /* 115 */ + { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ + { 6, TI, sys_ipc, "ipc" }, /* 117 */ + { 1, TD, sys_fsync, "fsync" }, /* 118 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 5, TP, sys_clone, "clone" }, /* 120 */ + { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ + { 1, 0, sys_uname, "uname" }, /* 122 */ + { 3, 0, sys_cacheflush, "cacheflush" }, /* 123 */ + { 1, 0, sys_adjtimex, "adjtimex" }, /* 124 */ + { 3, TM, sys_mprotect, "mprotect" }, /* 125 */ + { 3, TS, sys_sigprocmask, "sigprocmask" }, /* 126 */ + { 2, 0, NULL, NULL }, /* 127 */ + { 3, 0, sys_init_module, "init_module" }, /* 128 */ + { 2, 0, sys_delete_module, "delete_module" }, /* 129 */ + { 1, 0, NULL, NULL }, /* 130 */ + { 4, TF, sys_quotactl, "quotactl" }, /* 131 */ + { 1, 0, sys_getpgid, "getpgid" }, /* 132 */ + { 1, TD, sys_fchdir, "fchdir" }, /* 133 */ + { 0, 0, sys_bdflush, "bdflush" }, /* 134 */ + { 3, 0, sys_sysfs, "sysfs" }, /* 135 */ + { 1, 0, sys_personality, "personality" }, /* 136 */ + { 5, 0, NULL, NULL }, /* 137 */ + { 1, NF, sys_setfsuid, "setfsuid" }, /* 138 */ + { 1, NF, sys_setfsgid, "setfsgid" }, /* 139 */ + { 5, TD, sys_llseek, "_llseek" }, /* 140 */ + { 3, TD, sys_getdents, "getdents" }, /* 141 */ + { 5, TD, sys_select, "select" }, /* 142 */ + { 2, TD, sys_flock, "flock" }, /* 143 */ + { 3, TM, sys_msync, "msync" }, /* 144 */ + { 3, TD, sys_readv, "readv" }, /* 145 */ + { 3, TD, sys_writev, "writev" }, /* 146 */ + { 1, 0, sys_getsid, "getsid" }, /* 147 */ + { 1, TD, sys_fdatasync, "fdatasync" }, /* 148 */ + { 1, 0, sys_sysctl, "_sysctl" }, /* 149 */ + { 2, TM, sys_mlock, "mlock" }, /* 150 */ + { 2, TM, sys_munlock, "munlock" }, /* 151 */ + { 1, TM, sys_mlockall, "mlockall" }, /* 152 */ + { 0, TM, sys_munlockall, "munlockall" }, /* 153 */ + { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 154 */ + { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 155 */ + { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 156 */ + { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 157 */ + { 0, 0, sys_sched_yield, "sched_yield"}, /* 158 */ + { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */ + { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */ + { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */ + { 2, 0, sys_nanosleep, "nanosleep" }, /* 162 */ + { 5, TM, sys_mremap, "mremap" }, /* 163 */ + { 3, 0, sys_setresuid, "setresuid" }, /* 164 */ + { 3, 0, sys_getresuid, "getresuid" }, /* 165 */ + { 5, 0, sys_getpagesize, "getpagesize" }, /* 166 */ + { 5, 0, NULL, NULL }, /* 167 */ + { 3, TD, sys_poll, "poll" }, /* 168 */ + { 3, 0, NULL, NULL }, /* 169 */ + { 3, 0, sys_setresgid, "setresgid" }, /* 170 */ + { 3, 0, sys_getresgid, "getresgid" }, /* 171 */ + { 5, 0, sys_prctl, "prctl" }, /* 172 */ + { 0, TS, sys_rt_sigreturn, "rt_sigreturn" }, /* 173 */ + { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */ + { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 175 */ + { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */ + { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 177 */ + { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 178 */ + { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 179 */ + { 5, TD, sys_pread, "pread64" }, /* 180 */ + { 5, TD, sys_pwrite, "pwrite64" }, /* 181 */ + { 3, TF, sys_chown, "chown" }, /* 182 */ + { 2, TF, sys_getcwd, "getcwd" }, /* 183 */ + { 2, 0, sys_capget, "capget" }, /* 184 */ + { 2, 0, sys_capset, "capset" }, /* 185 */ + { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ + { 5, 0, NULL, NULL }, /* 188 */ + { 5, 0, NULL, NULL }, /* 189 */ + { 0, TP, sys_vfork, "vfork" }, /* 190 */ + { 2, 0, sys_getrlimit, "getrlimit" }, /* 191 */ + { 6, TD|TM, sys_mmap_pgoff, "mmap2" }, /* 192 */ + { 3, TF, sys_truncate64, "truncate64" }, /* 193 */ + { 3, TD, sys_ftruncate64, "ftruncate64" }, /* 194 */ + { 2, TF, sys_stat64, "stat64" }, /* 195 */ + { 2, TF, sys_lstat64, "lstat64" }, /* 196 */ + { 2, TD, sys_fstat64, "fstat64" }, /* 197 */ + { 3, TF, sys_chown, "lchown32" }, /* 198 */ + { 0, NF, sys_getuid, "getuid32" }, /* 199 */ + { 0, NF, sys_getgid, "getgid32" }, /* 200 */ + { 0, NF, sys_geteuid, "geteuid32" }, /* 201 */ + { 0, NF, sys_getegid, "getegid32" }, /* 202 */ + { 2, 0, sys_setreuid, "setreuid32" }, /* 203 */ + { 2, 0, sys_setregid, "setregid32" }, /* 204 */ + { 2, 0, sys_getgroups32, "getgroups32" }, /* 205 */ + { 2, 0, sys_setgroups32, "setgroups32" }, /* 206 */ + { 3, TD, sys_fchown, "fchown32" }, /* 207 */ + { 3, 0, sys_setresuid, "setresuid32" }, /* 208 */ + { 3, 0, sys_getresuid, "getresuid32" }, /* 209 */ + { 3, 0, sys_setresgid, "setresgid32" }, /* 210 */ + { 3, 0, sys_getresgid, "getresgid32" }, /* 211 */ + { 3, TF, sys_chown, "chown32" }, /* 212 */ + { 1, 0, sys_setuid, "setuid32" }, /* 213 */ + { 1, 0, sys_setgid, "setgid32" }, /* 214 */ + { 1, NF, sys_setfsuid, "setfsuid32" }, /* 215 */ + { 1, NF, sys_setfsgid, "setfsgid32" }, /* 216 */ + { 2, TF, sys_pivotroot, "pivot_root" }, /* 217 */ + { 3, TM, NULL, NULL }, /* 218 */ + { 3, TM, NULL, NULL }, /* 219 */ + { 3, TD, sys_getdents64, "getdents64" }, /* 220 */ + { 3, TD, sys_gettid, "gettid" }, /* 221 */ + { 2, TS, sys_kill, "tkill" }, /* 222 */ + { 5, TF, sys_setxattr, "setxattr" }, /* 223 */ + { 5, TF, sys_setxattr, "lsetxattr" }, /* 224 */ + { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 225 */ + { 4, TF, sys_getxattr, "getxattr" }, /* 226 */ + { 4, TF, sys_getxattr, "lgetxattr" }, /* 237 */ + { 4, TD, sys_fgetxattr, "fgetxattr" }, /* 228 */ + { 3, TF, sys_listxattr, "listxattr" }, /* 229 */ + { 3, TF, sys_listxattr, "llistxattr" }, /* 230 */ + { 3, TD, sys_flistxattr, "flistxattr" }, /* 231 */ + { 2, TF, sys_removexattr, "removexattr" }, /* 232 */ + { 2, TF, sys_removexattr, "lremovexattr" }, /* 233 */ + { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 234 */ + { 6, 0, sys_futex, "futex" }, /* 235 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 236 */ + { 3, TM, sys_mincore, "mincore" }, /* 237 */ + { 3, TM, sys_madvise, "madvise" }, /* 238 */ + { 3, TD, sys_fcntl, "fcntl64" }, /* 239 */ + { 4, TD, sys_readahead, "readahead" }, /* 240 */ + { 2, 0, sys_io_setup, "io_setup" }, /* 241 */ + { 1, 0, sys_io_destroy, "io_destroy" }, /* 242 */ + { 5, 0, sys_io_getevents, "io_getevents" }, /* 243 */ + { 3, 0, sys_io_submit, "io_submit" }, /* 244 */ + { 3, 0, sys_io_cancel, "io_cancel" }, /* 245 */ + { 5, TD, sys_fadvise64, "fadvise64" }, /* 246 */ + { 1, TP, sys_exit, "exit_group" }, /* 247 */ + { 4, 0, sys_lookup_dcookie, "lookup_dcookie"}, /* 248 */ + { 1, TD, sys_epoll_create, "epoll_create" }, /* 249 */ + { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 250 */ + { 4, TD, sys_epoll_wait, "epoll_wait" }, /* 251 */ + { 5, TM, sys_remap_file_pages, "remap_file_pages"}, /* 252 */ + { 1, 0, sys_set_tid_address, "set_tid_address"}, /* 253 */ + { 3, 0, sys_timer_create, "timer_create" }, /* 254 */ + { 4, 0, sys_timer_settime, "timer_settime" }, /* 255 */ + { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 256 */ + { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 257 */ + { 1, 0, sys_timer_delete, "timer_delete" }, /* 258 */ + { 2, 0, sys_clock_settime, "clock_settime" }, /* 259 */ + { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 260 */ + { 2, 0, sys_clock_getres, "clock_getres" }, /* 261 */ + { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 262 */ + { 3, TF, sys_statfs64, "statfs64" }, /* 263 */ + { 3, TD, sys_fstatfs64, "fstatfs64" }, /* 264 */ + { 3, TS, sys_tgkill, "tgkill" }, /* 265 */ + { 2, TF, sys_utimes, "utimes" }, /* 266 */ + { 6, TD, sys_fadvise64_64, "fadvise64_64" }, /* 267 */ + { 6, TM, sys_mbind, "mbind" }, /* 268 */ + { 5, TM, sys_get_mempolicy, "get_mempolicy" }, /* 269 */ + { 3, TM, sys_set_mempolicy, "set_mempolicy" }, /* 270 */ + { 4, 0, sys_mq_open, "mq_open" }, /* 271 */ + { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 272 */ + { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 273 */ + { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 274 */ + { 2, 0, sys_mq_notify, "mq_notify" }, /* 275 */ + { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 276 */ + { 5, TP, sys_waitid, "waitid" }, /* 277 */ + { 6, 0, NULL, NULL }, /* 278 */ + { 5, 0, sys_add_key, "add_key" }, /* 279 */ + { 4, 0, sys_request_key, "request_key" }, /* 280 */ + { 5, 0, sys_keyctl, "keyctl" }, /* 281 */ + { 3, 0, sys_ioprio_set, "ioprio_set" }, /* 282 */ + { 2, 0, sys_ioprio_get, "ioprio_get" }, /* 283 */ + { 0, TD, sys_inotify_init, "inotify_init" }, /* 284 */ + { 3, TD, sys_inotify_add_watch, "inotify_add_watch" }, /* 285 */ + { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 286 */ + { 4, TM, sys_migrate_pages, "migrate_pages" }, /* 287 */ + { 4, TD|TF, sys_openat, "openat" }, /* 288 */ + { 3, TD|TF, sys_mkdirat, "mkdirat" }, /* 289 */ + { 4, TD|TF, sys_mknodat, "mknodat" }, /* 290 */ + { 5, TD|TF, sys_fchownat, "fchownat" }, /* 291 */ + { 3, TD|TF, sys_futimesat, "futimesat" }, /* 292 */ + { 4, TD|TF, sys_newfstatat, "fstatat64" }, /* 293 */ + { 3, TD|TF, sys_unlinkat, "unlinkat" }, /* 294 */ + { 4, TD|TF, sys_renameat, "renameat" }, /* 295 */ + { 5, TD|TF, sys_linkat, "linkat" }, /* 296 */ + { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 297 */ + { 4, TD|TF, sys_readlinkat, "readlinkat" }, /* 298 */ + { 3, TD|TF, sys_fchmodat, "fchmodat" }, /* 299 */ + { 3, TD|TF, sys_faccessat, "faccessat" }, /* 300 */ + { 6, TD, sys_pselect6, "pselect6" }, /* 301 */ + { 5, TD, sys_ppoll, "ppoll" }, /* 302 */ + { 1, TP, sys_unshare, "unshare" }, /* 303 */ + { 2, 0, sys_set_robust_list, "set_robust_list" }, /* 304 */ + { 3, 0, sys_get_robust_list, "get_robust_list" }, /* 305 */ + { 6, TD, sys_splice, "splice" }, /* 306 */ + { 6, TD, sys_sync_file_range, "sync_file_range" }, /* 307 */ + { 4, TD, sys_tee, "tee" }, /* 308 */ + { 4, TD, sys_vmsplice, "vmsplice" }, /* 309 */ + { 6, TM, sys_move_pages, "move_pages" }, /* 310 */ + { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 311 */ + { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 312 */ + { 4, 0, sys_kexec_load, "kexec_load" }, /* 313 */ + { 3, 0, sys_getcpu, "getcpu" }, /* 314 */ + { 6, TD, sys_epoll_pwait, "epoll_pwait" }, /* 315 */ + { 4, TD|TF, sys_utimensat, "utimensat" }, /* 316 */ + { 3, TD|TS, sys_signalfd, "signalfd" }, /* 317 */ + { 2, TD, sys_timerfd_create, "timerfd_create"}, /* 318 */ + { 1, TD, sys_eventfd, "eventfd" }, /* 319 */ + { 5, TD, sys_pread, "pread64" }, /* 320 */ + { 5, TD, sys_pwrite, "pwrite64" }, /* 321 */ + { 6, TD, sys_fallocate, "fallocate" }, /* 322 */ + { 4, TD, sys_timerfd_settime, "timerfd_settime"}, /* 323 */ + { 2, TD, sys_timerfd_gettime, "timerfd_gettime"}, /* 324 */ + { 4, TD|TS, sys_signalfd4, "signalfd4" }, /* 325 */ + { 2, TD, sys_eventfd2, "eventfd2" }, /* 326 */ + { 1, TD, sys_epoll_create1, "epoll_create1" }, /* 327 */ + { 3, TD, sys_dup3, "dup3" }, /* 328 */ + { 2, TD, sys_pipe2, "pipe2" }, /* 329 */ + { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 330 */ + { 5, TD, sys_preadv, "preadv" }, /* 331 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 332 */ + { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 333 */ + { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 334 */ + { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 335 */ + { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 336 */ + { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 337 */ + { 4, 0, sys_prlimit64, "prlimit64" }, /* 338 */ + { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 339 */ + { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 340 */ + { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 341 */ + { 1, TD, sys_syncfs, "syncfs" }, /* 342 */ diff --git a/linux/syscall.h b/linux/syscall.h index 502e8eb..ce7e7e2 100644 --- a/linux/syscall.h +++ b/linux/syscall.h @@ -346,3 +346,9 @@ int sys_execv(); int sys_getmsg(); int sys_putmsg(); #endif + +#ifdef NIOS2 +int sys_getpagesize(); +int sys_cacheflush(); +int sys_nios2cmpxchg(); +#endif diff --git a/mem.c b/mem.c index 2c51cc7..2568700 100644 --- a/mem.c +++ b/mem.c @@ -533,7 +533,8 @@ sys_mincore(struct tcb *tcp) return 0; } -#if defined(ALPHA) || defined(IA64) || defined(SPARC) || defined(SPARC64) +#if defined(ALPHA) || defined(IA64) || defined (NIOS2) || \ + defined(SPARC) || defined(SPARC64) int sys_getpagesize(struct tcb *tcp) { diff --git a/process.c b/process.c index 5a648a9..1519e69 100644 --- a/process.c +++ b/process.c @@ -2373,6 +2373,42 @@ const struct xlat struct_user_offsets[] = { { REG_A_BASE+14, "a14" }, { REG_A_BASE+15, "a15" }, #endif +#ifdef NIOS2 + { 4*0, "r0" }, + { 4*1, "r1" }, + { 4*2, "r2" }, + { 4*3, "r3" }, + { 4*4, "r4" }, + { 4*5, "r5" }, + { 4*6, "r6" }, + { 4*7, "r7" }, + { 4*8, "r8" }, + { 4*9, "r9" }, + { 4*10, "r10" }, + { 4*11, "r11" }, + { 4*12, "r12" }, + { 4*13, "r13" }, + { 4*14, "r14" }, + { 4*15, "r15" }, + { 4*16, "r16" }, + { 4*17, "r17" }, + { 4*18, "r18" }, + { 4*19, "r19" }, + { 4*20, "r20" }, + { 4*21, "r21" }, + { 4*22, "r22" }, + { 4*23, "r23" }, + { 4*24, "r24" }, + { 4*25, "r25" }, + { 4*26, "r26" }, + { 4*27, "r27" }, + { 4*28, "r28" }, + { 4*29, "r29" }, + { 4*30, "r30" }, + { 4*31, "r31" }, + { 4*32, "pc" }, + { 4*33, "sr" }, +#endif /* Other fields in "struct user" */ #if defined(S390) || defined(S390X) @@ -2507,6 +2543,8 @@ const struct xlat struct_user_offsets[] = { { sizeof(struct user), "sizeof(struct user)" }, #elif defined(OR1K) /* nothing */ +#elif defined(NIOS2) + /* nothing */ #elif defined(METAG) /* nothing */ #elif defined(XTENSA) diff --git a/syscall.c b/syscall.c index 4b6b4eb..7a4ba8b 100644 --- a/syscall.c +++ b/syscall.c @@ -778,6 +778,8 @@ static long xtensa_a2; # elif defined(ARC) static struct user_regs_struct arc_regs; # define ARCH_REGS_FOR_GETREGSET arc_regs +#elif defined(NIOS2) +static struct user_regs nios2_regs; #endif void @@ -1052,6 +1054,8 @@ get_regs(pid_t pid) get_regs_error = ptrace(PTRACE_GETREGS, pid, NULL, &tile_regs); # elif defined(SPARC) || defined(SPARC64) get_regs_error = ptrace(PTRACE_GETREGS, pid, (char *)&sparc_regs, 0); +# elif defined(NIOS2) + get_regs_error = ptrace(PTRACE_GETREGS, pid, NULL, &nios2_regs); # elif defined(POWERPC) static bool old_kernel = 0; if (old_kernel) @@ -1551,6 +1555,8 @@ get_scno(struct tcb *tcp) return -1; # elif defined(ARC) scno = arc_regs.scratch.r8; +#elif defined(NIOS2) + scno = nios2_regs.uregs[2]; #endif tcp->scno = scno; @@ -1945,7 +1951,9 @@ get_syscall_args(struct tcb *tcp) long *arc_args = &arc_regs.scratch.r0; for (i = 0; i < nargs; ++i) tcp->u_arg[i] = *arc_args--; - +#elif defined(NIOS2) + for (i = 0; i < nargs; i++) + tcp->u_arg[i] = nios2_regs.uregs[i + 4]; #else /* Other architecture (32bits specific) */ for (i = 0; i < nargs; ++i) if (upeek(tcp->pid, i*4, &tcp->u_arg[i]) < 0) @@ -2146,6 +2154,8 @@ get_syscall_result(struct tcb *tcp) return -1; #elif defined(ARC) /* already done by get_regs */ +#elif defined(NIOS2) + /* already done by get_regs */ #endif return 1; } @@ -2459,6 +2469,21 @@ get_error(struct tcb *tcp) else { tcp->u_rval = arc_regs.scratch.r0; } +#elif defined(NIOS2) + /* + * The system call convention specifies that r2 contains the return + * value on success or a positive error number on failure. A flag + * indicating successful completion is written to r7; r7=0 indicates + * the system call success, r7=1 indicates an error. The positive + * errno value written in r2. + */ + if (check_errno && nios2_regs.uregs[7]) { + tcp->u_rval = -1; + u_error = nios2_regs.uregs[2]; + } + else { + tcp->u_rval = nios2_regs.uregs[2]; + } #endif tcp->u_error = u_error; } diff --git a/system.c b/system.c index 26d0d7f..d35b5c3 100644 --- a/system.c +++ b/system.c @@ -1086,3 +1086,27 @@ int sys_or1k_atomic(struct tcb *tcp) } #endif /* OR1K */ + +#ifdef NIOS2 + +int sys_cacheflush(struct tcb *tcp) +{ + if (entering(tcp)) { + /* addr and len */ + tprintf("%#lx, %lu", tcp->u_arg[0], tcp->u_arg[3]); + /* scope and flags (cache type) is currently ignored */ + } + return 0; +} + +/* Nios-II specific compare and exchange syscall for atomic operations */ +int sys_nios2cmpxchg(struct tcb *tcp) +{ + if (entering(tcp)) { + tprintf("%#lx, %#lx, %#lx", tcp->u_arg[0], tcp->u_arg[1], + tcp->u_arg[2]); + } + + return RVAL_HEX; +} +#endif /* NIOS2 */ diff --git a/util.c b/util.c index 85bb94c..da82c7a 100644 --- a/util.c +++ b/util.c @@ -1448,6 +1448,8 @@ change_syscall(struct tcb *tcp, arg_setup_state *state, int new) /* microblaze is only supported since about linux-2.6.30 */ #elif defined(OR1K) /* never reached; OR1K is only supported by kernels since 3.1.0. */ +#elif defined(NIOS2) + /* never reached; Nios-II is only supported by kernels since 3.7.0. */ #elif defined(METAG) /* setbpt/clearbpt never used: */ /* Meta is only supported since linux-3.7 */ -- 1.8.1.5 |
From: Michal S. <mo...@mo...> - 2014-02-06 08:19:23
Attachments:
signature.asc
|
On 02/05/2014 11:15 PM, Ezequiel Garcia wrote: > * Makefile.am, configure.ac: Add nios2 architecture > * defs.h: Add nios2 to use register reading system > * linux/nios2/ioctlent.h.in: Use i386 ioctls > * linux/nios2/syscallent.h: New file > * process.c: Add nios2 register defs to struct_user_offsets[] > * syscall.c: Add nios2 support, for get_scno, get_regs, get_syscall_args > and get_error > * util.c: Add dummy handling > * mem.c: Use sys_getpagesize. > * system.c: Add nios2 specific syscalls. > > Signed-off-by: Ezequiel Garcia <eze...@va...> > --- > Makefile.am | 2 + > configure.ac | 4 + > defs.h | 3 +- > linux/nios2/ioctlent.h.in | 1 + > linux/nios2/syscallent.h | 370 ++++++++++++++++++++++++++++++++++++++++++++++ > linux/syscall.h | 6 + > mem.c | 3 +- > process.c | 38 +++++ > syscall.c | 27 +++- > system.c | 24 +++ > util.c | 2 + > 11 files changed, 477 insertions(+), 3 deletions(-) > create mode 100644 linux/nios2/ioctlent.h.in > create mode 100644 linux/nios2/syscallent.h > > diff --git a/Makefile.am b/Makefile.am > index c98d8b9..2ccde2f 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -112,6 +112,8 @@ EXTRA_DIST = \ > linux/metag/syscallent.h \ > linux/microblaze/ioctlent.h.in \ > linux/microblaze/syscallent.h \ > + linux/nios2/ioctlent.h.in \ > + linux/nios2/syscallent.h \ > linux/mips/errnoent.h \ > linux/mips/ioctlent.h.in \ > linux/mips/ioctlent.sh \ Why not to keep it sorted? M -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform |
From: Ezequiel G. <eze...@va...> - 2014-02-06 10:30:25
|
On 6 February 2014 04:11, Michal Simek <mo...@mo...> wrote: > On 02/05/2014 11:15 PM, Ezequiel Garcia wrote: >> * Makefile.am, configure.ac: Add nios2 architecture >> * defs.h: Add nios2 to use register reading system >> * linux/nios2/ioctlent.h.in: Use i386 ioctls >> * linux/nios2/syscallent.h: New file >> * process.c: Add nios2 register defs to struct_user_offsets[] >> * syscall.c: Add nios2 support, for get_scno, get_regs, get_syscall_args >> and get_error >> * util.c: Add dummy handling >> * mem.c: Use sys_getpagesize. >> * system.c: Add nios2 specific syscalls. >> >> Signed-off-by: Ezequiel Garcia <eze...@va...> >> --- >> Makefile.am | 2 + >> configure.ac | 4 + >> defs.h | 3 +- >> linux/nios2/ioctlent.h.in | 1 + >> linux/nios2/syscallent.h | 370 ++++++++++++++++++++++++++++++++++++++++++++++ >> linux/syscall.h | 6 + >> mem.c | 3 +- >> process.c | 38 +++++ >> syscall.c | 27 +++- >> system.c | 24 +++ >> util.c | 2 + >> 11 files changed, 477 insertions(+), 3 deletions(-) >> create mode 100644 linux/nios2/ioctlent.h.in >> create mode 100644 linux/nios2/syscallent.h >> >> diff --git a/Makefile.am b/Makefile.am >> index c98d8b9..2ccde2f 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -112,6 +112,8 @@ EXTRA_DIST = \ >> linux/metag/syscallent.h \ >> linux/microblaze/ioctlent.h.in \ >> linux/microblaze/syscallent.h \ >> + linux/nios2/ioctlent.h.in \ >> + linux/nios2/syscallent.h \ >> linux/mips/errnoent.h \ >> linux/mips/ioctlent.h.in \ >> linux/mips/ioctlent.sh \ > > Why not to keep it sorted? > Yes, that'll be probably better. Thanks, -- Ezequiel García, VanguardiaSur www.vanguardiasur.com.ar |