diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-03-15 23:38:55 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-03-15 23:38:55 -0500 |
| commit | 77a2f97c3590d7d51ffc5b447546c7c70894bdbd (patch) | |
| tree | 3463e457b10da0cea34cf20e914b2b51dc329d28 /arch/sparc/linux | |
| parent | e2b558112b408847a1423e5dd12db59e81260c84 (diff) | |
| parent | 7359e2df01fde9ea34a0ba661750a455e26bcacd (diff) | |
| download | gem5-77a2f97c3590d7d51ffc5b447546c7c70894bdbd.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
--HG--
extra : convert_revision : 9bdde9b5bd3049744451eda1134f080b7c4b1b59
Diffstat (limited to 'arch/sparc/linux')
| -rw-r--r-- | arch/sparc/linux/process.cc | 2 | ||||
| -rw-r--r-- | arch/sparc/linux/process.hh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/sparc/linux/process.cc b/arch/sparc/linux/process.cc index 30c786ad3..cb056eadc 100644 --- a/arch/sparc/linux/process.cc +++ b/arch/sparc/linux/process.cc @@ -352,7 +352,7 @@ SparcLinuxProcess::SparcLinuxProcess(const std::string &name, int stderr_fd, std::vector<std::string> &argv, std::vector<std::string> &envp) - : LiveProcess(name, objFile, system, + : SparcLiveProcess(name, objFile, system, stdin_fd, stdout_fd, stderr_fd, argv, envp), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)) { diff --git a/arch/sparc/linux/process.hh b/arch/sparc/linux/process.hh index 36b2819da..1565ab549 100644 --- a/arch/sparc/linux/process.hh +++ b/arch/sparc/linux/process.hh @@ -29,11 +29,13 @@ #ifndef __SPARC_LINUX_PROCESS_HH__ #define __SPARC_LINUX_PROCESS_HH__ +#include "arch/sparc/process.hh" #include "sim/process.hh" +namespace SparcISA { /// A process with emulated SPARC/Linux syscalls. -class SparcLinuxProcess : public LiveProcess +class SparcLinuxProcess : public SparcLiveProcess { public: /// Constructor. @@ -55,5 +57,5 @@ class SparcLinuxProcess : public LiveProcess const int Num_Syscall_Descs; }; - +} // namespace SparcISA #endif // __ALPHA_LINUX_PROCESS_HH__ |