diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-03-12 05:58:28 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-03-12 05:58:28 -0500 |
| commit | 57d53f8a9d738b43e0de41a70813e3a6de8d4dfb (patch) | |
| tree | 2bd45bf1d4a23ca8696b76fbffff3754dd244d4a /arch/mips/linux_process.cc | |
| parent | 18ba0f85486f0dd919064ba2b0ed8c53a7861298 (diff) | |
| parent | 4d19bbeeebd026b0aab52e381ee77e4141ed9dd1 (diff) | |
| download | gem5-57d53f8a9d738b43e0de41a70813e3a6de8d4dfb.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem
--HG--
extra : convert_revision : b101fa550567d5a9f5de6c2d8c3f67829ae050c1
Diffstat (limited to 'arch/mips/linux_process.cc')
| -rw-r--r-- | arch/mips/linux_process.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/linux_process.cc b/arch/mips/linux_process.cc index 1d4f62350..318b7934a 100644 --- a/arch/mips/linux_process.cc +++ b/arch/mips/linux_process.cc @@ -33,7 +33,6 @@ #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" @@ -54,7 +53,7 @@ unameFunc(SyscallDesc *desc, int callnum, Process *process, strcpy(name->version, "#1 Mon Aug 18 11:32:15 EDT 2003"); strcpy(name->machine, "mips"); - name.copyOut(xc->mem); + name.copyOut(xc->getMemPort()); return 0; } @@ -74,7 +73,7 @@ osf_getsysinfoFunc(SyscallDesc *desc, int callnum, Process *process, TypedBufferArg<uint64_t> fpcr(xc->getSyscallArg(1)); // I don't think this exactly matches the HW FPCR *fpcr = 0; - fpcr.copyOut(xc->mem); + fpcr.copyOut(xc->getMemPort()); return 0; } @@ -100,7 +99,7 @@ osf_setsysinfoFunc(SyscallDesc *desc, int callnum, Process *process, 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); + fpcr.copyIn(xc->getMemPort()); DPRINTFR(SyscallVerbose, "osf_setsysinfo(SSI_IEEE_FP_CONTROL): " " setting FPCR to 0x%x\n", gtoh(*(uint64_t*)fpcr)); return 0; @@ -566,15 +565,16 @@ SyscallDesc MipsLinuxProcess::syscallDescs[] = { MipsLinuxProcess::MipsLinuxProcess(const std::string &name, ObjectFile *objFile, + System *system, 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), + : LiveProcess(name, objFile, system, stdin_fd, stdout_fd, stderr_fd, argv, envp), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)) { - init_regs->intRegFile[0] = 0; + //init_regs->intRegFile[0] = 0; } |