diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-15 17:52:50 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-15 17:52:50 -0400 |
| commit | 7d3eb0fe801add2bdbb05b482e7d7d303b6f386d (patch) | |
| tree | ac86cd9f65d444b423655cd435ccc4dad808340c /arch/sparc/process.cc | |
| parent | 0a053c7919cb13d216d85784577cbbd4539cd291 (diff) | |
| parent | a6266a99e26a23d3a2f52e05f3742984629c3786 (diff) | |
| download | gem5-7d3eb0fe801add2bdbb05b482e7d7d303b6f386d.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
base/loader/elf_object.cc:
removed SPARC32PLUS since it doesn't work.
--HG--
extra : convert_revision : 620a1c75cdeefbeeb97383d92335cf319d9c9444
Diffstat (limited to 'arch/sparc/process.cc')
| -rw-r--r-- | arch/sparc/process.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/sparc/process.cc b/arch/sparc/process.cc index 7f2b0d40a..250c1bec4 100644 --- a/arch/sparc/process.cc +++ b/arch/sparc/process.cc @@ -29,6 +29,7 @@ #include "arch/sparc/isa_traits.hh" #include "arch/sparc/process.hh" #include "arch/sparc/linux/process.hh" +#include "arch/sparc/solaris/process.hh" #include "base/loader/object_file.hh" #include "base/misc.hh" #include "cpu/exec_context.hh" @@ -54,7 +55,8 @@ SparcLiveProcess::create(const std::string &nm, System *system, int stdin_fd, if (objFile->getArch() != ObjectFile::SPARC) - fatal("Object file with arch %x does not match architecture %x.", objFile->getArch(), ObjectFile::SPARC); + fatal("Object file with arch %x does not match architecture %x.", + objFile->getArch(), ObjectFile::SPARC); switch (objFile->getOpSys()) { case ObjectFile::Linux: process = new SparcLinuxProcess(nm, objFile, system, @@ -62,7 +64,12 @@ SparcLiveProcess::create(const std::string &nm, System *system, int stdin_fd, argv, envp); break; + case ObjectFile::Solaris: + process = new SparcSolarisProcess(nm, objFile, system, + stdin_fd, stdout_fd, stderr_fd, + argv, envp); + break; default: fatal("Unknown/unsupported operating system."); } |