fix merging issues

arch/alpha/isa_traits.hh:
arch/sparc/linux/process.cc:
    fix merging problem
sim/syscall_emul.cc:
    use setIntReg

--HG--
extra : convert_revision : e88d72e415493cd17d7b88c22c7e995f3199e396

diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 6f6b11e62cc362a48ab4790e4a59b939001da757..0cf31cb503759bf052c016a1a0f5d1b7e4f4d7df 100644 (file)
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -125,6 +125,7 @@ namespace AlphaISA
     const int ArgumentReg5 = 21;
     const int SyscallNumReg = ReturnValueReg;
     const int SyscallPseudoReturnReg = ArgumentReg4;
+    const int SyscallSuccessReg = 19;
 
 
 
@@ -341,6 +342,8 @@ extern const int reg_redir[NumIntRegs];
     template <class XC>
     void zeroRegisters(XC *xc);
 
+    const Addr MaxAddr = (Addr)-1;
+
     static inline void setSyscallReturn(SyscallReturn return_value, RegFile *regs)
     {
         // check for error condition.  Alpha syscall convention is to
@@ -356,6 +359,7 @@ extern const int reg_redir[NumIntRegs];
             regs->intRegFile[ReturnValueReg] = -return_value.value();
         }
     }
+};
 
 static inline AlphaISA::ExtMachInst
 AlphaISA::makeExtMI(AlphaISA::MachInst inst, const uint64_t &pc) {

diff --git a/arch/sparc/linux/process.cc b/arch/sparc/linux/process.cc
index 5965e6da92e715e601ba85d88dc536651cbea553..fa2a7b9f5f025d3d4efa2cc0b78884734d0103e4 100644 (file)
--- a/arch/sparc/linux/process.cc
+++ b/arch/sparc/linux/process.cc
@@ -60,289 +60,290 @@ unameFunc(SyscallDesc *desc, int callnum, Process *process,
 }
 
 SyscallDesc SparcLinuxProcess::syscallDescs[] = {
-    /*  0 */ SyscallDesc("restart_syscall", unimplimentedFunc);
+    /*  0 */ SyscallDesc("restart_syscall", unimplementedFunc);
     /*  1 */ SyscallDesc("exit", exitFunc);
+    /*  2 */ SyscallDesc("fork", unimplementedFunc);
     /*  3 */ SyscallDesc("read", readFunc);
     /*  4 */ SyscallDesc("write", writeFunc);
     /*  5 */ SyscallDesc("open", openFunc<Linux>);
     /*  6 */ SyscallDesc("close", closeFinc);
-    /*  7 */ SyscallDesc("wait4", unimplimentedFunc);
-    /*  8 */ SyscallDesc("creat", unimplimentedFunc);
-    /*  9 */ SyscallDesc("link", unimplimentedFunc);
+    /*  7 */ SyscallDesc("wait4", unimplementedFunc);
+    /*  8 */ SyscallDesc("creat", unimplementedFunc);
+    /*  9 */ SyscallDesc("link", unimplementedFunc);
     /* 10 */ SyscallDesc("unlink", unlinkFunc);
-    /* 11 */ SyscallDesc("execv", unimplimentedFunc);
-    /* 12 */ SyscallDesc("chdir", unimplimentedFunc);
+    /* 11 */ SyscallDesc("execv", unimplementedFunc);
+    /* 12 */ SyscallDesc("chdir", unimplementedFunc);
     /* 13 */ SyscallDesc("chown", chownFunc);
-    /* 14 */ SyscallDesc("mknod", unimplimentedFunc);
+    /* 14 */ SyscallDesc("mknod", unimplementedFunc);
     /* 15 */ SyscallDesc("chmod", chmodFunc<Linux>);
-    /* 16 */ SyscallDesc("lchown", unimplimentedFunc);
+    /* 16 */ SyscallDesc("lchown", unimplementedFunc);
     /* 17 */ SyscallDesc("brk", obreakFunc);
-    /* 18 */ SyscallDesc("perfctr", unimplimentedFunc);
+    /* 18 */ SyscallDesc("perfctr", unimplementedFunc);
     /* 19 */ SyscallDesc("lseek", lseekFunc);
     /* 20 */ SyscallDesc("getpid", getpidFunc);
-    /* 21 */ SyscallDesc("capget", unimplimentedFunc);
-    /* 22 */ SyscallDesc("capset", unimplimentedFunc);
+    /* 21 */ SyscallDesc("capget", unimplementedFunc);
+    /* 22 */ SyscallDesc("capset", unimplementedFunc);
     /* 23 */ SyscallDesc("setuid", setuidFunc);
     /* 24 */ SyscallDesc("getuid", getuidFunc);
-    /* 25 */ SyscallDesc("time", unimplimentedFunc);
-    /* 26 */ SyscallDesc("ptrace", unimplimentedFunc);
-    /* 27 */ SyscallDesc("alarm", unimplimentedFunc);
-    /* 28 */ SyscallDesc("sigaltstack", unimplimentedFunc);
-    /* 29 */ SyscallDesc("pause", unimplimentedFunc);
-    /* 30 */ SyscallDesc("utime", unimplimentedFunc);
-    /* 31 */ SyscallDesc("lchown32", unimplimentedFunc);
-    /* 32 */ SyscallDesc("fchown32", unimplimentedFunc);
-    /* 33 */ SyscallDesc("access", unimplimentedFunc);
-    /* 34 */ SyscallDesc("nice", unimplimentedFunc);
-    /* 35 */ SyscallDesc("chown32", unimplimentedFunc);
-    /* 36 */ SyscallDesc("sync", unimplimentedFunc);
-    /* 37 */ SyscallDesc("kill", unimplimentedFunc);
-    /* 38 */ SyscallDesc("stat", unimplimentedFunc);
-    /* 39 */ SyscallDesc("sendfile", unimplimentedFunc);
-    /* 40 */ SyscallDesc("lstat", unimplimentedFunc);
-    /* 41 */ SyscallDesc("dup", unimplimentedFunc);
+    /* 25 */ SyscallDesc("time", unimplementedFunc);
+    /* 26 */ SyscallDesc("ptrace", unimplementedFunc);
+    /* 27 */ SyscallDesc("alarm", unimplementedFunc);
+    /* 28 */ SyscallDesc("sigaltstack", unimplementedFunc);
+    /* 29 */ SyscallDesc("pause", unimplementedFunc);
+    /* 30 */ SyscallDesc("utime", unimplementedFunc);
+    /* 31 */ SyscallDesc("lchown32", unimplementedFunc);
+    /* 32 */ SyscallDesc("fchown32", unimplementedFunc);
+    /* 33 */ SyscallDesc("access", unimplementedFunc);
+    /* 34 */ SyscallDesc("nice", unimplementedFunc);
+    /* 35 */ SyscallDesc("chown32", unimplementedFunc);
+    /* 36 */ SyscallDesc("sync", unimplementedFunc);
+    /* 37 */ SyscallDesc("kill", unimplementedFunc);
+    /* 38 */ SyscallDesc("stat", unimplementedFunc);
+    /* 39 */ SyscallDesc("sendfile", unimplementedFunc);
+    /* 40 */ SyscallDesc("lstat", unimplementedFunc);
+    /* 41 */ SyscallDesc("dup", unimplementedFunc);
     /* 42 */ SyscallDesc("pipe", pipePseudoFunc);
-    /* 43 */ SyscallDesc("times", unimplimentedFunc);
-    /* 44 */ SyscallDesc("getuid32", unimplimentedFunc);
-    /* 45 */ SyscallDesc("umount2", unimplimentedFunc);
-    /* 46 */ SyscallDesc("setgid", unimplimentedFunc);
+    /* 43 */ SyscallDesc("times", unimplementedFunc);
+    /* 44 */ SyscallDesc("getuid32", unimplementedFunc);
+    /* 45 */ SyscallDesc("umount2", unimplementedFunc);
+    /* 46 */ SyscallDesc("setgid", unimplementedFunc);
     /* 47 */ SyscallDesc("getgid", getgidFunc);
-    /* 48 */ SyscallDesc("signal", unimplimentedFunc);
+    /* 48 */ SyscallDesc("signal", unimplementedFunc);
     /* 49 */ SyscallDesc("geteuid", geteuidFunc);
     /* 50 */ SyscallDesc("getegid", getegidFunc);
-    /* 51 */ SyscallDesc("acct", unimplimentedFunc);
-    /* 52 */ SyscallDesc("memory_ordering", unimplimentedFunc);
-    /* 53 */ SyscallDesc("getgid32", unimplimentedFunc);
-    /* 54 */ SyscallDesc("ioctl", unimplimentedFunc);
-    /* 55 */ SyscallDesc("reboot", unimplimentedFunc);
-    /* 56 */ SyscallDesc("mmap2", unimplimentedFunc);
-    /* 57 */ SyscallDesc("symlink", unimplimentedFunc);
-    /* 58 */ SyscallDesc("readlink", unimplimentedFunc);
-    /* 59 */ SyscallDesc("execve", unimplimentedFunc);
-    /* 60 */ SyscallDesc("umask", unimplimentedFunc);
-    /* 61 */ SyscallDesc("chroot", unimplimentedFunc);
-    /* 62 */ SyscallDesc("fstat", unimplimentedFunc);
-    /* 63 */ SyscallDesc("fstat64", unimplimentedFunc);
-    /* 64 */ SyscallDesc("getpagesize", unimplimentedFunc);
-    /* 65 */ SyscallDesc("msync", unimplimentedFunc);
-    /* 66 */ SyscallDesc("vfork", unimplimentedFunc);
-    /* 67 */ SyscallDesc("pread64", unimplimentedFunc);
-    /* 68 */ SyscallDesc("pwrite64", unimplimentedFunc);
-    /* 69 */ SyscallDesc("geteuid32", unimplimentedFunc);
-    /* 70 */ SyscallDesc("getdgid32", unimplimentedFunc);
-    /* 71 */ SyscallDesc("mmap", unimplimentedFunc);
-    /* 72 */ SyscallDesc("setreuid32", unimplimentedFunc);
-    /* 73 */ SyscallDesc("munmap", unimplimentedFunc);
-    /* 74 */ SyscallDesc("mprotect", unimplimentedFunc);
-    /* 75 */ SyscallDesc("madvise", unimplimentedFunc);
-    /* 76 */ SyscallDesc("vhangup", unimplimentedFunc);
-    /* 77 */ SyscallDesc("truncate64", unimplimentedFunc);
-    /* 78 */ SyscallDesc("mincore", unimplimentedFunc);
-    /* 79 */ SyscallDesc("getgroups", unimplimentedFunc);
-    /* 80 */ SyscallDesc("setgroups", unimplimentedFunc);
-    /* 81 */ SyscallDesc("getpgrp", unimplimentedFunc);
-    /* 82 */ SyscallDesc("setgroups32", unimplimentedFunc);
-    /* 83 */ SyscallDesc("setitimer", unimplimentedFunc);
-    /* 84 */ SyscallDesc("ftruncate64", unimplimentedFunc);
-    /* 85 */ SyscallDesc("swapon", unimplimentedFunc);
-    /* 86 */ SyscallDesc("getitimer", unimplimentedFunc);
-    /* 87 */ SyscallDesc("setuid32", unimplimentedFunc);
-    /* 88 */ SyscallDesc("sethostname", unimplimentedFunc);
-    /* 89 */ SyscallDesc("setgid32", unimplimentedFunc);
-    /* 90 */ SyscallDesc("dup2", unimplimentedFunc);
-    /* 91 */ SyscallDesc("setfsuid32", unimplimentedFunc);
-    /* 92 */ SyscallDesc("fcntl", unimplimentedFunc);
-    /* 93 */ SyscallDesc("select", unimplimentedFunc);
-    /* 94 */ SyscallDesc("setfsgid32", unimplimentedFunc);
-    /* 95 */ SyscallDesc("fsync", unimplimentedFunc);
-    /* 96 */ SyscallDesc("setpriority", unimplimentedFunc);
-    /* 97 */ SyscallDesc("socket", unimplimentedFunc);
-    /* 98 */ SyscallDesc("connect", unimplimentedFunc);
-    /* 99 */ SyscallDesc("accept", unimplimentedFunc);
-    /* 100 */ SyscallDesc("getpriority", unimplimentedFunc);
-    /* 101 */ SyscallDesc("rt_sigreturn", unimplimentedFunc);
-    /* 102 */ SyscallDesc("rt_sigaction", unimplimentedFunc);
-    /* 103 */ SyscallDesc("rt_sigprocmask", unimplimentedFunc);
-    /* 104 */ SyscallDesc("rt_sigpending", unimplimentedFunc);
-    /* 105 */ SyscallDesc("rt_sigtimedwait", unimplimentedFunc);
-    /* 106 */ SyscallDesc("rt_sigqueueinfo", unimplimentedFunc);
-    /* 107 */ SyscallDesc("rt_sigsuspend", unimplimentedFunc);
-    /* 108 */ SyscallDesc("setresuid", unimplimentedFunc);
-    /* 109 */ SyscallDesc("getresuid", unimplimentedFunc);
-    /* 110 */ SyscallDesc("setresgid", unimplimentedFunc);
-    /* 111 */ SyscallDesc("getresgid", unimplimentedFunc);
-    /* 112 */ SyscallDesc("setregid32", unimplimentedFunc);
-    /* 113 */ SyscallDesc("recvmsg", unimplimentedFunc);
-    /* 114 */ SyscallDesc("sendmsg", unimplimentedFunc);
-    /* 115 */ SyscallDesc("getgroups32", unimplimentedFunc);
-    /* 116 */ SyscallDesc("gettimeofday", unimplimentedFunc);
-    /* 117 */ SyscallDesc("getrusage", unimplimentedFunc);
-    /* 118 */ SyscallDesc("getsockopt", unimplimentedFunc);
-    /* 119 */ SyscallDesc("getcwd", unimplimentedFunc);
-    /* 120 */ SyscallDesc("readv", unimplimentedFunc);
-    /* 121 */ SyscallDesc("writev", unimplimentedFunc);
-    /* 122 */ SyscallDesc("settimeofday", unimplimentedFunc);
-    /* 123 */ SyscallDesc("fchown", unimplimentedFunc);
-    /* 124 */ SyscallDesc("fchmod", unimplimentedFunc);
-    /* 125 */ SyscallDesc("recvfrom", unimplimentedFunc);
-    /* 126 */ SyscallDesc("setreuid", unimplimentedFunc);
-    /* 127 */ SyscallDesc("setregid", unimplimentedFunc);
-    /* 128 */ SyscallDesc("rename", unimplimentedFunc);
-    /* 129 */ SyscallDesc("truncate", unimplimentedFunc);
-    /* 130 */ SyscallDesc("ftruncate", unimplimentedFunc);
-    /* 131 */ SyscallDesc("flock", unimplimentedFunc);
-    /* 132 */ SyscallDesc("lstat64", unimplimentedFunc);
-    /* 133 */ SyscallDesc("sendto", unimplimentedFunc);
-    /* 134 */ SyscallDesc("shutdown", unimplimentedFunc);
-    /* 135 */ SyscallDesc("socketpair", unimplimentedFunc);
-    /* 136 */ SyscallDesc("mkdir", unimplimentedFunc);
-    /* 137 */ SyscallDesc("rmdir", unimplimentedFunc);
-    /* 138 */ SyscallDesc("utimes", unimplimentedFunc);
-    /* 139 */ SyscallDesc("stat64", unimplimentedFunc);
-    /* 140 */ SyscallDesc("sendfile64", unimplimentedFunc);
-    /* 141 */ SyscallDesc("getpeername", unimplimentedFunc);
-    /* 142 */ SyscallDesc("futex", unimplimentedFunc);
-    /* 143 */ SyscallDesc("gettid", unimplimentedFunc);
-    /* 144 */ SyscallDesc("getrlimit", unimplimentedFunc);
-    /* 145 */ SyscallDesc("setrlimit", unimplimentedFunc);
-    /* 146 */ SyscallDesc("pivot_root", unimplimentedFunc);
-    /* 147 */ SyscallDesc("prctl", unimplimentedFunc);
-    /* 148 */ SyscallDesc("pciconfig_read", unimplimentedFunc);
-    /* 149 */ SyscallDesc("pciconfig_write", unimplimentedFunc);
-    /* 150 */ SyscallDesc("getsockname", unimplimentedFunc);
-    /* 151 */ SyscallDesc("inotify_init", unimplimentedFunc);
-    /* 152 */ SyscallDesc("inotify_add_watch", unimplimentedFunc);
-    /* 153 */ SyscallDesc("poll", unimplimentedFunc);
-    /* 154 */ SyscallDesc("getdents64", unimplimentedFunc);
-    /* 155 */ SyscallDesc("fcntl64", unimplimentedFunc);
-    /* 156 */ SyscallDesc("inotify_rm_watch", unimplimentedFunc);
-    /* 157 */ SyscallDesc("statfs", unimplimentedFunc);
-    /* 158 */ SyscallDesc("fstatfs", unimplimentedFunc);
-    /* 159 */ SyscallDesc("umount", unimplimentedFunc);
-    /* 160 */ SyscallDesc("sched_set_affinity", unimplimentedFunc);
-    /* 161 */ SyscallDesc("sched_get_affinity", unimplimentedFunc);
-    /* 162 */ SyscallDesc("getdomainname", unimplimentedFunc);
-    /* 163 */ SyscallDesc("setdomainname", unimplimentedFunc);
-    /* 164 */ SyscallDesc("utrap_install", unimplimentedFunc);
-    /* 165 */ SyscallDesc("quotactl", unimplimentedFunc);
-    /* 166 */ SyscallDesc("set_tid_address", unimplimentedFunc);
-    /* 167 */ SyscallDesc("mount", unimplimentedFunc);
-    /* 168 */ SyscallDesc("ustat", unimplimentedFunc);
-    /* 169 */ SyscallDesc("setxattr", unimplimentedFunc);
-    /* 170 */ SyscallDesc("lsetxattr", unimplimentedFunc);
-    /* 171 */ SyscallDesc("fsetxattr", unimplimentedFunc);
-    /* 172 */ SyscallDesc("getxattr", unimplimentedFunc);
-    /* 173 */ SyscallDesc("lgetxattr", unimplimentedFunc);
-    /* 174 */ SyscallDesc("getdents", unimplimentedFunc);
-    /* 175 */ SyscallDesc("setsid", unimplimentedFunc);
-    /* 176 */ SyscallDesc("fchdir", unimplimentedFunc);
-    /* 177 */ SyscallDesc("fgetxattr", unimplimentedFunc);
-    /* 178 */ SyscallDesc("listxattr", unimplimentedFunc);
-    /* 179 */ SyscallDesc("llistxattr", unimplimentedFunc);
-    /* 180 */ SyscallDesc("flistxattr", unimplimentedFunc);
-    /* 181 */ SyscallDesc("removexattr", unimplimentedFunc);
-    /* 182 */ SyscallDesc("lremovexattr", unimplimentedFunc);
-    /* 183 */ SyscallDesc("sigpending", unimplimentedFunc);
-    /* 184 */ SyscallDesc("query_module", unimplimentedFunc);
-    /* 185 */ SyscallDesc("setpgid", unimplimentedFunc);
-    /* 186 */ SyscallDesc("fremovexattr", unimplimentedFunc);
-    /* 187 */ SyscallDesc("tkill", unimplimentedFunc);
-    /* 188 */ SyscallDesc("exit_group", unimplimentedFunc);
+    /* 51 */ SyscallDesc("acct", unimplementedFunc);
+    /* 52 */ SyscallDesc("memory_ordering", unimplementedFunc);
+    /* 53 */ SyscallDesc("getgid32", unimplementedFunc);
+    /* 54 */ SyscallDesc("ioctl", unimplementedFunc);
+    /* 55 */ SyscallDesc("reboot", unimplementedFunc);
+    /* 56 */ SyscallDesc("mmap2", unimplementedFunc);
+    /* 57 */ SyscallDesc("symlink", unimplementedFunc);
+    /* 58 */ SyscallDesc("readlink", unimplementedFunc);
+    /* 59 */ SyscallDesc("execve", unimplementedFunc);
+    /* 60 */ SyscallDesc("umask", unimplementedFunc);
+    /* 61 */ SyscallDesc("chroot", unimplementedFunc);
+    /* 62 */ SyscallDesc("fstat", unimplementedFunc);
+    /* 63 */ SyscallDesc("fstat64", unimplementedFunc);
+    /* 64 */ SyscallDesc("getpagesize", unimplementedFunc);
+    /* 65 */ SyscallDesc("msync", unimplementedFunc);
+    /* 66 */ SyscallDesc("vfork", unimplementedFunc);
+    /* 67 */ SyscallDesc("pread64", unimplementedFunc);
+    /* 68 */ SyscallDesc("pwrite64", unimplementedFunc);
+    /* 69 */ SyscallDesc("geteuid32", unimplementedFunc);
+    /* 70 */ SyscallDesc("getdgid32", unimplementedFunc);
+    /* 71 */ SyscallDesc("mmap", unimplementedFunc);
+    /* 72 */ SyscallDesc("setreuid32", unimplementedFunc);
+    /* 73 */ SyscallDesc("munmap", unimplementedFunc);
+    /* 74 */ SyscallDesc("mprotect", unimplementedFunc);
+    /* 75 */ SyscallDesc("madvise", unimplementedFunc);
+    /* 76 */ SyscallDesc("vhangup", unimplementedFunc);
+    /* 77 */ SyscallDesc("truncate64", unimplementedFunc);
+    /* 78 */ SyscallDesc("mincore", unimplementedFunc);
+    /* 79 */ SyscallDesc("getgroups", unimplementedFunc);
+    /* 80 */ SyscallDesc("setgroups", unimplementedFunc);
+    /* 81 */ SyscallDesc("getpgrp", unimplementedFunc);
+    /* 82 */ SyscallDesc("setgroups32", unimplementedFunc);
+    /* 83 */ SyscallDesc("setitimer", unimplementedFunc);
+    /* 84 */ SyscallDesc("ftruncate64", unimplementedFunc);
+    /* 85 */ SyscallDesc("swapon", unimplementedFunc);
+    /* 86 */ SyscallDesc("getitimer", unimplementedFunc);
+    /* 87 */ SyscallDesc("setuid32", unimplementedFunc);
+    /* 88 */ SyscallDesc("sethostname", unimplementedFunc);
+    /* 89 */ SyscallDesc("setgid32", unimplementedFunc);
+    /* 90 */ SyscallDesc("dup2", unimplementedFunc);
+    /* 91 */ SyscallDesc("setfsuid32", unimplementedFunc);
+    /* 92 */ SyscallDesc("fcntl", unimplementedFunc);
+    /* 93 */ SyscallDesc("select", unimplementedFunc);
+    /* 94 */ SyscallDesc("setfsgid32", unimplementedFunc);
+    /* 95 */ SyscallDesc("fsync", unimplementedFunc);
+    /* 96 */ SyscallDesc("setpriority", unimplementedFunc);
+    /* 97 */ SyscallDesc("socket", unimplementedFunc);
+    /* 98 */ SyscallDesc("connect", unimplementedFunc);
+    /* 99 */ SyscallDesc("accept", unimplementedFunc);
+    /* 100 */ SyscallDesc("getpriority", unimplementedFunc);
+    /* 101 */ SyscallDesc("rt_sigreturn", unimplementedFunc);
+    /* 102 */ SyscallDesc("rt_sigaction", unimplementedFunc);
+    /* 103 */ SyscallDesc("rt_sigprocmask", unimplementedFunc);
+    /* 104 */ SyscallDesc("rt_sigpending", unimplementedFunc);
+    /* 105 */ SyscallDesc("rt_sigtimedwait", unimplementedFunc);
+    /* 106 */ SyscallDesc("rt_sigqueueinfo", unimplementedFunc);
+    /* 107 */ SyscallDesc("rt_sigsuspend", unimplementedFunc);
+    /* 108 */ SyscallDesc("setresuid", unimplementedFunc);
+    /* 109 */ SyscallDesc("getresuid", unimplementedFunc);
+    /* 110 */ SyscallDesc("setresgid", unimplementedFunc);
+    /* 111 */ SyscallDesc("getresgid", unimplementedFunc);
+    /* 112 */ SyscallDesc("setregid32", unimplementedFunc);
+    /* 113 */ SyscallDesc("recvmsg", unimplementedFunc);
+    /* 114 */ SyscallDesc("sendmsg", unimplementedFunc);
+    /* 115 */ SyscallDesc("getgroups32", unimplementedFunc);
+    /* 116 */ SyscallDesc("gettimeofday", unimplementedFunc);
+    /* 117 */ SyscallDesc("getrusage", unimplementedFunc);
+    /* 118 */ SyscallDesc("getsockopt", unimplementedFunc);
+    /* 119 */ SyscallDesc("getcwd", unimplementedFunc);
+    /* 120 */ SyscallDesc("readv", unimplementedFunc);
+    /* 121 */ SyscallDesc("writev", unimplementedFunc);
+    /* 122 */ SyscallDesc("settimeofday", unimplementedFunc);
+    /* 123 */ SyscallDesc("fchown", unimplementedFunc);
+    /* 124 */ SyscallDesc("fchmod", unimplementedFunc);
+    /* 125 */ SyscallDesc("recvfrom", unimplementedFunc);
+    /* 126 */ SyscallDesc("setreuid", unimplementedFunc);
+    /* 127 */ SyscallDesc("setregid", unimplementedFunc);
+    /* 128 */ SyscallDesc("rename", unimplementedFunc);
+    /* 129 */ SyscallDesc("truncate", unimplementedFunc);
+    /* 130 */ SyscallDesc("ftruncate", unimplementedFunc);
+    /* 131 */ SyscallDesc("flock", unimplementedFunc);
+    /* 132 */ SyscallDesc("lstat64", unimplementedFunc);
+    /* 133 */ SyscallDesc("sendto", unimplementedFunc);
+    /* 134 */ SyscallDesc("shutdown", unimplementedFunc);
+    /* 135 */ SyscallDesc("socketpair", unimplementedFunc);
+    /* 136 */ SyscallDesc("mkdir", unimplementedFunc);
+    /* 137 */ SyscallDesc("rmdir", unimplementedFunc);
+    /* 138 */ SyscallDesc("utimes", unimplementedFunc);
+    /* 139 */ SyscallDesc("stat64", unimplementedFunc);
+    /* 140 */ SyscallDesc("sendfile64", unimplementedFunc);
+    /* 141 */ SyscallDesc("getpeername", unimplementedFunc);
+    /* 142 */ SyscallDesc("futex", unimplementedFunc);
+    /* 143 */ SyscallDesc("gettid", unimplementedFunc);
+    /* 144 */ SyscallDesc("getrlimit", unimplementedFunc);
+    /* 145 */ SyscallDesc("setrlimit", unimplementedFunc);
+    /* 146 */ SyscallDesc("pivot_root", unimplementedFunc);
+    /* 147 */ SyscallDesc("prctl", unimplementedFunc);
+    /* 148 */ SyscallDesc("pciconfig_read", unimplementedFunc);
+    /* 149 */ SyscallDesc("pciconfig_write", unimplementedFunc);
+    /* 150 */ SyscallDesc("getsockname", unimplementedFunc);
+    /* 151 */ SyscallDesc("inotify_init", unimplementedFunc);
+    /* 152 */ SyscallDesc("inotify_add_watch", unimplementedFunc);
+    /* 153 */ SyscallDesc("poll", unimplementedFunc);
+    /* 154 */ SyscallDesc("getdents64", unimplementedFunc);
+    /* 155 */ SyscallDesc("fcntl64", unimplementedFunc);
+    /* 156 */ SyscallDesc("inotify_rm_watch", unimplementedFunc);
+    /* 157 */ SyscallDesc("statfs", unimplementedFunc);
+    /* 158 */ SyscallDesc("fstatfs", unimplementedFunc);
+    /* 159 */ SyscallDesc("umount", unimplementedFunc);
+    /* 160 */ SyscallDesc("sched_set_affinity", unimplementedFunc);
+    /* 161 */ SyscallDesc("sched_get_affinity", unimplementedFunc);
+    /* 162 */ SyscallDesc("getdomainname", unimplementedFunc);
+    /* 163 */ SyscallDesc("setdomainname", unimplementedFunc);
+    /* 164 */ SyscallDesc("utrap_install", unimplementedFunc);
+    /* 165 */ SyscallDesc("quotactl", unimplementedFunc);
+    /* 166 */ SyscallDesc("set_tid_address", unimplementedFunc);
+    /* 167 */ SyscallDesc("mount", unimplementedFunc);
+    /* 168 */ SyscallDesc("ustat", unimplementedFunc);
+    /* 169 */ SyscallDesc("setxattr", unimplementedFunc);
+    /* 170 */ SyscallDesc("lsetxattr", unimplementedFunc);
+    /* 171 */ SyscallDesc("fsetxattr", unimplementedFunc);
+    /* 172 */ SyscallDesc("getxattr", unimplementedFunc);
+    /* 173 */ SyscallDesc("lgetxattr", unimplementedFunc);
+    /* 174 */ SyscallDesc("getdents", unimplementedFunc);
+    /* 175 */ SyscallDesc("setsid", unimplementedFunc);
+    /* 176 */ SyscallDesc("fchdir", unimplementedFunc);
+    /* 177 */ SyscallDesc("fgetxattr", unimplementedFunc);
+    /* 178 */ SyscallDesc("listxattr", unimplementedFunc);
+    /* 179 */ SyscallDesc("llistxattr", unimplementedFunc);
+    /* 180 */ SyscallDesc("flistxattr", unimplementedFunc);
+    /* 181 */ SyscallDesc("removexattr", unimplementedFunc);
+    /* 182 */ SyscallDesc("lremovexattr", unimplementedFunc);
+    /* 183 */ SyscallDesc("sigpending", unimplementedFunc);
+    /* 184 */ SyscallDesc("query_module", unimplementedFunc);
+    /* 185 */ SyscallDesc("setpgid", unimplementedFunc);
+    /* 186 */ SyscallDesc("fremovexattr", unimplementedFunc);
+    /* 187 */ SyscallDesc("tkill", unimplementedFunc);
+    /* 188 */ SyscallDesc("exit_group", unimplementedFunc);
     /* 189 */ SyscallDesc("uname", unameFunc);
-    /* 190 */ SyscallDesc("init_module", unimplimentedFunc);
-    /* 191 */ SyscallDesc("personality", unimplimentedFunc);
-    /* 192 */ SyscallDesc("remap_file_pages", unimplimentedFunc);
-    /* 193 */ SyscallDesc("epoll_create", unimplimentedFunc);
-    /* 194 */ SyscallDesc("epoll_ctl", unimplimentedFunc);
-    /* 195 */ SyscallDesc("epoll_wait", unimplimentedFunc);
-    /* 196 */ SyscallDesc("ioprio_set", unimplimentedFunc);
+    /* 190 */ SyscallDesc("init_module", unimplementedFunc);
+    /* 191 */ SyscallDesc("personality", unimplementedFunc);
+    /* 192 */ SyscallDesc("remap_file_pages", unimplementedFunc);
+    /* 193 */ SyscallDesc("epoll_create", unimplementedFunc);
+    /* 194 */ SyscallDesc("epoll_ctl", unimplementedFunc);
+    /* 195 */ SyscallDesc("epoll_wait", unimplementedFunc);
+    /* 196 */ SyscallDesc("ioprio_set", unimplementedFunc);
     /* 197 */ SyscallDesc("getppid", getppidFunc);
-    /* 198 */ SyscallDesc("sigaction", unimplimentedFunc);
-    /* 199 */ SyscallDesc("sgetmask", unimplimentedFunc);
-    /* 200 */ SyscallDesc("ssetmask", unimplimentedFunc);
-    /* 201 */ SyscallDesc("sigsuspend", unimplimentedFunc);
-    /* 202 */ SyscallDesc("oldlstat", unimplimentedFunc);
-    /* 203 */ SyscallDesc("uselib", unimplimentedFunc);
-    /* 204 */ SyscallDesc("readdir", unimplimentedFunc);
-    /* 205 */ SyscallDesc("readahead", unimplimentedFunc);
-    /* 206 */ SyscallDesc("socketcall", unimplimentedFunc);
-    /* 207 */ SyscallDesc("syslog", unimplimentedFunc);
-    /* 208 */ SyscallDesc("lookup_dcookie", unimplimentedFunc);
-    /* 209 */ SyscallDesc("fadvise64", unimplimentedFunc);
-    /* 210 */ SyscallDesc("fadvise64_64", unimplimentedFunc);
-    /* 211 */ SyscallDesc("tgkill", unimplimentedFunc);
-    /* 212 */ SyscallDesc("waitpid", unimplimentedFunc);
-    /* 213 */ SyscallDesc("swapoff", unimplimentedFunc);
-    /* 214 */ SyscallDesc("sysinfo", unimplimentedFunc);
-    /* 215 */ SyscallDesc("ipc", unimplimentedFunc);
-    /* 216 */ SyscallDesc("sigreturn", unimplimentedFunc);
-    /* 217 */ SyscallDesc("clone", unimplimentedFunc);
-    /* 218 */ SyscallDesc("ioprio_get", unimplimentedFunc);
-    /* 219 */ SyscallDesc("adjtimex", unimplimentedFunc);
-    /* 220 */ SyscallDesc("sigprocmask", unimplimentedFunc);
-    /* 221 */ SyscallDesc("create_module", unimplimentedFunc);
-    /* 222 */ SyscallDesc("delete_module", unimplimentedFunc);
-    /* 223 */ SyscallDesc("get_kernel_syms", unimplimentedFunc);
-    /* 224 */ SyscallDesc("getpgid", unimplimentedFunc);
-    /* 225 */ SyscallDesc("bdflush", unimplimentedFunc);
-    /* 226 */ SyscallDesc("sysfs", unimplimentedFunc);
-    /* 227 */ SyscallDesc("afs_syscall", unimplimentedFunc);
-    /* 228 */ SyscallDesc("setfsuid", unimplimentedFunc);
-    /* 229 */ SyscallDesc("setfsgid", unimplimentedFunc);
-    /* 230 */ SyscallDesc("_newselect", unimplimentedFunc);
-    /* 231 */ SyscallDesc("time", unimplimentedFunc);
-    /* 232 */ SyscallDesc("oldstat", unimplimentedFunc);
-    /* 233 */ SyscallDesc("stime", unimplimentedFunc);
-    /* 234 */ SyscallDesc("statfs64", unimplimentedFunc);
-    /* 235 */ SyscallDesc("fstatfs64", unimplimentedFunc);
-    /* 236 */ SyscallDesc("_llseek", unimplimentedFunc);
-    /* 237 */ SyscallDesc("mlock", unimplimentedFunc);
-    /* 238 */ SyscallDesc("munlock", unimplimentedFunc);
-    /* 239 */ SyscallDesc("mlockall", unimplimentedFunc);
-    /* 240 */ SyscallDesc("munlockall", unimplimentedFunc);
-    /* 241 */ SyscallDesc("sched_setparam", unimplimentedFunc);
-    /* 242 */ SyscallDesc("sched_getparam", unimplimentedFunc);
-    /* 243 */ SyscallDesc("sched_setscheduler", unimplimentedFunc);
-    /* 244 */ SyscallDesc("sched_getscheduler", unimplimentedFunc);
-    /* 245 */ SyscallDesc("sched_yield", unimplimentedFunc);
+    /* 198 */ SyscallDesc("sigaction", unimplementedFunc);
+    /* 199 */ SyscallDesc("sgetmask", unimplementedFunc);
+    /* 200 */ SyscallDesc("ssetmask", unimplementedFunc);
+    /* 201 */ SyscallDesc("sigsuspend", unimplementedFunc);
+    /* 202 */ SyscallDesc("oldlstat", unimplementedFunc);
+    /* 203 */ SyscallDesc("uselib", unimplementedFunc);
+    /* 204 */ SyscallDesc("readdir", unimplementedFunc);
+    /* 205 */ SyscallDesc("readahead", unimplementedFunc);
+    /* 206 */ SyscallDesc("socketcall", unimplementedFunc);
+    /* 207 */ SyscallDesc("syslog", unimplementedFunc);
+    /* 208 */ SyscallDesc("lookup_dcookie", unimplementedFunc);
+    /* 209 */ SyscallDesc("fadvise64", unimplementedFunc);
+    /* 210 */ SyscallDesc("fadvise64_64", unimplementedFunc);
+    /* 211 */ SyscallDesc("tgkill", unimplementedFunc);
+    /* 212 */ SyscallDesc("waitpid", unimplementedFunc);
+    /* 213 */ SyscallDesc("swapoff", unimplementedFunc);
+    /* 214 */ SyscallDesc("sysinfo", unimplementedFunc);
+    /* 215 */ SyscallDesc("ipc", unimplementedFunc);
+    /* 216 */ SyscallDesc("sigreturn", unimplementedFunc);
+    /* 217 */ SyscallDesc("clone", unimplementedFunc);
+    /* 218 */ SyscallDesc("ioprio_get", unimplementedFunc);
+    /* 219 */ SyscallDesc("adjtimex", unimplementedFunc);
+    /* 220 */ SyscallDesc("sigprocmask", unimplementedFunc);
+    /* 221 */ SyscallDesc("create_module", unimplementedFunc);
+    /* 222 */ SyscallDesc("delete_module", unimplementedFunc);
+    /* 223 */ SyscallDesc("get_kernel_syms", unimplementedFunc);
+    /* 224 */ SyscallDesc("getpgid", unimplementedFunc);
+    /* 225 */ SyscallDesc("bdflush", unimplementedFunc);
+    /* 226 */ SyscallDesc("sysfs", unimplementedFunc);
+    /* 227 */ SyscallDesc("afs_syscall", unimplementedFunc);
+    /* 228 */ SyscallDesc("setfsuid", unimplementedFunc);
+    /* 229 */ SyscallDesc("setfsgid", unimplementedFunc);
+    /* 230 */ SyscallDesc("_newselect", unimplementedFunc);
+    /* 231 */ SyscallDesc("time", unimplementedFunc);
+    /* 232 */ SyscallDesc("oldstat", unimplementedFunc);
+    /* 233 */ SyscallDesc("stime", unimplementedFunc);
+    /* 234 */ SyscallDesc("statfs64", unimplementedFunc);
+    /* 235 */ SyscallDesc("fstatfs64", unimplementedFunc);
+    /* 236 */ SyscallDesc("_llseek", unimplementedFunc);
+    /* 237 */ SyscallDesc("mlock", unimplementedFunc);
+    /* 238 */ SyscallDesc("munlock", unimplementedFunc);
+    /* 239 */ SyscallDesc("mlockall", unimplementedFunc);
+    /* 240 */ SyscallDesc("munlockall", unimplementedFunc);
+    /* 241 */ SyscallDesc("sched_setparam", unimplementedFunc);
+    /* 242 */ SyscallDesc("sched_getparam", unimplementedFunc);
+    /* 243 */ SyscallDesc("sched_setscheduler", unimplementedFunc);
+    /* 244 */ SyscallDesc("sched_getscheduler", unimplementedFunc);
+    /* 245 */ SyscallDesc("sched_yield", unimplementedFunc);
     /* 246 */ SyscallDesc("sched_get_priority_max", unimplimented);
     /* 247 */ SyscallDesc("sched_get_priority_min", unimplimented);
     /* 248 */ SyscallDesc("sched_rr_get_interval", unimplimented);
-    /* 249 */ SyscallDesc("nanosleep", unimplimentedFunc);
-    /* 250 */ SyscallDesc("mremap", unimplimentedFunc);
-    /* 251 */ SyscallDesc("_sysctl", unimplimentedFunc);
-    /* 252 */ SyscallDesc("getsid", unimplimentedFunc);
-    /* 253 */ SyscallDesc("fdatasync", unimplimentedFunc);
-    /* 254 */ SyscallDesc("nfsservctl", unimplimentedFunc);
-    /* 255 */ SyscallDesc("aplib", unimplimentedFunc);
-    /* 256 */ SyscallDesc("clock_settime", unimplimentedFunc);
-    /* 257 */ SyscallDesc("clock_gettime", unimplimentedFunc);
-    /* 258 */ SyscallDesc("clock_getres", unimplimentedFunc);
-    /* 259 */ SyscallDesc("clock_nanosleep", unimplimentedFunc);
-    /* 260 */ SyscallDesc("sched_getaffinity", unimplimentedFunc);
-    /* 261 */ SyscallDesc("sched_setaffinity", unimplimentedFunc);
-    /* 262 */ SyscallDesc("timer_settime", unimplimentedFunc);
-    /* 263 */ SyscallDesc("timer_gettime", unimplimentedFunc);
-    /* 264 */ SyscallDesc("timer_getoverrun", unimplimentedFunc);
-    /* 265 */ SyscallDesc("timer_delete", unimplimentedFunc);
-    /* 266 */ SyscallDesc("timer_create", unimplimentedFunc);
-    /* 267 */ SyscallDesc("vserver", unimplimentedFunc);
-    /* 268 */ SyscallDesc("io_setup", unimplimentedFunc);
-    /* 269 */ SyscallDesc("io_destroy", unimplimentedFunc);
-    /* 270 */ SyscallDesc("io_submit", unimplimentedFunc);
-    /* 271 */ SyscallDesc("io_cancel", unimplimentedFunc);
-    /* 272 */ SyscallDesc("io_getevents", unimplimentedFunc);
-    /* 273 */ SyscallDesc("mq_open", unimplimentedFunc);
-    /* 274 */ SyscallDesc("mq_unlink", unimplimentedFunc);
-    /* 275 */ SyscallDesc("mq_timedsend", unimplimentedFunc);
-    /* 276 */ SyscallDesc("mq_timedreceive", unimplimentedFunc);
-    /* 277 */ SyscallDesc("mq_notify", unimplimentedFunc);
-    /* 278 */ SyscallDesc("mq_getsetattr", unimplimentedFunc);
-    /* 279 */ SyscallDesc("waitid", unimplimentedFunc);
-    /* 280 */ SyscallDesc("sys_setaltroot", unimplimentedFunc);
-    /* 281 */ SyscallDesc("add_key", unimplimentedFunc);
-    /* 282 */ SyscallDesc("request_key", unimplimentedFunc);
-    /* 283 */ SyscallDesc("keyctl", unimplimentedFunc);
+    /* 249 */ SyscallDesc("nanosleep", unimplementedFunc);
+    /* 250 */ SyscallDesc("mremap", unimplementedFunc);
+    /* 251 */ SyscallDesc("_sysctl", unimplementedFunc);
+    /* 252 */ SyscallDesc("getsid", unimplementedFunc);
+    /* 253 */ SyscallDesc("fdatasync", unimplementedFunc);
+    /* 254 */ SyscallDesc("nfsservctl", unimplementedFunc);
+    /* 255 */ SyscallDesc("aplib", unimplementedFunc);
+    /* 256 */ SyscallDesc("clock_settime", unimplementedFunc);
+    /* 257 */ SyscallDesc("clock_gettime", unimplementedFunc);
+    /* 258 */ SyscallDesc("clock_getres", unimplementedFunc);
+    /* 259 */ SyscallDesc("clock_nanosleep", unimplementedFunc);
+    /* 260 */ SyscallDesc("sched_getaffinity", unimplementedFunc);
+    /* 261 */ SyscallDesc("sched_setaffinity", unimplementedFunc);
+    /* 262 */ SyscallDesc("timer_settime", unimplementedFunc);
+    /* 263 */ SyscallDesc("timer_gettime", unimplementedFunc);
+    /* 264 */ SyscallDesc("timer_getoverrun", unimplementedFunc);
+    /* 265 */ SyscallDesc("timer_delete", unimplementedFunc);
+    /* 266 */ SyscallDesc("timer_create", unimplementedFunc);
+    /* 267 */ SyscallDesc("vserver", unimplementedFunc);
+    /* 268 */ SyscallDesc("io_setup", unimplementedFunc);
+    /* 269 */ SyscallDesc("io_destroy", unimplementedFunc);
+    /* 270 */ SyscallDesc("io_submit", unimplementedFunc);
+    /* 271 */ SyscallDesc("io_cancel", unimplementedFunc);
+    /* 272 */ SyscallDesc("io_getevents", unimplementedFunc);
+    /* 273 */ SyscallDesc("mq_open", unimplementedFunc);
+    /* 274 */ SyscallDesc("mq_unlink", unimplementedFunc);
+    /* 275 */ SyscallDesc("mq_timedsend", unimplementedFunc);
+    /* 276 */ SyscallDesc("mq_timedreceive", unimplementedFunc);
+    /* 277 */ SyscallDesc("mq_notify", unimplementedFunc);
+    /* 278 */ SyscallDesc("mq_getsetattr", unimplementedFunc);
+    /* 279 */ SyscallDesc("waitid", unimplementedFunc);
+    /* 280 */ SyscallDesc("sys_setaltroot", unimplementedFunc);
+    /* 281 */ SyscallDesc("add_key", unimplementedFunc);
+    /* 282 */ SyscallDesc("request_key", unimplementedFunc);
+    /* 283 */ SyscallDesc("keyctl", unimplementedFunc);
 };
 
 SparcLinuxProcess::SparcLinuxProcess(const std::string &name,

diff --git a/sim/syscall_emul.cc b/sim/syscall_emul.cc
index 793c0c6cbf835cddf30123ef42c75808eaef5f65..00168b025096b7cada83407e94b1fe0225c5e3c2 100644 (file)
--- a/sim/syscall_emul.cc
+++ b/sim/syscall_emul.cc
@@ -341,7 +341,7 @@ pipePseudoFunc(SyscallDesc *desc, int callnum, Process *process,
 
     // Alpha Linux convention for pipe() is that fd[0] is returned as
     // the return value of the function, and fd[1] is returned in r20.
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = sim_fds[1];
+    xc->setIntReg(SyscallPseudoReturnReg, sim_fds[1]);
     return sim_fds[0];
 }
 
@@ -354,7 +354,7 @@ getpidPseudoFunc(SyscallDesc *desc, int callnum, Process *process,
     // fake_syscall mode, so there's no way for a process to know it's
     // not getting a unique value.
 
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 99;
+    xc->setIntReg(SyscallPseudoReturnReg, 99);
     return 100;
 }
 
@@ -367,7 +367,7 @@ getuidPseudoFunc(SyscallDesc *desc, int callnum, Process *process,
     // simulation to be deterministic.
 
     // EUID goes in r20.
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 100; // EUID
+    xc->setIntReg(SyscallPseudoReturnReg, 100); //EUID
     return 100;                // UID
 }
 
@@ -377,7 +377,7 @@ getgidPseudoFunc(SyscallDesc *desc, int callnum, Process *process,
            ExecContext *xc)
 {
     // Get current group ID.  EGID goes in r20.
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 100;
+    xc->setIntReg(SyscallPseudoReturnReg, 100); //EGID
     return 100;
 }
 
@@ -399,7 +399,7 @@ getpidFunc(SyscallDesc *desc, int callnum, Process *process,
     // fake_syscall mode, so there's no way for a process to know it's
     // not getting a unique value.
 
-    xc->regs.intRegFile[SyscallPseudoReturnReg] = 99;
+    xc->setIntReg(SyscallPseudoReturnReg, 99); //PID
     return 100;
 }