Merge zizzer:/bk/multiarch

into  zeep.eecs.umich.edu:/z/saidi/work/m5.ma2

arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/sparc/isa_traits.hh:
arch/sparc/linux/process.cc:
sim/process.cc:
    merge

--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : fea0155c8e23abbd0d5d5251abbd0f4d223fe935

diff --cc arch/alpha/isa_traits.hh
index 3cd6868b82643b92bef169235c9e7eb6c2ffaecb,1984739184297287dd0d8ef1ceb2801edec9e1e2..6f6b11e62cc362a48ab4790e4a59b939001da757
--- 1/arch/alpha/isa_traits.hh
--- 2/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@@ -60,45 -98,57 +98,49 @@@ namespace AlphaIS
      typedef uint64_t ExtMachInst;
      typedef uint8_t  RegIndex;
  
 -    enum {
 -        MemoryEnd = 0xffffffffffffffffULL,
 -
 -        NumIntArchRegs = 32,
 -        NumPALShadowRegs = 8,
 -        NumFloatArchRegs = 32,
 -        // @todo: Figure out what this number really should be.
 -        NumMiscArchRegs = 32,
 -
 -        MaxRegsOfAnyType = 32,
 -        // Static instruction parameters
 -        MaxInstSrcRegs = 3,
 -        MaxInstDestRegs = 2,
 -
 -        // semantically meaningful register indices
 -        ZeroReg = 31, // architecturally meaningful
 -        // the rest of these depend on the ABI
 -        StackPointerReg = 30,
 -        GlobalPointerReg = 29,
 -        ProcedureValueReg = 27,
 -        ReturnAddressReg = 26,
 -        ReturnValueReg = 0,
 -        SyscallNumReg = 0,
 -        FramePointerReg = 15,
 -        ArgumentReg0 = 16,
 -        ArgumentReg1 = 17,
 -        ArgumentReg2 = 18,
 -        ArgumentReg3 = 19,
 -        ArgumentReg4 = 20,
 -        ArgumentReg5 = 21,
 -        SyscallSuccessReg = 19,
 -        // Some OS use a second register (o1) to return a second value
 -        // for some syscalls
 -        SyscallPseudoReturnReg = ArgumentReg4,
 -
 -        LogVMPageSize = 13,   // 8K bytes
 -        VMPageSize = (1 << LogVMPageSize),
 -
 -        BranchPredAddrShiftAmt = 2, // instructions are 4-byte aligned
 -
 -        WordBytes = 4,
 -        HalfwordBytes = 2,
 -        ByteBytes = 1,
 -        DepNA = 0,
 -    };
 -
 -    enum {
 -        NumIntRegs = NumIntArchRegs + NumPALShadowRegs,
 -        NumFloatRegs = NumFloatArchRegs,
 -        NumMiscRegs = NumMiscArchRegs
 -    };
 +    const int NumIntArchRegs = 32;
 +    const int NumPALShadowRegs = 8;
 +    const int NumFloatArchRegs = 32;
 +    // @todo: Figure out what this number really should be.
 +    const int NumMiscArchRegs = 32;
 +
 +    // Static instruction parameters
 +    const int MaxInstSrcRegs = 3;
 +    const int MaxInstDestRegs = 2;
 +
 +    // semantically meaningful register indices
 +    const int ZeroReg = 31;   // architecturally meaningful
 +    // the rest of these depend on the ABI
 +    const int StackPointerReg = 30;
 +    const int GlobalPointerReg = 29;
 +    const int ProcedureValueReg = 27;
 +    const int ReturnAddressReg = 26;
 +    const int ReturnValueReg = 0;
 +    const int FramePointerReg = 15;
 +    const int ArgumentReg0 = 16;
 +    const int ArgumentReg1 = 17;
 +    const int ArgumentReg2 = 18;
 +    const int ArgumentReg3 = 19;
 +    const int ArgumentReg4 = 20;
 +    const int ArgumentReg5 = 21;
++    const int SyscallNumReg = ReturnValueReg;
++    const int SyscallPseudoReturnReg = ArgumentReg4;
++
++
 +
 +    const int LogVMPageSize = 13;     // 8K bytes
 +    const int VMPageSize = (1 << LogVMPageSize);
 +
 +    const int BranchPredAddrShiftAmt = 2; // instructions are 4-byte aligned
 +
 +    const int WordBytes = 4;
 +    const int HalfwordBytes = 2;
 +    const int ByteBytes = 1;
 +
 +
 +    const int NumIntRegs = NumIntArchRegs + NumPALShadowRegs;
 +    const int NumFloatRegs = NumFloatArchRegs;
 +    const int NumMiscRegs = NumMiscArchRegs;
  
      // These enumerate all the registers for dependence tracking.
      enum DependenceTags {
@@@ -299,45 -346,54 +341,22 @@@ extern const int reg_redir[NumIntRegs]
      template <class XC>
      void zeroRegisters(XC *xc);
  
-     const Addr MaxAddr = (Addr)-1;
- };
- 
- #if !FULL_SYSTEM
- class SyscallReturn {
-         public:
-            template <class T>
-            SyscallReturn(T v, bool s)
-            {
-                retval = (uint64_t)v;
-                success = s;
-            }
- 
-            template <class T>
-            SyscallReturn(T v)
-            {
-                success = (v >= 0);
-                retval = (uint64_t)v;
-            }
- 
-            ~SyscallReturn() {}
- 
-            SyscallReturn& operator=(const SyscallReturn& s) {
-                retval = s.retval;
-                success = s.success;
-                return *this;
-            }
- 
-            bool successful() { return success; }
-            uint64_t value() { return retval; }
- 
- 
-        private:
-            uint64_t retval;
-            bool success;
- };
- 
- #endif
+     static inline void setSyscallReturn(SyscallReturn return_value, RegFile *regs)
+     {
+         // check for error condition.  Alpha syscall convention is to
+         // indicate success/failure in reg a3 (r19) and put the
+         // return value itself in the standard return value reg (v0).
+         if (return_value.successful()) {
+             // no error
+             regs->intRegFile[SyscallSuccessReg] = 0;
+             regs->intRegFile[ReturnValueReg] = return_value.value();
+         } else {
+             // got an error, return details
+             regs->intRegFile[SyscallSuccessReg] = (IntReg) -1;
+             regs->intRegFile[ReturnValueReg] = -return_value.value();
+         }
+     }
  
 -//typedef AlphaISA TheISA;
 -
 -//typedef TheISA::MachInst MachInst;
 -//typedef TheISA::Addr Addr;
 -//typedef TheISA::RegIndex RegIndex;
 -//typedef TheISA::IntReg IntReg;
 -//typedef TheISA::IntRegFile IntRegFile;
 -//typedef TheISA::FloatReg FloatReg;
 -//typedef TheISA::FloatRegFile FloatRegFile;
 -//typedef TheISA::MiscReg MiscReg;
 -//typedef TheISA::MiscRegFile MiscRegFile;
 -//typedef TheISA::AnyReg AnyReg;
 -//typedef TheISA::RegFile RegFile;
 -
 -//const int NumIntRegs   = TheISA::NumIntRegs;
 -//const int NumFloatRegs = TheISA::NumFloatRegs;
 -//const int NumMiscRegs  = TheISA::NumMiscRegs;
 -//const int TotalNumRegs = TheISA::TotalNumRegs;
 -//const int VMPageSize   = TheISA::VMPageSize;
 -//const int LogVMPageSize   = TheISA::LogVMPageSize;
 -//const int ZeroReg = TheISA::ZeroReg;
 -//const int StackPointerReg = TheISA::StackPointerReg;
 -//const int GlobalPointerReg = TheISA::GlobalPointerReg;
 -//const int ReturnAddressReg = TheISA::ReturnAddressReg;
 -//const int ReturnValueReg = TheISA::ReturnValueReg;
 -//const int ArgumentReg0 = TheISA::ArgumentReg0;
 -//const int ArgumentReg1 = TheISA::ArgumentReg1;
 -//const int ArgumentReg2 = TheISA::ArgumentReg2;
 -//const int BranchPredAddrShiftAmt = TheISA::BranchPredAddrShiftAmt;
 -const Addr MaxAddr = (Addr)-1;
 -};
 -
  static inline AlphaISA::ExtMachInst
  AlphaISA::makeExtMI(AlphaISA::MachInst inst, const uint64_t &pc) {
  #if FULL_SYSTEM

diff --cc arch/alpha/linux/process.cc
index c579c47d95fac2da244db50bb45d25db44b68255,2ebdbfc0f09bb596512ed9c4673eca8ff1fc2968..1c911bc5053b5327db44188e8be13f115df9e926
--- 1/arch/alpha/linux/process.cc
--- 2/arch/alpha/linux/process.cc
+++ b/arch/alpha/linux/process.cc
@@@ -41,31 -40,9 +40,8 @@@
  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.
-     xc->setIntReg(20, sim_fds[1]);
-     return sim_fds[0];
- }
  
  
 -
  /// Target uname() handler.
  static SyscallReturn
  unameFunc(SyscallDesc *desc, int callnum, Process *process,

diff --cc arch/alpha/tru64/process.cc
Simple merge

diff --cc arch/sparc/isa_traits.hh
index 1752ed1944a480e47b5bf7e9a51e8258f1436672,7f654e33b85e7eb8eff09207f5d896e9bb79d054..bd3c35beb7a9845d65f42516fabf28e243ef0f94
--- 1/arch/sparc/isa_traits.hh
--- 2/arch/sparc/isa_traits.hh
+++ b/arch/sparc/isa_traits.hh
@@@ -57,39 -57,42 +57,59 @@@ class StaticInstPtr
  namespace SparcISA
  {
      typedef uint32_t MachInst;
 -    typedef uint64_t Addr;
 +    typedef uint64_t ExtMachInst;
      typedef uint8_t  RegIndex;
  
 -    enum
 -    {
 -        MemoryEnd = 0xffffffffffffffffULL,
 -
 -        NumFloatRegs = 32,
 -        NumMiscRegs = 32,
 -
 -        MaxRegsOfAnyType = 32,
 -        // Static instruction parameters
 -        MaxInstSrcRegs = 3,
 -        MaxInstDestRegs = 2,
 -
 -        // Maximum trap level
 -        MaxTL = 4,
 -
 -        // semantically meaningful register indices
 -        ZeroReg = 0   // architecturally meaningful
 -        // the rest of these depend on the ABI
 -        SyscallNumReg = 1,
 -        ArgumentReg0 = 8,
 -        ArgumentReg1 = 9,
 -        ArgumentReg2 = 10,
 -        ArgumentReg3 = 11,
 -        ArgumentReg4 = 12,
 -        ArgumentReg5 = 13,
 -        StackPoniterReg = 14,
 -        ReturnAddressReg = 31, // Post Call, precall, 15
 -        ReturnValueReg = 8, // Post return, 24 is pre-return.
 -        // Some OS use a second register (o1) to return a second value
 -        // for some syscalls
 -        SyscallPseudoReturnReg = 9,
 -        FramePointerReg = 30
 -};
 +    const int NumFloatRegs = 32;
 +    const int NumMiscRegs = 32;
 +
-     const int MaxRegsOfAnyType = 32;
-     const int // Static instruction parameters
-     const int MaxInstSrcRegs = 3;
-     const int MaxInstDestRegs = 2;
- 
 +    const int // Maximum trap level
 +    const int MaxTL = 4;
 +    const int
 +    const int // semantically meaningful register indices
 +    const int ZeroReg = 0;    // architecturally meaningful
 +    const int // the rest of these depend on the ABI
 +    const int StackPointerReg = 14;
-     const int ReturnAddressReg = 31;
-     const int ReturnValueReg = 24;
++    const int ReturnAddressReg = 31; // post call, precall is 15
++    const int ReturnValueReg = 8; // Post return, 24 is pre-return.
 +    const int FramePointerReg = 30;
-     const int ArgumentReg0 = 24;
-     const int ArgumentReg1 = 25;
-     const int ArgumentReg2 = 26;
-     const int ArgumentReg3 = 27;
-     const int ArgumentReg4 = 28;
-     const int ArgumentReg5 = 29;
-     const int
-     const int //8K. This value is implmentation specific; and should probably
-     const int //be somewhere else.
++    const int ArgumentReg0 = 8;
++    const int ArgumentReg1 = 9;
++    const int ArgumentReg2 = 10;
++    const int ArgumentReg3 = 11;
++    const int ArgumentReg4 = 12;
++    const int ArgumentReg5 = 13;
++    // Some OS syscall sue a second register (o1) to return a second value
++    const int SyscallPseudoReturnReg = ArgumentReg1;
++
++
++    //8K. This value is implmentation specific; and should probably
++    //be somewhere else.
 +    const int LogVMPageSize = 13;
 +    const int VMPageSize = (1 << LogVMPageSize);
 +
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
      typedef uint64_t IntReg;
  
      class IntRegFile
@@@ -443,9 -468,31 +463,24 @@@
       * @param xc The execution context.
       */
      template <class XC>
-     void zeroRegisters(XC *xc);
 -    static void zeroRegisters(XC *xc);
+ 
+     static inline setSyscallReturn(SyscallReturn return_value, RegFile *regs)
+     {
+         // check for error condition.  SPARC syscall convention is to
+         // indicate success/failure in reg the carry bit of the ccr
+         // and put the return value itself in the standard return value reg ().
+         if (return_value.successful()) {
+             // no error
+             regs->miscRegFile.ccrFields.iccFields.c = 0;
+             regs->intRegFile[ReturnValueReg] = return_value.value();
+         } else {
+             // got an error, return details
+             regs->miscRegFile.ccrFields.iccFields.c = 1;
+             regs->intRegFile[ReturnValueReg] = -return_value.value();
+         }
+     }
  };
  
 -const int VMPageSize   = TheISA::VMPageSize;
 -const int LogVMPageSize   = TheISA::LogVMPageSize;
 -const int ZeroReg = TheISA::ZeroReg;
 -const int BranchPredAddrShiftAmt = TheISA::BranchPredAddrShiftAmt;
 -const int MaxAddr = (Addr)-1;
 -
  #if !FULL_SYSTEM
  class SyscallReturn
  {

diff --cc arch/sparc/linux/process.cc
index fab7a4db63f950233eec013c9075ee85d1777c27,456f99b32404356167d9fc916bbc7d42ac24793d..5965e6da92e715e601ba85d88dc536651cbea553
--- 1/arch/sparc/linux/process.cc
--- 2/arch/sparc/linux/process.cc
+++ b/arch/sparc/linux/process.cc
@@@ -83,348 -59,291 +59,290 @@@ unameFunc(SyscallDesc *desc, int callnu
      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.copyOut(xc->mem);
-           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->mem);
-           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 SparcLinuxProcess::syscallDescs[] = {
-     /*  0 */ SyscallDesc("restart_syscall", unimplementedFunc);
-     /*  1 */ SyscallDesc("exit", unimplementedFunc);
-     /*  2 */ SyscallDesc("fork", unimplementedFunc);
-     /*  3 */ SyscallDesc("read", unimplementedFunc);
-     /*  4 */ SyscallDesc("write", unimplementedFunc);
-     /*  5 */ SyscallDesc("open", unimplementedFunc);
-     /*  6 */ SyscallDesc("close", unimplementedFunc);
-     /*  7 */ SyscallDesc("wait4", unimplementedFunc);
-     /*  8 */ SyscallDesc("creat", unimplementedFunc);
-     /*  9 */ SyscallDesc("link", unimplementedFunc);
-     /* 10 */ SyscallDesc("unlink", unimplementedFunc);
-     /* 11 */ SyscallDesc("execv", unimplementedFunc);
-     /* 12 */ SyscallDesc("chdir", unimplementedFunc);
-     /* 13 */ SyscallDesc("chown", unimplementedFunc);
-     /* 14 */ SyscallDesc("mknod", unimplementedFunc);
-     /* 15 */ SyscallDesc("chmod", unimplementedFunc);
-     /* 16 */ SyscallDesc("lchown", unimplementedFunc);
-     /* 17 */ SyscallDesc("brk", unimplementedFunc);
-     /* 18 */ SyscallDesc("perfctr", unimplementedFunc);
-     /* 19 */ SyscallDesc("lseek", unimplementedFunc);
-     /* 20 */ SyscallDesc("getpid", unimplementedFunc);
-     /* 21 */ SyscallDesc("capget", unimplementedFunc);
-     /* 22 */ SyscallDesc("capset", unimplementedFunc);
-     /* 23 */ SyscallDesc("setuid", unimplementedFunc);
-     /* 24 */ SyscallDesc("getuid", unimplementedFunc);
-     /* 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", unimplementedFunc);
-     /* 43 */ SyscallDesc("times", unimplementedFunc);
-     /* 44 */ SyscallDesc("getuid32", unimplementedFunc);
-     /* 45 */ SyscallDesc("umount2", unimplementedFunc);
-     /* 46 */ SyscallDesc("setgid", unimplementedFunc);
-     /* 47 */ SyscallDesc("getgid", unimplementedFunc);
-     /* 48 */ SyscallDesc("signal", unimplementedFunc);
-     /* 49 */ SyscallDesc("geteuid", unimplementedFunc);
-     /* 50 */ SyscallDesc("getegid", unimplementedFunc);
-     /* 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", unimplementedFunc);
-     /* 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", unimplementedFunc);
-     /* 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", unimplemented);
-     /* 247 */ SyscallDesc("sched_get_priority_min", unimplemented);
-     /* 248 */ SyscallDesc("sched_rr_get_interval", unimplemented);
-     /* 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);
+     /*  0 */ SyscallDesc("restart_syscall", unimplimentedFunc);
+     /*  1 */ SyscallDesc("exit", exitFunc);
 -    /*  2 */ SyscallDesc("fork", unimplimentedFunc);
+     /*  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);
+     /* 10 */ SyscallDesc("unlink", unlinkFunc);
+     /* 11 */ SyscallDesc("execv", unimplimentedFunc);
+     /* 12 */ SyscallDesc("chdir", unimplimentedFunc);
+     /* 13 */ SyscallDesc("chown", chownFunc);
+     /* 14 */ SyscallDesc("mknod", unimplimentedFunc);
+     /* 15 */ SyscallDesc("chmod", chmodFunc<Linux>);
+     /* 16 */ SyscallDesc("lchown", unimplimentedFunc);
+     /* 17 */ SyscallDesc("brk", obreakFunc);
+     /* 18 */ SyscallDesc("perfctr", unimplimentedFunc);
+     /* 19 */ SyscallDesc("lseek", lseekFunc);
+     /* 20 */ SyscallDesc("getpid", getpidFunc);
+     /* 21 */ SyscallDesc("capget", unimplimentedFunc);
+     /* 22 */ SyscallDesc("capset", unimplimentedFunc);
+     /* 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);
+     /* 42 */ SyscallDesc("pipe", pipePseudoFunc);
+     /* 43 */ SyscallDesc("times", unimplimentedFunc);
+     /* 44 */ SyscallDesc("getuid32", unimplimentedFunc);
+     /* 45 */ SyscallDesc("umount2", unimplimentedFunc);
+     /* 46 */ SyscallDesc("setgid", unimplimentedFunc);
+     /* 47 */ SyscallDesc("getgid", getgidFunc);
+     /* 48 */ SyscallDesc("signal", unimplimentedFunc);
+     /* 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);
+     /* 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);
+     /* 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);
+     /* 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);
  };
  
  SparcLinuxProcess::SparcLinuxProcess(const std::string &name,

diff --cc cpu/cpu_exec_context.hh
index a5153e618e197381f874ab57d2988fba8f54a1dc,0000000000000000000000000000000000000000..beaf673528587d493eb0713411e3616f5aef77ff
mode 100644,000000..100644
--- 1/cpu/cpu_exec_context.hh
--- /dev/null
+++ b/cpu/cpu_exec_context.hh
@@@ -1,542 -1,0 +1,530 @@@
-         // check for error condition.  Alpha syscall convention is to
-         // indicate success/failure in reg a3 (r19) and put the
-         // return value itself in the standard return value reg (v0).
-         const int RegA3 = 19; // only place this is used
-         if (return_value.successful()) {
-             // no error
-             regs.intRegFile[RegA3] = 0;
-             regs.intRegFile[TheISA::ReturnValueReg] = return_value.value();
-         } else {
-             // got an error, return details
-             regs.intRegFile[RegA3] = (TheISA::IntReg) -1;
-             regs.intRegFile[TheISA::ReturnValueReg] = -return_value.value();
-         }
 +/*
 + * Copyright (c) 2001-2006 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.
 + */
 +
 +#ifndef __CPU_CPU_EXEC_CONTEXT_HH__
 +#define __CPU_CPU_EXEC_CONTEXT_HH__
 +
 +#include "arch/isa_traits.hh"
 +#include "config/full_system.hh"
 +#include "cpu/exec_context.hh"
 +#include "mem/functional/functional.hh"
 +#include "mem/mem_req.hh"
 +#include "sim/byteswap.hh"
 +#include "sim/eventq.hh"
 +#include "sim/host.hh"
 +#include "sim/serialize.hh"
 +
 +// forward declaration: see functional_memory.hh
 +class FunctionalMemory;
 +class PhysicalMemory;
 +class BaseCPU;
 +
 +#if FULL_SYSTEM
 +
 +#include "sim/system.hh"
 +#include "arch/tlb.hh"
 +
 +class FunctionProfile;
 +class ProfileNode;
 +class MemoryController;
 +
 +#else // !FULL_SYSTEM
 +
 +#include "sim/process.hh"
 +
 +#endif // FULL_SYSTEM
 +
 +//
 +// The CPUExecContext object represents a functional context for
 +// instruction execution.  It incorporates everything required for
 +// architecture-level functional simulation of a single thread.
 +//
 +
 +class CPUExecContext
 +{
 +  protected:
 +    typedef TheISA::RegFile RegFile;
 +    typedef TheISA::MachInst MachInst;
 +    typedef TheISA::MiscRegFile MiscRegFile;
 +    typedef TheISA::MiscReg MiscReg;
 +  public:
 +    typedef ExecContext::Status Status;
 +
 +  private:
 +    Status _status;
 +
 +  public:
 +    Status status() const { return _status; }
 +
 +    void setStatus(Status newStatus) { _status = newStatus; }
 +
 +    /// Set the status to Active.  Optional delay indicates number of
 +    /// cycles to wait before beginning execution.
 +    void activate(int delay = 1);
 +
 +    /// Set the status to Suspended.
 +    void suspend();
 +
 +    /// Set the status to Unallocated.
 +    void deallocate();
 +
 +    /// Set the status to Halted.
 +    void halt();
 +
 +  protected:
 +    RegFile regs;     // correct-path register context
 +
 +  public:
 +    // pointer to CPU associated with this context
 +    BaseCPU *cpu;
 +
 +    ProxyExecContext<CPUExecContext> *proxy;
 +
 +    // Current instruction
 +    MachInst inst;
 +
 +    // Index of hardware thread context on the CPU that this represents.
 +    int thread_num;
 +
 +    // ID of this context w.r.t. the System or Process object to which
 +    // it belongs.  For full-system mode, this is the system CPU ID.
 +    int cpu_id;
 +
 +    Tick lastActivate;
 +    Tick lastSuspend;
 +
 +#if FULL_SYSTEM
 +    FunctionalMemory *mem;
 +    AlphaITB *itb;
 +    AlphaDTB *dtb;
 +    System *system;
 +
 +    // the following two fields are redundant, since we can always
 +    // look them up through the system pointer, but we'll leave them
 +    // here for now for convenience
 +    MemoryController *memctrl;
 +    PhysicalMemory *physmem;
 +
 +    FunctionProfile *profile;
 +    ProfileNode *profileNode;
 +    Addr profilePC;
 +    void dumpFuncProfile();
 +
 +    /** Event for timing out quiesce instruction */
 +    struct EndQuiesceEvent : public Event
 +    {
 +        /** A pointer to the execution context that is quiesced */
 +        CPUExecContext *cpuXC;
 +
 +        EndQuiesceEvent(CPUExecContext *_cpuXC);
 +
 +        /** Event process to occur at interrupt*/
 +        virtual void process();
 +
 +        /** Event description */
 +        virtual const char *description();
 +    };
 +    EndQuiesceEvent quiesceEvent;
 +
 +    Event *getQuiesceEvent() { return &quiesceEvent; }
 +
 +    Tick readLastActivate() { return lastActivate; }
 +
 +    Tick readLastSuspend() { return lastSuspend; }
 +
 +    void profileClear();
 +
 +    void profileSample();
 +
 +#else
 +    Process *process;
 +
 +    FunctionalMemory *mem;    // functional storage for process address space
 +
 +    // Address space ID.  Note that this is used for TIMING cache
 +    // simulation only; all functional memory accesses should use
 +    // one of the FunctionalMemory pointers above.
 +    short asid;
 +
 +#endif
 +
 +    /**
 +     * Temporary storage to pass the source address from copy_load to
 +     * copy_store.
 +     * @todo Remove this temporary when we have a better way to do it.
 +     */
 +    Addr copySrcAddr;
 +    /**
 +     * Temp storage for the physical source address of a copy.
 +     * @todo Remove this temporary when we have a better way to do it.
 +     */
 +    Addr copySrcPhysAddr;
 +
 +
 +    /*
 +     * number of executed instructions, for matching with syscall trace
 +     * points in EIO files.
 +     */
 +    Counter func_exe_inst;
 +
 +    //
 +    // Count failed store conditionals so we can warn of apparent
 +    // application deadlock situations.
 +    unsigned storeCondFailures;
 +
 +    // constructor: initialize context from given process structure
 +#if FULL_SYSTEM
 +    CPUExecContext(BaseCPU *_cpu, int _thread_num, System *_system,
 +                   AlphaITB *_itb, AlphaDTB *_dtb, FunctionalMemory *_dem);
 +#else
 +    CPUExecContext(BaseCPU *_cpu, int _thread_num, Process *_process, int _asid);
 +    CPUExecContext(BaseCPU *_cpu, int _thread_num, FunctionalMemory *_mem,
 +                   int _asid);
 +    // Constructor to use XC to pass reg file around.  Not used for anything
 +    // else.
 +    CPUExecContext(RegFile *regFile);
 +#endif
 +    virtual ~CPUExecContext();
 +
 +    virtual void takeOverFrom(ExecContext *oldContext);
 +
 +    void regStats(const std::string &name);
 +
 +    void serialize(std::ostream &os);
 +    void unserialize(Checkpoint *cp, const std::string &section);
 +
 +    BaseCPU *getCpuPtr() { return cpu; }
 +
 +    ExecContext *getProxy() { return proxy; }
 +
 +    int getThreadNum() { return thread_num; }
 +
 +#if FULL_SYSTEM
 +    System *getSystemPtr() { return system; }
 +
 +    PhysicalMemory *getPhysMemPtr() { return physmem; }
 +
 +    AlphaITB *getITBPtr() { return itb; }
 +
 +    AlphaDTB *getDTBPtr() { return dtb; }
 +
 +    bool validInstAddr(Addr addr) { return true; }
 +    bool validDataAddr(Addr addr) { return true; }
 +    int getInstAsid() { return regs.instAsid(); }
 +    int getDataAsid() { return regs.dataAsid(); }
 +
 +    Fault translateInstReq(MemReqPtr &req)
 +    {
 +        return itb->translate(req);
 +    }
 +
 +    Fault translateDataReadReq(MemReqPtr &req)
 +    {
 +        return dtb->translate(req, false);
 +    }
 +
 +    Fault translateDataWriteReq(MemReqPtr &req)
 +    {
 +        return dtb->translate(req, true);
 +    }
 +
 +#else
 +    Process *getProcessPtr() { return process; }
 +
 +    bool validInstAddr(Addr addr)
 +    { return process->validInstAddr(addr); }
 +
 +    bool validDataAddr(Addr addr)
 +    { return process->validDataAddr(addr); }
 +
 +    int getInstAsid() { return asid; }
 +    int getDataAsid() { return asid; }
 +
 +    Fault dummyTranslation(MemReqPtr &req)
 +    {
 +#if 0
 +        assert((req->vaddr >> 48 & 0xffff) == 0);
 +#endif
 +
 +        // put the asid in the upper 16 bits of the paddr
 +        req->paddr = req->vaddr & ~((Addr)0xffff << sizeof(Addr) * 8 - 16);
 +        req->paddr = req->paddr | (Addr)req->asid << sizeof(Addr) * 8 - 16;
 +        return NoFault;
 +    }
 +    Fault translateInstReq(MemReqPtr &req)
 +    {
 +        return dummyTranslation(req);
 +    }
 +    Fault translateDataReadReq(MemReqPtr &req)
 +    {
 +        return dummyTranslation(req);
 +    }
 +    Fault translateDataWriteReq(MemReqPtr &req)
 +    {
 +        return dummyTranslation(req);
 +    }
 +
 +#endif
 +
 +    template <class T>
 +    Fault read(MemReqPtr &req, T &data)
 +    {
 +#if FULL_SYSTEM && defined(TARGET_ALPHA)
 +        if (req->flags & LOCKED) {
 +            req->xc->setMiscReg(TheISA::Lock_Addr_DepTag, req->paddr);
 +            req->xc->setMiscReg(TheISA::Lock_Flag_DepTag, true);
 +        }
 +#endif
 +
 +        Fault error;
 +        error = mem->read(req, data);
 +        data = LittleEndianGuest::gtoh(data);
 +        return error;
 +    }
 +
 +    template <class T>
 +    Fault write(MemReqPtr &req, T &data)
 +    {
 +#if FULL_SYSTEM && defined(TARGET_ALPHA)
 +        ExecContext *xc;
 +
 +        // If this is a store conditional, act appropriately
 +        if (req->flags & LOCKED) {
 +            xc = req->xc;
 +
 +            if (req->flags & UNCACHEABLE) {
 +                // Don't update result register (see stq_c in isa_desc)
 +                req->result = 2;
 +                xc->setStCondFailures(0);//Needed? [RGD]
 +            } else {
 +                bool lock_flag = xc->readMiscReg(TheISA::Lock_Flag_DepTag);
 +                Addr lock_addr = xc->readMiscReg(TheISA::Lock_Addr_DepTag);
 +                req->result = lock_flag;
 +                if (!lock_flag ||
 +                    ((lock_addr & ~0xf) != (req->paddr & ~0xf))) {
 +                    xc->setMiscReg(TheISA::Lock_Flag_DepTag, false);
 +                    xc->setStCondFailures(xc->readStCondFailures() + 1);
 +                    if (((xc->readStCondFailures()) % 100000) == 0) {
 +                        std::cerr << "Warning: "
 +                                  << xc->readStCondFailures()
 +                                  << " consecutive store conditional failures "
 +                                  << "on cpu " << req->xc->readCpuId()
 +                                  << std::endl;
 +                    }
 +                    return NoFault;
 +                }
 +                else xc->setStCondFailures(0);
 +            }
 +        }
 +
 +        // Need to clear any locked flags on other proccessors for
 +        // this address.  Only do this for succsful Store Conditionals
 +        // and all other stores (WH64?).  Unsuccessful Store
 +        // Conditionals would have returned above, and wouldn't fall
 +        // through.
 +        for (int i = 0; i < system->execContexts.size(); i++){
 +            xc = system->execContexts[i];
 +            if ((xc->readMiscReg(TheISA::Lock_Addr_DepTag) & ~0xf) ==
 +                (req->paddr & ~0xf)) {
 +                xc->setMiscReg(TheISA::Lock_Flag_DepTag, false);
 +            }
 +        }
 +
 +#endif
 +        return mem->write(req, (T)LittleEndianGuest::htog(data));
 +    }
 +
 +    virtual bool misspeculating();
 +
 +
 +    MachInst getInst() { return inst; }
 +
 +    void setInst(MachInst new_inst)
 +    {
 +        inst = new_inst;
 +    }
 +
 +    Fault instRead(MemReqPtr &req)
 +    {
 +        return mem->read(req, inst);
 +    }
 +
 +    void setCpuId(int id) { cpu_id = id; }
 +
 +    int readCpuId() { return cpu_id; }
 +
 +    FunctionalMemory *getMemPtr() { return mem; }
 +
 +    void copyArchRegs(ExecContext *xc);
 +
 +    //
 +    // New accessors for new decoder.
 +    //
 +    uint64_t readIntReg(int reg_idx)
 +    {
 +        return regs.intRegFile[reg_idx];
 +    }
 +
 +    float readFloatRegSingle(int reg_idx)
 +    {
 +        return (float)regs.floatRegFile.d[reg_idx];
 +    }
 +
 +    double readFloatRegDouble(int reg_idx)
 +    {
 +        return regs.floatRegFile.d[reg_idx];
 +    }
 +
 +    uint64_t readFloatRegInt(int reg_idx)
 +    {
 +        return regs.floatRegFile.q[reg_idx];
 +    }
 +
 +    void setIntReg(int reg_idx, uint64_t val)
 +    {
 +        regs.intRegFile[reg_idx] = val;
 +    }
 +
 +    void setFloatRegSingle(int reg_idx, float val)
 +    {
 +        regs.floatRegFile.d[reg_idx] = (double)val;
 +    }
 +
 +    void setFloatRegDouble(int reg_idx, double val)
 +    {
 +        regs.floatRegFile.d[reg_idx] = val;
 +    }
 +
 +    void setFloatRegInt(int reg_idx, uint64_t val)
 +    {
 +        regs.floatRegFile.q[reg_idx] = val;
 +    }
 +
 +    uint64_t readPC()
 +    {
 +        return regs.pc;
 +    }
 +
 +    void setPC(uint64_t val)
 +    {
 +        regs.pc = val;
 +    }
 +
 +    uint64_t readNextPC()
 +    {
 +        return regs.npc;
 +    }
 +
 +    void setNextPC(uint64_t val)
 +    {
 +        regs.npc = val;
 +    }
 +
 +    uint64_t readNextNPC()
 +    {
 +        return regs.nnpc;
 +    }
 +
 +    void setNextNPC(uint64_t val)
 +    {
 +        regs.nnpc = val;
 +    }
 +
 +
 +    MiscReg readMiscReg(int misc_reg)
 +    {
 +        return regs.miscRegs.readReg(misc_reg);
 +    }
 +
 +    MiscReg readMiscRegWithEffect(int misc_reg, Fault &fault)
 +    {
 +        return regs.miscRegs.readRegWithEffect(misc_reg, fault, proxy);
 +    }
 +
 +    Fault setMiscReg(int misc_reg, const MiscReg &val)
 +    {
 +        return regs.miscRegs.setReg(misc_reg, val);
 +    }
 +
 +    Fault setMiscRegWithEffect(int misc_reg, const MiscReg &val)
 +    {
 +        return regs.miscRegs.setRegWithEffect(misc_reg, val, proxy);
 +    }
 +
 +    unsigned readStCondFailures() { return storeCondFailures; }
 +
 +    void setStCondFailures(unsigned sc_failures)
 +    { storeCondFailures = sc_failures; }
 +
 +    void clearArchRegs() { memset(&regs, 0, sizeof(regs)); }
 +
 +#if FULL_SYSTEM
 +    int readIntrFlag() { return regs.intrflag; }
 +    void setIntrFlag(int val) { regs.intrflag = val; }
 +    Fault hwrei();
 +    bool inPalMode() { return AlphaISA::PcPAL(regs.pc); }
 +    bool simPalCheck(int palFunc);
 +#endif
 +
 +#if !FULL_SYSTEM
 +    TheISA::IntReg getSyscallArg(int i)
 +    {
 +        return regs.intRegFile[TheISA::ArgumentReg0 + i];
 +    }
 +
 +    // used to shift args for indirect syscall
 +    void setSyscallArg(int i, TheISA::IntReg val)
 +    {
 +        regs.intRegFile[TheISA::ArgumentReg0 + i] = val;
 +    }
 +
 +    void setSyscallReturn(SyscallReturn return_value)
 +    {
++        TheISA::setSyscallReturn(return_value, &regs);
 +    }
 +
 +    void syscall()
 +    {
 +        process->syscall(proxy);
 +    }
 +
 +    Counter readFuncExeInst() { return func_exe_inst; }
 +
 +    void setFuncExeInst(Counter new_val) { func_exe_inst = new_val; }
 +#endif
 +};
 +
 +
 +// for non-speculative execution context, spec_mode is always false
 +inline bool
 +CPUExecContext::misspeculating()
 +{
 +    return false;
 +}
 +
 +#endif // __CPU_CPU_EXEC_CONTEXT_HH__

diff --cc sim/process.cc
index 851192dcdb7b4a3948f3905f4c44e1f2c355970d,894beeb05f05bf4b6dbcb9bfbe4f0a219f900a15..f02ca8bfdb5d3671447cc5ed5dd8766bace8c267
--- 1/sim/process.cc
--- 2/sim/process.cc
+++ b/sim/process.cc
@@@ -357,7 -354,7 +357,7 @@@ LiveProcess::syscall(ExecContext *xc
  {
      num_syscalls++;
  
-     int64_t callnum = xc->readIntReg(ReturnValueReg);
 -    int64_t callnum = xc->regs.intRegFile[SyscallNumReg];
++    int64_t callnum = xc->readIntReg(SyscallNumReg);
  
      SyscallDesc *desc = getDesc(callnum);
      if (desc == NULL)

diff --cc sim/syscall_emul.cc
Simple merge

diff --cc sim/syscall_emul.hh
Simple merge