Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Wed, 8 Mar 2006 01:01:34 +0000 (20:01 -0500)
committerKevin Lim <ktlim@umich.edu>
Wed, 8 Mar 2006 01:01:34 +0000 (20:01 -0500)
into  zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc

arch/alpha/faults.cc:
    Hand merge.

--HG--
rename : arch/alpha/linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/tru64_process.cc => arch/alpha/tru64/process.cc
extra : convert_revision : 6ea1fae5be0ebd02eff330423d16da63b790516d

1  2 
SConscript
arch/alpha/faults.cc
arch/alpha/linux/process.cc
arch/alpha/tru64/process.cc
kern/kernel_stats.cc
kern/kernel_stats.hh

diff --cc SConscript
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,d78e6a4ee72d3c09c154eafd638fe527863122c1..c579c47d95fac2da244db50bb45d25db44b68255
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,613 +1,613 @@@
 -    xc->regs.intRegFile[20] = sim_fds[1];
+ /*
+  * Copyright (c) 2003-2005 The Regents of The University of Michigan
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions are
+  * met: redistributions of source code must retain the above copyright
+  * notice, this list of conditions and the following disclaimer;
+  * 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;
+  * neither the name of the copyright holders nor the names of its
+  * contributors may be used to endorse or promote products derived from
+  * this software without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  * "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 COPYRIGHT
+  * OWNER OR CONTRIBUTORS 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.
+  */
+ #include "arch/alpha/common_syscall_emul.hh"
+ #include "arch/alpha/linux/process.hh"
+ #include "arch/alpha/isa_traits.hh"
+ #include "base/trace.hh"
+ #include "cpu/exec_context.hh"
+ #include "kern/linux/linux.hh"
+ #include "mem/functional/functional.hh"
+ #include "sim/process.hh"
+ #include "sim/syscall_emul.hh"
+ using namespace std;
+ using namespace AlphaISA;
+ /// Target pipe() handler.  Even though this is a generic Posix call,
+ /// the Alpha return convention is funky, so that makes it
+ /// Alpha-specific.
+ SyscallReturn
+ pipeFunc(SyscallDesc *desc, int callnum, Process *process,
+          ExecContext *xc)
+ {
+     int fds[2], sim_fds[2];
+     int pipe_retval = pipe(fds);
+     if (pipe_retval < 0) {
+         // error
+         return pipe_retval;
+     }
+     sim_fds[0] = process->alloc_fd(fds[0]);
+     sim_fds[1] = process->alloc_fd(fds[1]);
+     // 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.
 -    name.copyOut(xc->mem);
++    xc->setIntReg(20, sim_fds[1]);
+     return sim_fds[0];
+ }
+ /// Target uname() handler.
+ static SyscallReturn
+ unameFunc(SyscallDesc *desc, int callnum, Process *process,
+           ExecContext *xc)
+ {
+     TypedBufferArg<Linux::utsname> name(xc->getSyscallArg(0));
+     strcpy(name->sysname, "Linux");
+     strcpy(name->nodename, "m5.eecs.umich.edu");
+     strcpy(name->release, "2.4.20");
+     strcpy(name->version, "#1 Mon Aug 18 11:32:15 EDT 2003");
+     strcpy(name->machine, "alpha");
 -          fpcr.copyOut(xc->mem);
++    name.copyOut(xc->getMemPtr());
+     return 0;
+ }
+ /// Target osf_getsysyinfo() handler.  Even though this call is
+ /// borrowed from Tru64, the subcases that get used appear to be
+ /// different in practice from those used by Tru64 processes.
+ static SyscallReturn
+ osf_getsysinfoFunc(SyscallDesc *desc, int callnum, Process *process,
+                    ExecContext *xc)
+ {
+     unsigned op = xc->getSyscallArg(0);
+     // unsigned nbytes = xc->getSyscallArg(2);
+     switch (op) {
+       case 45: { // GSI_IEEE_FP_CONTROL
+           TypedBufferArg<uint64_t> fpcr(xc->getSyscallArg(1));
+           // I don't think this exactly matches the HW FPCR
+           *fpcr = 0;
 -          fpcr.copyIn(xc->mem);
++          fpcr.copyOut(xc->getMemPtr());
+           return 0;
+       }
+       default:
+         cerr << "osf_getsysinfo: unknown op " << op << endl;
+         abort();
+         break;
+     }
+     return 1;
+ }
+ /// Target osf_setsysinfo() handler.
+ static SyscallReturn
+ osf_setsysinfoFunc(SyscallDesc *desc, int callnum, Process *process,
+                    ExecContext *xc)
+ {
+     unsigned op = xc->getSyscallArg(0);
+     // unsigned nbytes = xc->getSyscallArg(2);
+     switch (op) {
+       case 14: { // SSI_IEEE_FP_CONTROL
+           TypedBufferArg<uint64_t> fpcr(xc->getSyscallArg(1));
+           // I don't think this exactly matches the HW FPCR
++          fpcr.copyIn(xc->getMemPtr());
+           DPRINTFR(SyscallVerbose, "osf_setsysinfo(SSI_IEEE_FP_CONTROL): "
+                    " setting FPCR to 0x%x\n", gtoh(*(uint64_t*)fpcr));
+           return 0;
+       }
+       default:
+         cerr << "osf_setsysinfo: unknown op " << op << endl;
+         abort();
+         break;
+     }
+     return 1;
+ }
+ SyscallDesc AlphaLinuxProcess::syscallDescs[] = {
+     /*  0 */ SyscallDesc("osf_syscall", unimplementedFunc),
+     /*  1 */ SyscallDesc("exit", exitFunc),
+     /*  2 */ SyscallDesc("fork", unimplementedFunc),
+     /*  3 */ SyscallDesc("read", readFunc),
+     /*  4 */ SyscallDesc("write", writeFunc),
+     /*  5 */ SyscallDesc("osf_old_open", unimplementedFunc),
+     /*  6 */ SyscallDesc("close", closeFunc),
+     /*  7 */ SyscallDesc("osf_wait4", unimplementedFunc),
+     /*  8 */ SyscallDesc("osf_old_creat", unimplementedFunc),
+     /*  9 */ SyscallDesc("link", unimplementedFunc),
+     /* 10 */ SyscallDesc("unlink", unlinkFunc),
+     /* 11 */ SyscallDesc("osf_execve", unimplementedFunc),
+     /* 12 */ SyscallDesc("chdir", unimplementedFunc),
+     /* 13 */ SyscallDesc("fchdir", unimplementedFunc),
+     /* 14 */ SyscallDesc("mknod", unimplementedFunc),
+     /* 15 */ SyscallDesc("chmod", chmodFunc<Linux>),
+     /* 16 */ SyscallDesc("chown", chownFunc),
+     /* 17 */ SyscallDesc("brk", obreakFunc),
+     /* 18 */ SyscallDesc("osf_getfsstat", unimplementedFunc),
+     /* 19 */ SyscallDesc("lseek", lseekFunc),
+     /* 20 */ SyscallDesc("getxpid", getpidFunc),
+     /* 21 */ SyscallDesc("osf_mount", unimplementedFunc),
+     /* 22 */ SyscallDesc("umount", unimplementedFunc),
+     /* 23 */ SyscallDesc("setuid", setuidFunc),
+     /* 24 */ SyscallDesc("getxuid", getuidFunc),
+     /* 25 */ SyscallDesc("exec_with_loader", unimplementedFunc),
+     /* 26 */ SyscallDesc("osf_ptrace", unimplementedFunc),
+     /* 27 */ SyscallDesc("osf_nrecvmsg", unimplementedFunc),
+     /* 28 */ SyscallDesc("osf_nsendmsg", unimplementedFunc),
+     /* 29 */ SyscallDesc("osf_nrecvfrom", unimplementedFunc),
+     /* 30 */ SyscallDesc("osf_naccept", unimplementedFunc),
+     /* 31 */ SyscallDesc("osf_ngetpeername", unimplementedFunc),
+     /* 32 */ SyscallDesc("osf_ngetsockname", unimplementedFunc),
+     /* 33 */ SyscallDesc("access", unimplementedFunc),
+     /* 34 */ SyscallDesc("osf_chflags", unimplementedFunc),
+     /* 35 */ SyscallDesc("osf_fchflags", unimplementedFunc),
+     /* 36 */ SyscallDesc("sync", unimplementedFunc),
+     /* 37 */ SyscallDesc("kill", unimplementedFunc),
+     /* 38 */ SyscallDesc("osf_old_stat", unimplementedFunc),
+     /* 39 */ SyscallDesc("setpgid", unimplementedFunc),
+     /* 40 */ SyscallDesc("osf_old_lstat", unimplementedFunc),
+     /* 41 */ SyscallDesc("dup", unimplementedFunc),
+     /* 42 */ SyscallDesc("pipe", pipeFunc),
+     /* 43 */ SyscallDesc("osf_set_program_attributes", unimplementedFunc),
+     /* 44 */ SyscallDesc("osf_profil", unimplementedFunc),
+     /* 45 */ SyscallDesc("open", openFunc<Linux>),
+     /* 46 */ SyscallDesc("osf_old_sigaction", unimplementedFunc),
+     /* 47 */ SyscallDesc("getxgid", getgidFunc),
+     /* 48 */ SyscallDesc("osf_sigprocmask", ignoreFunc),
+     /* 49 */ SyscallDesc("osf_getlogin", unimplementedFunc),
+     /* 50 */ SyscallDesc("osf_setlogin", unimplementedFunc),
+     /* 51 */ SyscallDesc("acct", unimplementedFunc),
+     /* 52 */ SyscallDesc("sigpending", unimplementedFunc),
+     /* 53 */ SyscallDesc("osf_classcntl", unimplementedFunc),
+     /* 54 */ SyscallDesc("ioctl", ioctlFunc<Linux>),
+     /* 55 */ SyscallDesc("osf_reboot", unimplementedFunc),
+     /* 56 */ SyscallDesc("osf_revoke", unimplementedFunc),
+     /* 57 */ SyscallDesc("symlink", unimplementedFunc),
+     /* 58 */ SyscallDesc("readlink", unimplementedFunc),
+     /* 59 */ SyscallDesc("execve", unimplementedFunc),
+     /* 60 */ SyscallDesc("umask", unimplementedFunc),
+     /* 61 */ SyscallDesc("chroot", unimplementedFunc),
+     /* 62 */ SyscallDesc("osf_old_fstat", unimplementedFunc),
+     /* 63 */ SyscallDesc("getpgrp", unimplementedFunc),
+     /* 64 */ SyscallDesc("getpagesize", getpagesizeFunc),
+     /* 65 */ SyscallDesc("osf_mremap", unimplementedFunc),
+     /* 66 */ SyscallDesc("vfork", unimplementedFunc),
+     /* 67 */ SyscallDesc("stat", statFunc<Linux>),
+     /* 68 */ SyscallDesc("lstat", lstatFunc<Linux>),
+     /* 69 */ SyscallDesc("osf_sbrk", unimplementedFunc),
+     /* 70 */ SyscallDesc("osf_sstk", unimplementedFunc),
+     /* 71 */ SyscallDesc("mmap", mmapFunc<Linux>),
+     /* 72 */ SyscallDesc("osf_old_vadvise", unimplementedFunc),
+     /* 73 */ SyscallDesc("munmap", munmapFunc),
+     /* 74 */ SyscallDesc("mprotect", ignoreFunc),
+     /* 75 */ SyscallDesc("madvise", unimplementedFunc),
+     /* 76 */ SyscallDesc("vhangup", unimplementedFunc),
+     /* 77 */ SyscallDesc("osf_kmodcall", unimplementedFunc),
+     /* 78 */ SyscallDesc("osf_mincore", unimplementedFunc),
+     /* 79 */ SyscallDesc("getgroups", unimplementedFunc),
+     /* 80 */ SyscallDesc("setgroups", unimplementedFunc),
+     /* 81 */ SyscallDesc("osf_old_getpgrp", unimplementedFunc),
+     /* 82 */ SyscallDesc("setpgrp", unimplementedFunc),
+     /* 83 */ SyscallDesc("osf_setitimer", unimplementedFunc),
+     /* 84 */ SyscallDesc("osf_old_wait", unimplementedFunc),
+     /* 85 */ SyscallDesc("osf_table", unimplementedFunc),
+     /* 86 */ SyscallDesc("osf_getitimer", unimplementedFunc),
+     /* 87 */ SyscallDesc("gethostname", gethostnameFunc),
+     /* 88 */ SyscallDesc("sethostname", unimplementedFunc),
+     /* 89 */ SyscallDesc("getdtablesize", unimplementedFunc),
+     /* 90 */ SyscallDesc("dup2", unimplementedFunc),
+     /* 91 */ SyscallDesc("fstat", fstatFunc<Linux>),
+     /* 92 */ SyscallDesc("fcntl", fcntlFunc),
+     /* 93 */ SyscallDesc("osf_select", unimplementedFunc),
+     /* 94 */ SyscallDesc("poll", 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("send", unimplementedFunc),
+     /* 102 */ SyscallDesc("recv", unimplementedFunc),
+     /* 103 */ SyscallDesc("sigreturn", unimplementedFunc),
+     /* 104 */ SyscallDesc("bind", unimplementedFunc),
+     /* 105 */ SyscallDesc("setsockopt", unimplementedFunc),
+     /* 106 */ SyscallDesc("listen", unimplementedFunc),
+     /* 107 */ SyscallDesc("osf_plock", unimplementedFunc),
+     /* 108 */ SyscallDesc("osf_old_sigvec", unimplementedFunc),
+     /* 109 */ SyscallDesc("osf_old_sigblock", unimplementedFunc),
+     /* 110 */ SyscallDesc("osf_old_sigsetmask", unimplementedFunc),
+     /* 111 */ SyscallDesc("sigsuspend", unimplementedFunc),
+     /* 112 */ SyscallDesc("osf_sigstack", ignoreFunc),
+     /* 113 */ SyscallDesc("recvmsg", unimplementedFunc),
+     /* 114 */ SyscallDesc("sendmsg", unimplementedFunc),
+     /* 115 */ SyscallDesc("osf_old_vtrace", unimplementedFunc),
+     /* 116 */ SyscallDesc("osf_gettimeofday", unimplementedFunc),
+     /* 117 */ SyscallDesc("osf_getrusage", unimplementedFunc),
+     /* 118 */ SyscallDesc("getsockopt", unimplementedFunc),
+     /* 119 */ SyscallDesc("numa_syscalls", unimplementedFunc),
+     /* 120 */ SyscallDesc("readv", unimplementedFunc),
+     /* 121 */ SyscallDesc("writev", writevFunc<Linux>),
+     /* 122 */ SyscallDesc("osf_settimeofday", unimplementedFunc),
+     /* 123 */ SyscallDesc("fchown", fchownFunc),
+     /* 124 */ SyscallDesc("fchmod", fchmodFunc<Linux>),
+     /* 125 */ SyscallDesc("recvfrom", unimplementedFunc),
+     /* 126 */ SyscallDesc("setreuid", unimplementedFunc),
+     /* 127 */ SyscallDesc("setregid", unimplementedFunc),
+     /* 128 */ SyscallDesc("rename", renameFunc),
+     /* 129 */ SyscallDesc("truncate", unimplementedFunc),
+     /* 130 */ SyscallDesc("ftruncate", unimplementedFunc),
+     /* 131 */ SyscallDesc("flock", unimplementedFunc),
+     /* 132 */ SyscallDesc("setgid", unimplementedFunc),
+     /* 133 */ SyscallDesc("sendto", unimplementedFunc),
+     /* 134 */ SyscallDesc("shutdown", unimplementedFunc),
+     /* 135 */ SyscallDesc("socketpair", unimplementedFunc),
+     /* 136 */ SyscallDesc("mkdir", unimplementedFunc),
+     /* 137 */ SyscallDesc("rmdir", unimplementedFunc),
+     /* 138 */ SyscallDesc("osf_utimes", unimplementedFunc),
+     /* 139 */ SyscallDesc("osf_old_sigreturn", unimplementedFunc),
+     /* 140 */ SyscallDesc("osf_adjtime", unimplementedFunc),
+     /* 141 */ SyscallDesc("getpeername", unimplementedFunc),
+     /* 142 */ SyscallDesc("osf_gethostid", unimplementedFunc),
+     /* 143 */ SyscallDesc("osf_sethostid", unimplementedFunc),
+     /* 144 */ SyscallDesc("getrlimit", getrlimitFunc<Linux>),
+     /* 145 */ SyscallDesc("setrlimit", ignoreFunc),
+     /* 146 */ SyscallDesc("osf_old_killpg", unimplementedFunc),
+     /* 147 */ SyscallDesc("setsid", unimplementedFunc),
+     /* 148 */ SyscallDesc("quotactl", unimplementedFunc),
+     /* 149 */ SyscallDesc("osf_oldquota", unimplementedFunc),
+     /* 150 */ SyscallDesc("getsockname", unimplementedFunc),
+     /* 151 */ SyscallDesc("osf_pread", unimplementedFunc),
+     /* 152 */ SyscallDesc("osf_pwrite", unimplementedFunc),
+     /* 153 */ SyscallDesc("osf_pid_block", unimplementedFunc),
+     /* 154 */ SyscallDesc("osf_pid_unblock", unimplementedFunc),
+     /* 155 */ SyscallDesc("osf_signal_urti", unimplementedFunc),
+     /* 156 */ SyscallDesc("sigaction", ignoreFunc),
+     /* 157 */ SyscallDesc("osf_sigwaitprim", unimplementedFunc),
+     /* 158 */ SyscallDesc("osf_nfssvc", unimplementedFunc),
+     /* 159 */ SyscallDesc("osf_getdirentries", unimplementedFunc),
+     /* 160 */ SyscallDesc("osf_statfs", unimplementedFunc),
+     /* 161 */ SyscallDesc("osf_fstatfs", unimplementedFunc),
+     /* 162 */ SyscallDesc("unknown #162", unimplementedFunc),
+     /* 163 */ SyscallDesc("osf_async_daemon", unimplementedFunc),
+     /* 164 */ SyscallDesc("osf_getfh", unimplementedFunc),
+     /* 165 */ SyscallDesc("osf_getdomainname", unimplementedFunc),
+     /* 166 */ SyscallDesc("setdomainname", unimplementedFunc),
+     /* 167 */ SyscallDesc("unknown #167", unimplementedFunc),
+     /* 168 */ SyscallDesc("unknown #168", unimplementedFunc),
+     /* 169 */ SyscallDesc("osf_exportfs", unimplementedFunc),
+     /* 170 */ SyscallDesc("unknown #170", unimplementedFunc),
+     /* 171 */ SyscallDesc("unknown #171", unimplementedFunc),
+     /* 172 */ SyscallDesc("unknown #172", unimplementedFunc),
+     /* 173 */ SyscallDesc("unknown #173", unimplementedFunc),
+     /* 174 */ SyscallDesc("unknown #174", unimplementedFunc),
+     /* 175 */ SyscallDesc("unknown #175", unimplementedFunc),
+     /* 176 */ SyscallDesc("unknown #176", unimplementedFunc),
+     /* 177 */ SyscallDesc("unknown #177", unimplementedFunc),
+     /* 178 */ SyscallDesc("unknown #178", unimplementedFunc),
+     /* 179 */ SyscallDesc("unknown #179", unimplementedFunc),
+     /* 180 */ SyscallDesc("unknown #180", unimplementedFunc),
+     /* 181 */ SyscallDesc("osf_alt_plock", unimplementedFunc),
+     /* 182 */ SyscallDesc("unknown #182", unimplementedFunc),
+     /* 183 */ SyscallDesc("unknown #183", unimplementedFunc),
+     /* 184 */ SyscallDesc("osf_getmnt", unimplementedFunc),
+     /* 185 */ SyscallDesc("unknown #185", unimplementedFunc),
+     /* 186 */ SyscallDesc("unknown #186", unimplementedFunc),
+     /* 187 */ SyscallDesc("osf_alt_sigpending", unimplementedFunc),
+     /* 188 */ SyscallDesc("osf_alt_setsid", unimplementedFunc),
+     /* 189 */ SyscallDesc("unknown #189", unimplementedFunc),
+     /* 190 */ SyscallDesc("unknown #190", unimplementedFunc),
+     /* 191 */ SyscallDesc("unknown #191", unimplementedFunc),
+     /* 192 */ SyscallDesc("unknown #192", unimplementedFunc),
+     /* 193 */ SyscallDesc("unknown #193", unimplementedFunc),
+     /* 194 */ SyscallDesc("unknown #194", unimplementedFunc),
+     /* 195 */ SyscallDesc("unknown #195", unimplementedFunc),
+     /* 196 */ SyscallDesc("unknown #196", unimplementedFunc),
+     /* 197 */ SyscallDesc("unknown #197", unimplementedFunc),
+     /* 198 */ SyscallDesc("unknown #198", unimplementedFunc),
+     /* 199 */ SyscallDesc("osf_swapon", unimplementedFunc),
+     /* 200 */ SyscallDesc("msgctl", unimplementedFunc),
+     /* 201 */ SyscallDesc("msgget", unimplementedFunc),
+     /* 202 */ SyscallDesc("msgrcv", unimplementedFunc),
+     /* 203 */ SyscallDesc("msgsnd", unimplementedFunc),
+     /* 204 */ SyscallDesc("semctl", unimplementedFunc),
+     /* 205 */ SyscallDesc("semget", unimplementedFunc),
+     /* 206 */ SyscallDesc("semop", unimplementedFunc),
+     /* 207 */ SyscallDesc("osf_utsname", unimplementedFunc),
+     /* 208 */ SyscallDesc("lchown", unimplementedFunc),
+     /* 209 */ SyscallDesc("osf_shmat", unimplementedFunc),
+     /* 210 */ SyscallDesc("shmctl", unimplementedFunc),
+     /* 211 */ SyscallDesc("shmdt", unimplementedFunc),
+     /* 212 */ SyscallDesc("shmget", unimplementedFunc),
+     /* 213 */ SyscallDesc("osf_mvalid", unimplementedFunc),
+     /* 214 */ SyscallDesc("osf_getaddressconf", unimplementedFunc),
+     /* 215 */ SyscallDesc("osf_msleep", unimplementedFunc),
+     /* 216 */ SyscallDesc("osf_mwakeup", unimplementedFunc),
+     /* 217 */ SyscallDesc("msync", unimplementedFunc),
+     /* 218 */ SyscallDesc("osf_signal", unimplementedFunc),
+     /* 219 */ SyscallDesc("osf_utc_gettime", unimplementedFunc),
+     /* 220 */ SyscallDesc("osf_utc_adjtime", unimplementedFunc),
+     /* 221 */ SyscallDesc("unknown #221", unimplementedFunc),
+     /* 222 */ SyscallDesc("osf_security", unimplementedFunc),
+     /* 223 */ SyscallDesc("osf_kloadcall", unimplementedFunc),
+     /* 224 */ SyscallDesc("unknown #224", unimplementedFunc),
+     /* 225 */ SyscallDesc("unknown #225", unimplementedFunc),
+     /* 226 */ SyscallDesc("unknown #226", unimplementedFunc),
+     /* 227 */ SyscallDesc("unknown #227", unimplementedFunc),
+     /* 228 */ SyscallDesc("unknown #228", unimplementedFunc),
+     /* 229 */ SyscallDesc("unknown #229", unimplementedFunc),
+     /* 230 */ SyscallDesc("unknown #230", unimplementedFunc),
+     /* 231 */ SyscallDesc("unknown #231", unimplementedFunc),
+     /* 232 */ SyscallDesc("unknown #232", unimplementedFunc),
+     /* 233 */ SyscallDesc("getpgid", unimplementedFunc),
+     /* 234 */ SyscallDesc("getsid", unimplementedFunc),
+     /* 235 */ SyscallDesc("sigaltstack", ignoreFunc),
+     /* 236 */ SyscallDesc("osf_waitid", unimplementedFunc),
+     /* 237 */ SyscallDesc("osf_priocntlset", unimplementedFunc),
+     /* 238 */ SyscallDesc("osf_sigsendset", unimplementedFunc),
+     /* 239 */ SyscallDesc("osf_set_speculative", unimplementedFunc),
+     /* 240 */ SyscallDesc("osf_msfs_syscall", unimplementedFunc),
+     /* 241 */ SyscallDesc("osf_sysinfo", unimplementedFunc),
+     /* 242 */ SyscallDesc("osf_uadmin", unimplementedFunc),
+     /* 243 */ SyscallDesc("osf_fuser", unimplementedFunc),
+     /* 244 */ SyscallDesc("osf_proplist_syscall", unimplementedFunc),
+     /* 245 */ SyscallDesc("osf_ntp_adjtime", unimplementedFunc),
+     /* 246 */ SyscallDesc("osf_ntp_gettime", unimplementedFunc),
+     /* 247 */ SyscallDesc("osf_pathconf", unimplementedFunc),
+     /* 248 */ SyscallDesc("osf_fpathconf", unimplementedFunc),
+     /* 249 */ SyscallDesc("unknown #249", unimplementedFunc),
+     /* 250 */ SyscallDesc("osf_uswitch", unimplementedFunc),
+     /* 251 */ SyscallDesc("osf_usleep_thread", unimplementedFunc),
+     /* 252 */ SyscallDesc("osf_audcntl", unimplementedFunc),
+     /* 253 */ SyscallDesc("osf_audgen", unimplementedFunc),
+     /* 254 */ SyscallDesc("sysfs", unimplementedFunc),
+     /* 255 */ SyscallDesc("osf_subsys_info", unimplementedFunc),
+     /* 256 */ SyscallDesc("osf_getsysinfo", osf_getsysinfoFunc),
+     /* 257 */ SyscallDesc("osf_setsysinfo", osf_setsysinfoFunc),
+     /* 258 */ SyscallDesc("osf_afs_syscall", unimplementedFunc),
+     /* 259 */ SyscallDesc("osf_swapctl", unimplementedFunc),
+     /* 260 */ SyscallDesc("osf_memcntl", unimplementedFunc),
+     /* 261 */ SyscallDesc("osf_fdatasync", unimplementedFunc),
+     /* 262 */ SyscallDesc("unknown #262", unimplementedFunc),
+     /* 263 */ SyscallDesc("unknown #263", unimplementedFunc),
+     /* 264 */ SyscallDesc("unknown #264", unimplementedFunc),
+     /* 265 */ SyscallDesc("unknown #265", unimplementedFunc),
+     /* 266 */ SyscallDesc("unknown #266", unimplementedFunc),
+     /* 267 */ SyscallDesc("unknown #267", unimplementedFunc),
+     /* 268 */ SyscallDesc("unknown #268", unimplementedFunc),
+     /* 269 */ SyscallDesc("unknown #269", unimplementedFunc),
+     /* 270 */ SyscallDesc("unknown #270", unimplementedFunc),
+     /* 271 */ SyscallDesc("unknown #271", unimplementedFunc),
+     /* 272 */ SyscallDesc("unknown #272", unimplementedFunc),
+     /* 273 */ SyscallDesc("unknown #273", unimplementedFunc),
+     /* 274 */ SyscallDesc("unknown #274", unimplementedFunc),
+     /* 275 */ SyscallDesc("unknown #275", unimplementedFunc),
+     /* 276 */ SyscallDesc("unknown #276", unimplementedFunc),
+     /* 277 */ SyscallDesc("unknown #277", unimplementedFunc),
+     /* 278 */ SyscallDesc("unknown #278", unimplementedFunc),
+     /* 279 */ SyscallDesc("unknown #279", unimplementedFunc),
+     /* 280 */ SyscallDesc("unknown #280", unimplementedFunc),
+     /* 281 */ SyscallDesc("unknown #281", unimplementedFunc),
+     /* 282 */ SyscallDesc("unknown #282", unimplementedFunc),
+     /* 283 */ SyscallDesc("unknown #283", unimplementedFunc),
+     /* 284 */ SyscallDesc("unknown #284", unimplementedFunc),
+     /* 285 */ SyscallDesc("unknown #285", unimplementedFunc),
+     /* 286 */ SyscallDesc("unknown #286", unimplementedFunc),
+     /* 287 */ SyscallDesc("unknown #287", unimplementedFunc),
+     /* 288 */ SyscallDesc("unknown #288", unimplementedFunc),
+     /* 289 */ SyscallDesc("unknown #289", unimplementedFunc),
+     /* 290 */ SyscallDesc("unknown #290", unimplementedFunc),
+     /* 291 */ SyscallDesc("unknown #291", unimplementedFunc),
+     /* 292 */ SyscallDesc("unknown #292", unimplementedFunc),
+     /* 293 */ SyscallDesc("unknown #293", unimplementedFunc),
+     /* 294 */ SyscallDesc("unknown #294", unimplementedFunc),
+     /* 295 */ SyscallDesc("unknown #295", unimplementedFunc),
+     /* 296 */ SyscallDesc("unknown #296", unimplementedFunc),
+     /* 297 */ SyscallDesc("unknown #297", unimplementedFunc),
+     /* 298 */ SyscallDesc("unknown #298", unimplementedFunc),
+     /* 299 */ SyscallDesc("unknown #299", unimplementedFunc),
+ /*
+  * Linux-specific system calls begin at 300
+  */
+     /* 300 */ SyscallDesc("bdflush", unimplementedFunc),
+     /* 301 */ SyscallDesc("sethae", unimplementedFunc),
+     /* 302 */ SyscallDesc("mount", unimplementedFunc),
+     /* 303 */ SyscallDesc("old_adjtimex", unimplementedFunc),
+     /* 304 */ SyscallDesc("swapoff", unimplementedFunc),
+     /* 305 */ SyscallDesc("getdents", unimplementedFunc),
+     /* 306 */ SyscallDesc("create_module", unimplementedFunc),
+     /* 307 */ SyscallDesc("init_module", unimplementedFunc),
+     /* 308 */ SyscallDesc("delete_module", unimplementedFunc),
+     /* 309 */ SyscallDesc("get_kernel_syms", unimplementedFunc),
+     /* 310 */ SyscallDesc("syslog", unimplementedFunc),
+     /* 311 */ SyscallDesc("reboot", unimplementedFunc),
+     /* 312 */ SyscallDesc("clone", unimplementedFunc),
+     /* 313 */ SyscallDesc("uselib", unimplementedFunc),
+     /* 314 */ SyscallDesc("mlock", unimplementedFunc),
+     /* 315 */ SyscallDesc("munlock", unimplementedFunc),
+     /* 316 */ SyscallDesc("mlockall", unimplementedFunc),
+     /* 317 */ SyscallDesc("munlockall", unimplementedFunc),
+     /* 318 */ SyscallDesc("sysinfo", unimplementedFunc),
+     /* 319 */ SyscallDesc("_sysctl", unimplementedFunc),
+     /* 320 */ SyscallDesc("was sys_idle", unimplementedFunc),
+     /* 321 */ SyscallDesc("oldumount", unimplementedFunc),
+     /* 322 */ SyscallDesc("swapon", unimplementedFunc),
+     /* 323 */ SyscallDesc("times", ignoreFunc),
+     /* 324 */ SyscallDesc("personality", unimplementedFunc),
+     /* 325 */ SyscallDesc("setfsuid", unimplementedFunc),
+     /* 326 */ SyscallDesc("setfsgid", unimplementedFunc),
+     /* 327 */ SyscallDesc("ustat", unimplementedFunc),
+     /* 328 */ SyscallDesc("statfs", unimplementedFunc),
+     /* 329 */ SyscallDesc("fstatfs", unimplementedFunc),
+     /* 330 */ SyscallDesc("sched_setparam", unimplementedFunc),
+     /* 331 */ SyscallDesc("sched_getparam", unimplementedFunc),
+     /* 332 */ SyscallDesc("sched_setscheduler", unimplementedFunc),
+     /* 333 */ SyscallDesc("sched_getscheduler", unimplementedFunc),
+     /* 334 */ SyscallDesc("sched_yield", unimplementedFunc),
+     /* 335 */ SyscallDesc("sched_get_priority_max", unimplementedFunc),
+     /* 336 */ SyscallDesc("sched_get_priority_min", unimplementedFunc),
+     /* 337 */ SyscallDesc("sched_rr_get_interval", unimplementedFunc),
+     /* 338 */ SyscallDesc("afs_syscall", unimplementedFunc),
+     /* 339 */ SyscallDesc("uname", unameFunc),
+     /* 340 */ SyscallDesc("nanosleep", unimplementedFunc),
+     /* 341 */ SyscallDesc("mremap", unimplementedFunc),
+     /* 342 */ SyscallDesc("nfsservctl", unimplementedFunc),
+     /* 343 */ SyscallDesc("setresuid", unimplementedFunc),
+     /* 344 */ SyscallDesc("getresuid", unimplementedFunc),
+     /* 345 */ SyscallDesc("pciconfig_read", unimplementedFunc),
+     /* 346 */ SyscallDesc("pciconfig_write", unimplementedFunc),
+     /* 347 */ SyscallDesc("query_module", unimplementedFunc),
+     /* 348 */ SyscallDesc("prctl", unimplementedFunc),
+     /* 349 */ SyscallDesc("pread", unimplementedFunc),
+     /* 350 */ SyscallDesc("pwrite", unimplementedFunc),
+     /* 351 */ SyscallDesc("rt_sigreturn", unimplementedFunc),
+     /* 352 */ SyscallDesc("rt_sigaction", ignoreFunc),
+     /* 353 */ SyscallDesc("rt_sigprocmask", unimplementedFunc),
+     /* 354 */ SyscallDesc("rt_sigpending", unimplementedFunc),
+     /* 355 */ SyscallDesc("rt_sigtimedwait", unimplementedFunc),
+     /* 356 */ SyscallDesc("rt_sigqueueinfo", unimplementedFunc),
+     /* 357 */ SyscallDesc("rt_sigsuspend", unimplementedFunc),
+     /* 358 */ SyscallDesc("select", unimplementedFunc),
+     /* 359 */ SyscallDesc("gettimeofday", gettimeofdayFunc<Linux>),
+     /* 360 */ SyscallDesc("settimeofday", unimplementedFunc),
+     /* 361 */ SyscallDesc("getitimer", unimplementedFunc),
+     /* 362 */ SyscallDesc("setitimer", unimplementedFunc),
+     /* 363 */ SyscallDesc("utimes", utimesFunc<Linux>),
+     /* 364 */ SyscallDesc("getrusage", getrusageFunc<Linux>),
+     /* 365 */ SyscallDesc("wait4", unimplementedFunc),
+     /* 366 */ SyscallDesc("adjtimex", unimplementedFunc),
+     /* 367 */ SyscallDesc("getcwd", unimplementedFunc),
+     /* 368 */ SyscallDesc("capget", unimplementedFunc),
+     /* 369 */ SyscallDesc("capset", unimplementedFunc),
+     /* 370 */ SyscallDesc("sendfile", unimplementedFunc),
+     /* 371 */ SyscallDesc("setresgid", unimplementedFunc),
+     /* 372 */ SyscallDesc("getresgid", unimplementedFunc),
+     /* 373 */ SyscallDesc("dipc", unimplementedFunc),
+     /* 374 */ SyscallDesc("pivot_root", unimplementedFunc),
+     /* 375 */ SyscallDesc("mincore", unimplementedFunc),
+     /* 376 */ SyscallDesc("pciconfig_iobase", unimplementedFunc),
+     /* 377 */ SyscallDesc("getdents64", unimplementedFunc),
+     /* 378 */ SyscallDesc("gettid", unimplementedFunc),
+     /* 379 */ SyscallDesc("readahead", unimplementedFunc),
+     /* 380 */ SyscallDesc("security", unimplementedFunc),
+     /* 381 */ SyscallDesc("tkill", unimplementedFunc),
+     /* 382 */ SyscallDesc("setxattr", unimplementedFunc),
+     /* 383 */ SyscallDesc("lsetxattr", unimplementedFunc),
+     /* 384 */ SyscallDesc("fsetxattr", unimplementedFunc),
+     /* 385 */ SyscallDesc("getxattr", unimplementedFunc),
+     /* 386 */ SyscallDesc("lgetxattr", unimplementedFunc),
+     /* 387 */ SyscallDesc("fgetxattr", unimplementedFunc),
+     /* 388 */ SyscallDesc("listxattr", unimplementedFunc),
+     /* 389 */ SyscallDesc("llistxattr", unimplementedFunc),
+     /* 390 */ SyscallDesc("flistxattr", unimplementedFunc),
+     /* 391 */ SyscallDesc("removexattr", unimplementedFunc),
+     /* 392 */ SyscallDesc("lremovexattr", unimplementedFunc),
+     /* 393 */ SyscallDesc("fremovexattr", unimplementedFunc),
+     /* 394 */ SyscallDesc("futex", unimplementedFunc),
+     /* 395 */ SyscallDesc("sched_setaffinity", unimplementedFunc),
+     /* 396 */ SyscallDesc("sched_getaffinity", unimplementedFunc),
+     /* 397 */ SyscallDesc("tuxcall", unimplementedFunc),
+     /* 398 */ SyscallDesc("io_setup", unimplementedFunc),
+     /* 399 */ SyscallDesc("io_destroy", unimplementedFunc),
+     /* 400 */ SyscallDesc("io_getevents", unimplementedFunc),
+     /* 401 */ SyscallDesc("io_submit", unimplementedFunc),
+     /* 402 */ SyscallDesc("io_cancel", unimplementedFunc),
+     /* 403 */ SyscallDesc("unknown #403", unimplementedFunc),
+     /* 404 */ SyscallDesc("unknown #404", unimplementedFunc),
+     /* 405 */ SyscallDesc("exit_group", exitFunc), // exit all threads...
+     /* 406 */ SyscallDesc("lookup_dcookie", unimplementedFunc),
+     /* 407 */ SyscallDesc("sys_epoll_create", unimplementedFunc),
+     /* 408 */ SyscallDesc("sys_epoll_ctl", unimplementedFunc),
+     /* 409 */ SyscallDesc("sys_epoll_wait", unimplementedFunc),
+     /* 410 */ SyscallDesc("remap_file_pages", unimplementedFunc),
+     /* 411 */ SyscallDesc("set_tid_address", unimplementedFunc),
+     /* 412 */ SyscallDesc("restart_syscall", unimplementedFunc),
+     /* 413 */ SyscallDesc("fadvise64", unimplementedFunc),
+     /* 414 */ SyscallDesc("timer_create", unimplementedFunc),
+     /* 415 */ SyscallDesc("timer_settime", unimplementedFunc),
+     /* 416 */ SyscallDesc("timer_gettime", unimplementedFunc),
+     /* 417 */ SyscallDesc("timer_getoverrun", unimplementedFunc),
+     /* 418 */ SyscallDesc("timer_delete", unimplementedFunc),
+     /* 419 */ SyscallDesc("clock_settime", unimplementedFunc),
+     /* 420 */ SyscallDesc("clock_gettime", unimplementedFunc),
+     /* 421 */ SyscallDesc("clock_getres", unimplementedFunc),
+     /* 422 */ SyscallDesc("clock_nanosleep", unimplementedFunc),
+     /* 423 */ SyscallDesc("semtimedop", unimplementedFunc),
+     /* 424 */ SyscallDesc("tgkill", unimplementedFunc),
+     /* 425 */ SyscallDesc("stat64", unimplementedFunc),
+     /* 426 */ SyscallDesc("lstat64", lstat64Func<Linux>),
+     /* 427 */ SyscallDesc("fstat64", fstat64Func<Linux>),
+     /* 428 */ SyscallDesc("vserver", unimplementedFunc),
+     /* 429 */ SyscallDesc("mbind", unimplementedFunc),
+     /* 430 */ SyscallDesc("get_mempolicy", unimplementedFunc),
+     /* 431 */ SyscallDesc("set_mempolicy", unimplementedFunc),
+     /* 432 */ SyscallDesc("mq_open", unimplementedFunc),
+     /* 433 */ SyscallDesc("mq_unlink", unimplementedFunc),
+     /* 434 */ SyscallDesc("mq_timedsend", unimplementedFunc),
+     /* 435 */ SyscallDesc("mq_timedreceive", unimplementedFunc),
+     /* 436 */ SyscallDesc("mq_notify", unimplementedFunc),
+     /* 437 */ SyscallDesc("mq_getsetattr", unimplementedFunc),
+     /* 438 */ SyscallDesc("waitid", unimplementedFunc),
+     /* 439 */ SyscallDesc("add_key", unimplementedFunc),
+     /* 440 */ SyscallDesc("request_key", unimplementedFunc),
+     /* 441 */ SyscallDesc("keyctl", unimplementedFunc)
+ };
+ AlphaLinuxProcess::AlphaLinuxProcess(const std::string &name,
+                                      ObjectFile *objFile,
+                                      int stdin_fd,
+                                      int stdout_fd,
+                                      int stderr_fd,
+                                      std::vector<std::string> &argv,
+                                      std::vector<std::string> &envp)
+     : LiveProcess(name, objFile, stdin_fd, stdout_fd, stderr_fd, argv, envp),
+      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
+ {
+     init_regs->intRegFile[0] = 0;
+ }
+ SyscallDesc*
+ AlphaLinuxProcess::getDesc(int callnum)
+ {
+     if (callnum < 0 || callnum > Num_Syscall_Descs)
+         return NULL;
+     return &syscallDescs[callnum];
+ }
index 0000000000000000000000000000000000000000,58d41e3ef72a1c9c7c32db0a3c4e3eb9ca752634..3d9b2aecaf2091f0d50f3dd0279a35f4d1a135b4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,544 +1,544 @@@
 -    name.copyOut(xc->mem);
+ /*
+  * Copyright (c) 2001-2005 The Regents of The University of Michigan
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions are
+  * met: redistributions of source code must retain the above copyright
+  * notice, this list of conditions and the following disclaimer;
+  * 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;
+  * neither the name of the copyright holders nor the names of its
+  * contributors may be used to endorse or promote products derived from
+  * this software without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  * "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 COPYRIGHT
+  * OWNER OR CONTRIBUTORS 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.
+  */
+ #include "arch/alpha/isa_traits.hh"
+ #include "arch/alpha/common_syscall_emul.hh"
+ #include "arch/alpha/tru64/process.hh"
+ #include "cpu/exec_context.hh"
+ #include "kern/tru64/tru64.hh"
+ #include "mem/functional/functional.hh"
+ #include "sim/fake_syscall.hh"
+ #include "sim/process.hh"
+ #include "sim/syscall_emul.hh"
+ using namespace std;
+ using namespace AlphaISA;
+ /// Target uname() handler.
+ static SyscallReturn
+ unameFunc(SyscallDesc *desc, int callnum, Process *process,
+           ExecContext *xc)
+ {
+     TypedBufferArg<Tru64::utsname> name(xc->getSyscallArg(0));
+     strcpy(name->sysname, "OSF1");
+     strcpy(name->nodename, "m5.eecs.umich.edu");
+     strcpy(name->release, "V5.1");
+     strcpy(name->version, "732");
+     strcpy(name->machine, "alpha");
 -          max_cpu.copyOut(xc->mem);
++    name.copyOut(xc->getMemPtr());
+     return 0;
+ }
+ /// Target getsysyinfo() handler.
+ static SyscallReturn
+ getsysinfoFunc(SyscallDesc *desc, int callnum, Process *process,
+                ExecContext *xc)
+ {
+     unsigned op = xc->getSyscallArg(0);
+     unsigned nbytes = xc->getSyscallArg(2);
+     switch (op) {
+       case Tru64::GSI_MAX_CPU: {
+           TypedBufferArg<uint32_t> max_cpu(xc->getSyscallArg(1));
+           *max_cpu = htog((uint32_t)process->numCpus());
 -          cpus_in_box.copyOut(xc->mem);
++          max_cpu.copyOut(xc->getMemPtr());
+           return 1;
+       }
+       case Tru64::GSI_CPUS_IN_BOX: {
+           TypedBufferArg<uint32_t> cpus_in_box(xc->getSyscallArg(1));
+           *cpus_in_box = htog((uint32_t)process->numCpus());
 -          physmem.copyOut(xc->mem);
++          cpus_in_box.copyOut(xc->getMemPtr());
+           return 1;
+       }
+       case Tru64::GSI_PHYSMEM: {
+           TypedBufferArg<uint64_t> physmem(xc->getSyscallArg(1));
+           *physmem = htog((uint64_t)1024 * 1024);     // physical memory in KB
 -          infop.copyOut(xc->mem);
++          physmem.copyOut(xc->getMemPtr());
+           return 1;
+       }
+       case Tru64::GSI_CPU_INFO: {
+           TypedBufferArg<Tru64::cpu_info> infop(xc->getSyscallArg(1));
+           infop->current_cpu = htog(0);
+           infop->cpus_in_box = htog(process->numCpus());
+           infop->cpu_type = htog(57);
+           infop->ncpus = htog(process->numCpus());
+           uint64_t cpumask = (1 << process->numCpus()) - 1;
+           infop->cpus_present = infop->cpus_running = htog(cpumask);
+           infop->cpu_binding = htog(0);
+           infop->cpu_ex_binding = htog(0);
+           infop->mhz = htog(667);
 -          proc_type.copyOut(xc->mem);
++          infop.copyOut(xc->getMemPtr());
+           return 1;
+       }
+       case Tru64::GSI_PROC_TYPE: {
+           TypedBufferArg<uint64_t> proc_type(xc->getSyscallArg(1));
+           *proc_type = htog((uint64_t)11);
 -          bufArg.copyOut(xc->mem);
++          proc_type.copyOut(xc->getMemPtr());
+           return 1;
+       }
+       case Tru64::GSI_PLATFORM_NAME: {
+           BufferArg bufArg(xc->getSyscallArg(1), nbytes);
+           strncpy((char *)bufArg.bufferPtr(),
+                   "COMPAQ Professional Workstation XP1000",
+                   nbytes);
 -          clk_hz.copyOut(xc->mem);
++          bufArg.copyOut(xc->getMemPtr());
+           return 1;
+       }
+       case Tru64::GSI_CLK_TCK: {
+           TypedBufferArg<uint64_t> clk_hz(xc->getSyscallArg(1));
+           *clk_hz = htog((uint64_t)1024);
++          clk_hz.copyOut(xc->getMemPtr());
+           return 1;
+       }
+       default:
+         warn("getsysinfo: unknown op %d\n", op);
+         break;
+     }
+     return 0;
+ }
+ /// Target setsysyinfo() handler.
+ static SyscallReturn
+ setsysinfoFunc(SyscallDesc *desc, int callnum, Process *process,
+                ExecContext *xc)
+ {
+     unsigned op = xc->getSyscallArg(0);
+     switch (op) {
+       case Tru64::SSI_IEEE_FP_CONTROL:
+         warn("setsysinfo: ignoring ieee_set_fp_control() arg 0x%x\n",
+              xc->getSyscallArg(1));
+         break;
+       default:
+         warn("setsysinfo: unknown op %d\n", op);
+         break;
+     }
+     return 0;
+ }
+ SyscallDesc AlphaTru64Process::syscallDescs[] = {
+     /* 0 */ SyscallDesc("syscall (#0)", Tru64::indirectSyscallFunc,
+                         SyscallDesc::SuppressReturnValue),
+     /* 1 */ SyscallDesc("exit", exitFunc),
+     /* 2 */ SyscallDesc("fork", unimplementedFunc),
+     /* 3 */ SyscallDesc("read", readFunc),
+     /* 4 */ SyscallDesc("write", writeFunc),
+     /* 5 */ SyscallDesc("old_open", unimplementedFunc),
+     /* 6 */ SyscallDesc("close", closeFunc),
+     /* 7 */ SyscallDesc("wait4", unimplementedFunc),
+     /* 8 */ SyscallDesc("old_creat", unimplementedFunc),
+     /* 9 */ SyscallDesc("link", unimplementedFunc),
+     /* 10 */ SyscallDesc("unlink", unlinkFunc),
+     /* 11 */ SyscallDesc("execv", unimplementedFunc),
+     /* 12 */ SyscallDesc("chdir", unimplementedFunc),
+     /* 13 */ SyscallDesc("fchdir", unimplementedFunc),
+     /* 14 */ SyscallDesc("mknod", unimplementedFunc),
+     /* 15 */ SyscallDesc("chmod", unimplementedFunc),
+     /* 16 */ SyscallDesc("chown", unimplementedFunc),
+     /* 17 */ SyscallDesc("obreak", obreakFunc),
+     /* 18 */ SyscallDesc("pre_F64_getfsstat", unimplementedFunc),
+     /* 19 */ SyscallDesc("lseek", lseekFunc),
+     /* 20 */ SyscallDesc("getpid", getpidFunc),
+     /* 21 */ SyscallDesc("mount", unimplementedFunc),
+     /* 22 */ SyscallDesc("unmount", unimplementedFunc),
+     /* 23 */ SyscallDesc("setuid", setuidFunc),
+     /* 24 */ SyscallDesc("getuid", getuidFunc),
+     /* 25 */ SyscallDesc("exec_with_loader", unimplementedFunc),
+     /* 26 */ SyscallDesc("ptrace", unimplementedFunc),
+     /* 27 */ SyscallDesc("recvmsg", unimplementedFunc),
+     /* 28 */ SyscallDesc("sendmsg", unimplementedFunc),
+     /* 29 */ SyscallDesc("recvfrom", unimplementedFunc),
+     /* 30 */ SyscallDesc("accept", unimplementedFunc),
+     /* 31 */ SyscallDesc("getpeername", unimplementedFunc),
+     /* 32 */ SyscallDesc("getsockname", unimplementedFunc),
+     /* 33 */ SyscallDesc("access", unimplementedFunc),
+     /* 34 */ SyscallDesc("chflags", unimplementedFunc),
+     /* 35 */ SyscallDesc("fchflags", unimplementedFunc),
+     /* 36 */ SyscallDesc("sync", unimplementedFunc),
+     /* 37 */ SyscallDesc("kill", unimplementedFunc),
+     /* 38 */ SyscallDesc("old_stat", unimplementedFunc),
+     /* 39 */ SyscallDesc("setpgid", unimplementedFunc),
+     /* 40 */ SyscallDesc("old_lstat", unimplementedFunc),
+     /* 41 */ SyscallDesc("dup", unimplementedFunc),
+     /* 42 */ SyscallDesc("pipe", unimplementedFunc),
+     /* 43 */ SyscallDesc("set_program_attributes", unimplementedFunc),
+     /* 44 */ SyscallDesc("profil", unimplementedFunc),
+     /* 45 */ SyscallDesc("open", openFunc<Tru64>),
+     /* 46 */ SyscallDesc("obsolete osigaction", unimplementedFunc),
+     /* 47 */ SyscallDesc("getgid", getgidFunc),
+     /* 48 */ SyscallDesc("sigprocmask", ignoreFunc),
+     /* 49 */ SyscallDesc("getlogin", unimplementedFunc),
+     /* 50 */ SyscallDesc("setlogin", unimplementedFunc),
+     /* 51 */ SyscallDesc("acct", unimplementedFunc),
+     /* 52 */ SyscallDesc("sigpending", unimplementedFunc),
+     /* 53 */ SyscallDesc("classcntl", unimplementedFunc),
+     /* 54 */ SyscallDesc("ioctl", ioctlFunc<Tru64>),
+     /* 55 */ SyscallDesc("reboot", unimplementedFunc),
+     /* 56 */ SyscallDesc("revoke", unimplementedFunc),
+     /* 57 */ SyscallDesc("symlink", unimplementedFunc),
+     /* 58 */ SyscallDesc("readlink", unimplementedFunc),
+     /* 59 */ SyscallDesc("execve", unimplementedFunc),
+     /* 60 */ SyscallDesc("umask", unimplementedFunc),
+     /* 61 */ SyscallDesc("chroot", unimplementedFunc),
+     /* 62 */ SyscallDesc("old_fstat", unimplementedFunc),
+     /* 63 */ SyscallDesc("getpgrp", unimplementedFunc),
+     /* 64 */ SyscallDesc("getpagesize", getpagesizeFunc),
+     /* 65 */ SyscallDesc("mremap", unimplementedFunc),
+     /* 66 */ SyscallDesc("vfork", unimplementedFunc),
+     /* 67 */ SyscallDesc("pre_F64_stat", statFunc<Tru64::PreF64>),
+     /* 68 */ SyscallDesc("pre_F64_lstat", lstatFunc<Tru64::PreF64>),
+     /* 69 */ SyscallDesc("sbrk", unimplementedFunc),
+     /* 70 */ SyscallDesc("sstk", unimplementedFunc),
+     /* 71 */ SyscallDesc("mmap", mmapFunc<Tru64>),
+     /* 72 */ SyscallDesc("ovadvise", unimplementedFunc),
+     /* 73 */ SyscallDesc("munmap", munmapFunc),
+     /* 74 */ SyscallDesc("mprotect", ignoreFunc),
+     /* 75 */ SyscallDesc("madvise", unimplementedFunc),
+     /* 76 */ SyscallDesc("old_vhangup", unimplementedFunc),
+     /* 77 */ SyscallDesc("kmodcall", unimplementedFunc),
+     /* 78 */ SyscallDesc("mincore", unimplementedFunc),
+     /* 79 */ SyscallDesc("getgroups", unimplementedFunc),
+     /* 80 */ SyscallDesc("setgroups", unimplementedFunc),
+     /* 81 */ SyscallDesc("old_getpgrp", unimplementedFunc),
+     /* 82 */ SyscallDesc("setpgrp", unimplementedFunc),
+     /* 83 */ SyscallDesc("setitimer", unimplementedFunc),
+     /* 84 */ SyscallDesc("old_wait", unimplementedFunc),
+     /* 85 */ SyscallDesc("table", Tru64::tableFunc),
+     /* 86 */ SyscallDesc("getitimer", unimplementedFunc),
+     /* 87 */ SyscallDesc("gethostname", gethostnameFunc),
+     /* 88 */ SyscallDesc("sethostname", unimplementedFunc),
+     /* 89 */ SyscallDesc("getdtablesize", unimplementedFunc),
+     /* 90 */ SyscallDesc("dup2", unimplementedFunc),
+     /* 91 */ SyscallDesc("pre_F64_fstat", fstatFunc<Tru64::PreF64>),
+     /* 92 */ SyscallDesc("fcntl", fcntlFunc),
+     /* 93 */ SyscallDesc("select", unimplementedFunc),
+     /* 94 */ SyscallDesc("poll", unimplementedFunc),
+     /* 95 */ SyscallDesc("fsync", unimplementedFunc),
+     /* 96 */ SyscallDesc("setpriority", unimplementedFunc),
+     /* 97 */ SyscallDesc("socket", unimplementedFunc),
+     /* 98 */ SyscallDesc("connect", unimplementedFunc),
+     /* 99 */ SyscallDesc("old_accept", unimplementedFunc),
+     /* 100 */ SyscallDesc("getpriority", unimplementedFunc),
+     /* 101 */ SyscallDesc("old_send", unimplementedFunc),
+     /* 102 */ SyscallDesc("old_recv", unimplementedFunc),
+     /* 103 */ SyscallDesc("sigreturn", Tru64::sigreturnFunc,
+                           SyscallDesc::SuppressReturnValue),
+     /* 104 */ SyscallDesc("bind", unimplementedFunc),
+     /* 105 */ SyscallDesc("setsockopt", unimplementedFunc),
+     /* 106 */ SyscallDesc("listen", unimplementedFunc),
+     /* 107 */ SyscallDesc("plock", unimplementedFunc),
+     /* 108 */ SyscallDesc("old_sigvec", unimplementedFunc),
+     /* 109 */ SyscallDesc("old_sigblock", unimplementedFunc),
+     /* 110 */ SyscallDesc("old_sigsetmask", unimplementedFunc),
+     /* 111 */ SyscallDesc("sigsuspend", unimplementedFunc),
+     /* 112 */ SyscallDesc("sigstack", ignoreFunc),
+     /* 113 */ SyscallDesc("old_recvmsg", unimplementedFunc),
+     /* 114 */ SyscallDesc("old_sendmsg", unimplementedFunc),
+     /* 115 */ SyscallDesc("obsolete vtrace", unimplementedFunc),
+     /* 116 */ SyscallDesc("gettimeofday", gettimeofdayFunc<Tru64>),
+     /* 117 */ SyscallDesc("getrusage", getrusageFunc<Tru64>),
+     /* 118 */ SyscallDesc("getsockopt", unimplementedFunc),
+     /* 119 */ SyscallDesc("numa_syscalls", unimplementedFunc),
+     /* 120 */ SyscallDesc("readv", unimplementedFunc),
+     /* 121 */ SyscallDesc("writev", unimplementedFunc),
+     /* 122 */ SyscallDesc("settimeofday", unimplementedFunc),
+     /* 123 */ SyscallDesc("fchown", unimplementedFunc),
+     /* 124 */ SyscallDesc("fchmod", unimplementedFunc),
+     /* 125 */ SyscallDesc("old_recvfrom", unimplementedFunc),
+     /* 126 */ SyscallDesc("setreuid", unimplementedFunc),
+     /* 127 */ SyscallDesc("setregid", unimplementedFunc),
+     /* 128 */ SyscallDesc("rename", renameFunc),
+     /* 129 */ SyscallDesc("truncate", truncateFunc),
+     /* 130 */ SyscallDesc("ftruncate", ftruncateFunc),
+     /* 131 */ SyscallDesc("flock", unimplementedFunc),
+     /* 132 */ SyscallDesc("setgid", 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("obsolete 4.2 sigreturn", unimplementedFunc),
+     /* 140 */ SyscallDesc("adjtime", unimplementedFunc),
+     /* 141 */ SyscallDesc("old_getpeername", unimplementedFunc),
+     /* 142 */ SyscallDesc("gethostid", unimplementedFunc),
+     /* 143 */ SyscallDesc("sethostid", unimplementedFunc),
+     /* 144 */ SyscallDesc("getrlimit", getrlimitFunc<Tru64>),
+     /* 145 */ SyscallDesc("setrlimit", ignoreFunc),
+     /* 146 */ SyscallDesc("old_killpg", unimplementedFunc),
+     /* 147 */ SyscallDesc("setsid", unimplementedFunc),
+     /* 148 */ SyscallDesc("quotactl", unimplementedFunc),
+     /* 149 */ SyscallDesc("oldquota", unimplementedFunc),
+     /* 150 */ SyscallDesc("old_getsockname", unimplementedFunc),
+     /* 151 */ SyscallDesc("pread", unimplementedFunc),
+     /* 152 */ SyscallDesc("pwrite", unimplementedFunc),
+     /* 153 */ SyscallDesc("pid_block", unimplementedFunc),
+     /* 154 */ SyscallDesc("pid_unblock", unimplementedFunc),
+     /* 155 */ SyscallDesc("signal_urti", unimplementedFunc),
+     /* 156 */ SyscallDesc("sigaction", ignoreFunc),
+     /* 157 */ SyscallDesc("sigwaitprim", unimplementedFunc),
+     /* 158 */ SyscallDesc("nfssvc", unimplementedFunc),
+     /* 159 */ SyscallDesc("getdirentries", Tru64::getdirentriesFunc),
+     /* 160 */ SyscallDesc("pre_F64_statfs", statfsFunc<Tru64::PreF64>),
+     /* 161 */ SyscallDesc("pre_F64_fstatfs", fstatfsFunc<Tru64::PreF64>),
+     /* 162 */ SyscallDesc("unknown #162", unimplementedFunc),
+     /* 163 */ SyscallDesc("async_daemon", unimplementedFunc),
+     /* 164 */ SyscallDesc("getfh", unimplementedFunc),
+     /* 165 */ SyscallDesc("getdomainname", unimplementedFunc),
+     /* 166 */ SyscallDesc("setdomainname", unimplementedFunc),
+     /* 167 */ SyscallDesc("unknown #167", unimplementedFunc),
+     /* 168 */ SyscallDesc("unknown #168", unimplementedFunc),
+     /* 169 */ SyscallDesc("exportfs", unimplementedFunc),
+     /* 170 */ SyscallDesc("unknown #170", unimplementedFunc),
+     /* 171 */ SyscallDesc("unknown #171", unimplementedFunc),
+     /* 172 */ SyscallDesc("unknown #172", unimplementedFunc),
+     /* 173 */ SyscallDesc("unknown #173", unimplementedFunc),
+     /* 174 */ SyscallDesc("unknown #174", unimplementedFunc),
+     /* 175 */ SyscallDesc("unknown #175", unimplementedFunc),
+     /* 176 */ SyscallDesc("unknown #176", unimplementedFunc),
+     /* 177 */ SyscallDesc("unknown #177", unimplementedFunc),
+     /* 178 */ SyscallDesc("unknown #178", unimplementedFunc),
+     /* 179 */ SyscallDesc("unknown #179", unimplementedFunc),
+     /* 180 */ SyscallDesc("unknown #180", unimplementedFunc),
+     /* 181 */ SyscallDesc("alt_plock", unimplementedFunc),
+     /* 182 */ SyscallDesc("unknown #182", unimplementedFunc),
+     /* 183 */ SyscallDesc("unknown #183", unimplementedFunc),
+     /* 184 */ SyscallDesc("getmnt", unimplementedFunc),
+     /* 185 */ SyscallDesc("unknown #185", unimplementedFunc),
+     /* 186 */ SyscallDesc("unknown #186", unimplementedFunc),
+     /* 187 */ SyscallDesc("alt_sigpending", unimplementedFunc),
+     /* 188 */ SyscallDesc("alt_setsid", unimplementedFunc),
+     /* 189 */ SyscallDesc("unknown #189", unimplementedFunc),
+     /* 190 */ SyscallDesc("unknown #190", unimplementedFunc),
+     /* 191 */ SyscallDesc("unknown #191", unimplementedFunc),
+     /* 192 */ SyscallDesc("unknown #192", unimplementedFunc),
+     /* 193 */ SyscallDesc("unknown #193", unimplementedFunc),
+     /* 194 */ SyscallDesc("unknown #194", unimplementedFunc),
+     /* 195 */ SyscallDesc("unknown #195", unimplementedFunc),
+     /* 196 */ SyscallDesc("unknown #196", unimplementedFunc),
+     /* 197 */ SyscallDesc("unknown #197", unimplementedFunc),
+     /* 198 */ SyscallDesc("unknown #198", unimplementedFunc),
+     /* 199 */ SyscallDesc("swapon", unimplementedFunc),
+     /* 200 */ SyscallDesc("msgctl", unimplementedFunc),
+     /* 201 */ SyscallDesc("msgget", unimplementedFunc),
+     /* 202 */ SyscallDesc("msgrcv", unimplementedFunc),
+     /* 203 */ SyscallDesc("msgsnd", unimplementedFunc),
+     /* 204 */ SyscallDesc("semctl", unimplementedFunc),
+     /* 205 */ SyscallDesc("semget", unimplementedFunc),
+     /* 206 */ SyscallDesc("semop", unimplementedFunc),
+     /* 207 */ SyscallDesc("uname", unameFunc),
+     /* 208 */ SyscallDesc("lchown", unimplementedFunc),
+     /* 209 */ SyscallDesc("shmat", unimplementedFunc),
+     /* 210 */ SyscallDesc("shmctl", unimplementedFunc),
+     /* 211 */ SyscallDesc("shmdt", unimplementedFunc),
+     /* 212 */ SyscallDesc("shmget", unimplementedFunc),
+     /* 213 */ SyscallDesc("mvalid", unimplementedFunc),
+     /* 214 */ SyscallDesc("getaddressconf", unimplementedFunc),
+     /* 215 */ SyscallDesc("msleep", unimplementedFunc),
+     /* 216 */ SyscallDesc("mwakeup", unimplementedFunc),
+     /* 217 */ SyscallDesc("msync", unimplementedFunc),
+     /* 218 */ SyscallDesc("signal", unimplementedFunc),
+     /* 219 */ SyscallDesc("utc_gettime", unimplementedFunc),
+     /* 220 */ SyscallDesc("utc_adjtime", unimplementedFunc),
+     /* 221 */ SyscallDesc("unknown #221", unimplementedFunc),
+     /* 222 */ SyscallDesc("security", unimplementedFunc),
+     /* 223 */ SyscallDesc("kloadcall", unimplementedFunc),
+     /* 224 */ SyscallDesc("stat", statFunc<Tru64::F64>),
+     /* 225 */ SyscallDesc("lstat", lstatFunc<Tru64::F64>),
+     /* 226 */ SyscallDesc("fstat", fstatFunc<Tru64::F64>),
+     /* 227 */ SyscallDesc("statfs", statfsFunc<Tru64::F64>),
+     /* 228 */ SyscallDesc("fstatfs", fstatfsFunc<Tru64::F64>),
+     /* 229 */ SyscallDesc("getfsstat", unimplementedFunc),
+     /* 230 */ SyscallDesc("gettimeofday64", unimplementedFunc),
+     /* 231 */ SyscallDesc("settimeofday64", unimplementedFunc),
+     /* 232 */ SyscallDesc("unknown #232", unimplementedFunc),
+     /* 233 */ SyscallDesc("getpgid", unimplementedFunc),
+     /* 234 */ SyscallDesc("getsid", unimplementedFunc),
+     /* 235 */ SyscallDesc("sigaltstack", ignoreFunc),
+     /* 236 */ SyscallDesc("waitid", unimplementedFunc),
+     /* 237 */ SyscallDesc("priocntlset", unimplementedFunc),
+     /* 238 */ SyscallDesc("sigsendset", unimplementedFunc),
+     /* 239 */ SyscallDesc("set_speculative", unimplementedFunc),
+     /* 240 */ SyscallDesc("msfs_syscall", unimplementedFunc),
+     /* 241 */ SyscallDesc("sysinfo", unimplementedFunc),
+     /* 242 */ SyscallDesc("uadmin", unimplementedFunc),
+     /* 243 */ SyscallDesc("fuser", unimplementedFunc),
+     /* 244 */ SyscallDesc("proplist_syscall", unimplementedFunc),
+     /* 245 */ SyscallDesc("ntp_adjtime", unimplementedFunc),
+     /* 246 */ SyscallDesc("ntp_gettime", unimplementedFunc),
+     /* 247 */ SyscallDesc("pathconf", unimplementedFunc),
+     /* 248 */ SyscallDesc("fpathconf", unimplementedFunc),
+     /* 249 */ SyscallDesc("sync2", unimplementedFunc),
+     /* 250 */ SyscallDesc("uswitch", unimplementedFunc),
+     /* 251 */ SyscallDesc("usleep_thread", unimplementedFunc),
+     /* 252 */ SyscallDesc("audcntl", unimplementedFunc),
+     /* 253 */ SyscallDesc("audgen", unimplementedFunc),
+     /* 254 */ SyscallDesc("sysfs", unimplementedFunc),
+     /* 255 */ SyscallDesc("subsys_info", unimplementedFunc),
+     /* 256 */ SyscallDesc("getsysinfo", getsysinfoFunc),
+     /* 257 */ SyscallDesc("setsysinfo", setsysinfoFunc),
+     /* 258 */ SyscallDesc("afs_syscall", unimplementedFunc),
+     /* 259 */ SyscallDesc("swapctl", unimplementedFunc),
+     /* 260 */ SyscallDesc("memcntl", unimplementedFunc),
+     /* 261 */ SyscallDesc("fdatasync", unimplementedFunc),
+     /* 262 */ SyscallDesc("oflock", unimplementedFunc),
+     /* 263 */ SyscallDesc("F64_readv", unimplementedFunc),
+     /* 264 */ SyscallDesc("F64_writev", unimplementedFunc),
+     /* 265 */ SyscallDesc("cdslxlate", unimplementedFunc),
+     /* 266 */ SyscallDesc("sendfile", unimplementedFunc),
+ };
+ SyscallDesc AlphaTru64Process::machSyscallDescs[] = {
+     /* 0 */  SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 1 */  SyscallDesc("m5_mutex_lock", Tru64::m5_mutex_lockFunc),
+     /* 2 */  SyscallDesc("m5_mutex_trylock", Tru64::m5_mutex_trylockFunc),
+     /* 3 */  SyscallDesc("m5_mutex_unlock", Tru64::m5_mutex_unlockFunc),
+     /* 4 */  SyscallDesc("m5_cond_signal", Tru64::m5_cond_signalFunc),
+     /* 5 */  SyscallDesc("m5_cond_broadcast", Tru64::m5_cond_broadcastFunc),
+     /* 6 */  SyscallDesc("m5_cond_wait", Tru64::m5_cond_waitFunc),
+     /* 7 */  SyscallDesc("m5_thread_exit", Tru64::m5_thread_exitFunc),
+     /* 8 */  SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 9 */  SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 10 */ SyscallDesc("task_self", unimplementedFunc),
+     /* 11 */ SyscallDesc("thread_reply", unimplementedFunc),
+     /* 12 */ SyscallDesc("task_notify", unimplementedFunc),
+     /* 13 */ SyscallDesc("thread_self", unimplementedFunc),
+     /* 14 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 15 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 16 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 17 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 18 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 19 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 20 */ SyscallDesc("msg_send_trap", unimplementedFunc),
+     /* 21 */ SyscallDesc("msg_receive_trap", unimplementedFunc),
+     /* 22 */ SyscallDesc("msg_rpc_trap", unimplementedFunc),
+     /* 23 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 24 */ SyscallDesc("nxm_block", Tru64::nxm_blockFunc),
+     /* 25 */ SyscallDesc("nxm_unblock", Tru64::nxm_unblockFunc),
+     /* 26 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 27 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 28 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 29 */ SyscallDesc("nxm_thread_destroy", unimplementedFunc),
+     /* 30 */ SyscallDesc("lw_wire", unimplementedFunc),
+     /* 31 */ SyscallDesc("lw_unwire", unimplementedFunc),
+     /* 32 */ SyscallDesc("nxm_thread_create", Tru64::nxm_thread_createFunc),
+     /* 33 */ SyscallDesc("nxm_task_init", Tru64::nxm_task_initFunc),
+     /* 34 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 35 */ SyscallDesc("nxm_idle", Tru64::nxm_idleFunc),
+     /* 36 */ SyscallDesc("nxm_wakeup_idle", unimplementedFunc),
+     /* 37 */ SyscallDesc("nxm_set_pthid", unimplementedFunc),
+     /* 38 */ SyscallDesc("nxm_thread_kill", unimplementedFunc),
+     /* 39 */ SyscallDesc("nxm_thread_block", Tru64::nxm_thread_blockFunc),
+     /* 40 */ SyscallDesc("nxm_thread_wakeup", unimplementedFunc),
+     /* 41 */ SyscallDesc("init_process", unimplementedFunc),
+     /* 42 */ SyscallDesc("nxm_get_binding", unimplementedFunc),
+     /* 43 */ SyscallDesc("map_fd", unimplementedFunc),
+     /* 44 */ SyscallDesc("nxm_resched", unimplementedFunc),
+     /* 45 */ SyscallDesc("nxm_set_cancel", unimplementedFunc),
+     /* 46 */ SyscallDesc("nxm_set_binding", unimplementedFunc),
+     /* 47 */ SyscallDesc("stack_create", Tru64::stack_createFunc),
+     /* 48 */ SyscallDesc("nxm_get_state", unimplementedFunc),
+     /* 49 */ SyscallDesc("nxm_thread_suspend", unimplementedFunc),
+     /* 50 */ SyscallDesc("nxm_thread_resume", unimplementedFunc),
+     /* 51 */ SyscallDesc("nxm_signal_check", unimplementedFunc),
+     /* 52 */ SyscallDesc("htg_unix_syscall", unimplementedFunc),
+     /* 53 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 54 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 55 */ SyscallDesc("host_self", unimplementedFunc),
+     /* 56 */ SyscallDesc("host_priv_self", unimplementedFunc),
+     /* 57 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 58 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 59 */ SyscallDesc("swtch_pri", Tru64::swtch_priFunc),
+     /* 60 */ SyscallDesc("swtch", unimplementedFunc),
+     /* 61 */ SyscallDesc("thread_switch", unimplementedFunc),
+     /* 62 */ SyscallDesc("semop_fast", unimplementedFunc),
+     /* 63 */ SyscallDesc("nxm_pshared_init", unimplementedFunc),
+     /* 64 */ SyscallDesc("nxm_pshared_block", unimplementedFunc),
+     /* 65 */ SyscallDesc("nxm_pshared_unblock", unimplementedFunc),
+     /* 66 */ SyscallDesc("nxm_pshared_destroy", unimplementedFunc),
+     /* 67 */ SyscallDesc("nxm_swtch_pri", Tru64::swtch_priFunc),
+     /* 68 */ SyscallDesc("lw_syscall", unimplementedFunc),
+     /* 69 */ SyscallDesc("kern_invalid", unimplementedFunc),
+     /* 70 */ SyscallDesc("mach_sctimes_0", unimplementedFunc),
+     /* 71 */ SyscallDesc("mach_sctimes_1", unimplementedFunc),
+     /* 72 */ SyscallDesc("mach_sctimes_2", unimplementedFunc),
+     /* 73 */ SyscallDesc("mach_sctimes_3", unimplementedFunc),
+     /* 74 */ SyscallDesc("mach_sctimes_4", unimplementedFunc),
+     /* 75 */ SyscallDesc("mach_sctimes_5", unimplementedFunc),
+     /* 76 */ SyscallDesc("mach_sctimes_6", unimplementedFunc),
+     /* 77 */ SyscallDesc("mach_sctimes_7", unimplementedFunc),
+     /* 78 */ SyscallDesc("mach_sctimes_8", unimplementedFunc),
+     /* 79 */ SyscallDesc("mach_sctimes_9", unimplementedFunc),
+     /* 80 */ SyscallDesc("mach_sctimes_10", unimplementedFunc),
+     /* 81 */ SyscallDesc("mach_sctimes_11", unimplementedFunc),
+     /* 82 */ SyscallDesc("mach_sctimes_port_alloc_dealloc", unimplementedFunc)
+ };
+ SyscallDesc*
+ AlphaTru64Process::getDesc(int callnum)
+ {
+     if (callnum < -Num_Mach_Syscall_Descs || callnum > Num_Syscall_Descs)
+         return NULL;
+     if (callnum < 0)
+         return &machSyscallDescs[-callnum];
+     else
+         return &syscallDescs[callnum];
+ }
+ AlphaTru64Process::AlphaTru64Process(const std::string &name,
+                                      ObjectFile *objFile,
+                                      int stdin_fd,
+                                      int stdout_fd,
+                                      int stderr_fd,
+                                      std::vector<std::string> &argv,
+                                      std::vector<std::string> &envp)
+     : LiveProcess(name, objFile, stdin_fd, stdout_fd, stderr_fd, argv, envp),
+       Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)),
+       Num_Mach_Syscall_Descs(sizeof(machSyscallDescs) / sizeof(SyscallDesc))
+ {
+ }
Simple merge
index c0a7fb8585cd3101f224724a3cb6807c7b481a71,830bfe09db91c2f2b2dfda11eaa8b7fef205849c..16ec721d03b62c929fa9a43bab1e89fb879b6625
@@@ -175,17 -176,12 +175,12 @@@ class Statistics : public Serializabl
      void ivlb() { _ivlb++; }
      void ivle() { _ivle++; }
      void hwrei() { _hwrei++; }
-     void fault(Fault fault)
-     {
-             if(fault != NoFault)
-                 fault->stat()++;
-     }// FIXME: When there are no generic system fault objects, this will go back to _faults[fault]++; }
      void swpipl(int ipl);
 -    void mode(cpu_mode newmode);
 -    void context(Addr oldpcbb, Addr newpcbb);
 -    void callpal(int code);
 +    void mode(cpu_mode newmode, ExecContext *xc);
 +    void context(Addr oldpcbb, Addr newpcbb, ExecContext *xc);
 +    void callpal(int code, ExecContext *xc);
  
 -    void setIdleProcess(Addr idle);
 +    void setIdleProcess(Addr idle, ExecContext *xc);
  
    public:
      virtual void serialize(std::ostream &os);