diff options
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/alpha/linux/process.cc | 20 | ||||
-rw-r--r-- | src/arch/alpha/linux/process.hh | 11 | ||||
-rw-r--r-- | src/arch/alpha/process.cc | 11 | ||||
-rw-r--r-- | src/arch/alpha/process.hh | 9 | ||||
-rw-r--r-- | src/arch/alpha/tru64/process.cc | 17 | ||||
-rw-r--r-- | src/arch/alpha/tru64/process.hh | 12 | ||||
-rw-r--r-- | src/arch/mips/linux/process.cc | 20 | ||||
-rw-r--r-- | src/arch/mips/linux/process.hh | 11 | ||||
-rw-r--r-- | src/arch/mips/process.cc | 11 | ||||
-rw-r--r-- | src/arch/mips/process.hh | 9 | ||||
-rw-r--r-- | src/arch/sparc/linux/process.cc | 36 | ||||
-rw-r--r-- | src/arch/sparc/linux/process.hh | 22 | ||||
-rw-r--r-- | src/arch/sparc/process.cc | 11 | ||||
-rw-r--r-- | src/arch/sparc/process.hh | 37 | ||||
-rw-r--r-- | src/arch/sparc/solaris/process.cc | 21 | ||||
-rw-r--r-- | src/arch/sparc/solaris/process.hh | 11 | ||||
-rw-r--r-- | src/arch/x86/linux/process.cc | 18 | ||||
-rw-r--r-- | src/arch/x86/linux/process.hh | 11 | ||||
-rw-r--r-- | src/arch/x86/process.cc | 11 | ||||
-rw-r--r-- | src/arch/x86/process.hh | 10 |
20 files changed, 49 insertions, 270 deletions
diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc index b638aa927..ec47992bd 100644 --- a/src/arch/alpha/linux/process.cc +++ b/src/arch/alpha/linux/process.cc @@ -568,23 +568,9 @@ SyscallDesc AlphaLinuxProcess::syscallDescs[] = { /* 441 */ SyscallDesc("keyctl", unimplementedFunc) }; -AlphaLinuxProcess::AlphaLinuxProcess(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, - const std::string &cwd, - uint64_t _uid, - uint64_t _euid, - uint64_t _gid, - uint64_t _egid, - uint64_t _pid, - uint64_t _ppid) - : AlphaLiveProcess(name, objFile, system, stdin_fd, stdout_fd, - stderr_fd, argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid), +AlphaLinuxProcess::AlphaLinuxProcess(LiveProcessParams * params, + ObjectFile *objFile) + : AlphaLiveProcess(params, objFile), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)) { //init_regs->intRegFile[0] = 0; diff --git a/src/arch/alpha/linux/process.hh b/src/arch/alpha/linux/process.hh index cb22f521b..8d7c24e37 100644 --- a/src/arch/alpha/linux/process.hh +++ b/src/arch/alpha/linux/process.hh @@ -40,16 +40,7 @@ class AlphaLinuxProcess : public AlphaLiveProcess { public: /// Constructor. - AlphaLinuxProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + AlphaLinuxProcess(LiveProcessParams * params, ObjectFile *objFile); virtual SyscallDesc* getDesc(int callnum); diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc index a9848ebb5..ef53021c5 100644 --- a/src/arch/alpha/process.cc +++ b/src/arch/alpha/process.cc @@ -40,14 +40,9 @@ using namespace AlphaISA; using namespace std; -AlphaLiveProcess::AlphaLiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd, - argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid) +AlphaLiveProcess::AlphaLiveProcess(LiveProcessParams * params, + ObjectFile *objFile) + : LiveProcess(params, objFile) { brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize(); brk_point = roundUp(brk_point, VMPageSize); diff --git a/src/arch/alpha/process.hh b/src/arch/alpha/process.hh index 8eede502a..c66b97d23 100644 --- a/src/arch/alpha/process.hh +++ b/src/arch/alpha/process.hh @@ -43,14 +43,7 @@ class System; class AlphaLiveProcess : public LiveProcess { protected: - AlphaLiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, - std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + AlphaLiveProcess(LiveProcessParams * params, ObjectFile *objFile); void startup(); }; diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc index a1f02b16c..6823d820a 100644 --- a/src/arch/alpha/tru64/process.cc +++ b/src/arch/alpha/tru64/process.cc @@ -573,20 +573,9 @@ AlphaTru64Process::getDesc(int callnum) } -AlphaTru64Process::AlphaTru64Process(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : AlphaLiveProcess(name, objFile, system, stdin_fd, stdout_fd, - stderr_fd, argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid), +AlphaTru64Process::AlphaTru64Process(LiveProcessParams * params, + ObjectFile *objFile) + : AlphaLiveProcess(params, objFile), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)), Num_Mach_Syscall_Descs(sizeof(machSyscallDescs) / sizeof(SyscallDesc)) { diff --git a/src/arch/alpha/tru64/process.hh b/src/arch/alpha/tru64/process.hh index f5643c0b9..16bc499c6 100644 --- a/src/arch/alpha/tru64/process.hh +++ b/src/arch/alpha/tru64/process.hh @@ -39,16 +39,8 @@ class AlphaTru64Process : public AlphaLiveProcess { public: /// Constructor. - AlphaTru64Process(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + AlphaTru64Process(LiveProcessParams * params, + ObjectFile *objFile); /// Array of syscall descriptors, indexed by call number. static SyscallDesc syscallDescs[]; diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc index 283088cb2..425ef9ac3 100644 --- a/src/arch/mips/linux/process.cc +++ b/src/arch/mips/linux/process.cc @@ -405,23 +405,9 @@ 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, - const std::string &cwd, - uint64_t _uid, - uint64_t _euid, - uint64_t _gid, - uint64_t _egid, - uint64_t _pid, - uint64_t _ppid) - : MipsLiveProcess(name, objFile, system, stdin_fd, stdout_fd, stderr_fd, - argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid), +MipsLinuxProcess::MipsLinuxProcess(LiveProcessParams * params, + ObjectFile *objFile) + : MipsLiveProcess(params, objFile), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)) { } diff --git a/src/arch/mips/linux/process.hh b/src/arch/mips/linux/process.hh index d18c96188..a1e738d61 100644 --- a/src/arch/mips/linux/process.hh +++ b/src/arch/mips/linux/process.hh @@ -38,16 +38,7 @@ class MipsLinuxProcess : public MipsLiveProcess { public: /// Constructor. - 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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + MipsLinuxProcess(LiveProcessParams * params, ObjectFile *objFile); void startup(); diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc index d1e6e27bf..3ce6b19fa 100644 --- a/src/arch/mips/process.cc +++ b/src/arch/mips/process.cc @@ -41,14 +41,9 @@ using namespace std; using namespace MipsISA; -MipsLiveProcess::MipsLiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd, - argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid) +MipsLiveProcess::MipsLiveProcess(LiveProcessParams * params, + ObjectFile *objFile) + : LiveProcess(params, objFile) { // Set up stack. On MIPS, stack starts at the top of kuseg // user address space. MIPS stack grows down from here diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh index b6249f76d..350a5bed9 100644 --- a/src/arch/mips/process.hh +++ b/src/arch/mips/process.hh @@ -44,14 +44,7 @@ class System; class MipsLiveProcess : public LiveProcess { protected: - MipsLiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, - std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + MipsLiveProcess(LiveProcessParams * params, ObjectFile *objFile); virtual void startup(); diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc index 9e3f74075..f4ec28c00 100644 --- a/src/arch/sparc/linux/process.cc +++ b/src/arch/sparc/linux/process.cc @@ -72,21 +72,9 @@ SparcLinuxProcess::SparcLinuxProcess() : assert(Num_Syscall_Descs <= 299); } -Sparc32LinuxProcess::Sparc32LinuxProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : Sparc32LiveProcess(name, objFile, system, - stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd, - _uid, _euid, _gid, _egid, _pid, _ppid) +Sparc32LinuxProcess::Sparc32LinuxProcess(LiveProcessParams * params, + ObjectFile *objFile) + : Sparc32LiveProcess(params, objFile) {} void Sparc32LinuxProcess::handleTrap(int trapNum, ThreadContext *tc) @@ -101,21 +89,9 @@ void Sparc32LinuxProcess::handleTrap(int trapNum, ThreadContext *tc) } } -Sparc64LinuxProcess::Sparc64LinuxProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : Sparc64LiveProcess(name, objFile, system, - stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd, - _uid, _euid, _gid, _egid, _pid, _ppid) +Sparc64LinuxProcess::Sparc64LinuxProcess(LiveProcessParams * params, + ObjectFile *objFile) + : Sparc64LiveProcess(params, objFile) {} void Sparc64LinuxProcess::handleTrap(int trapNum, ThreadContext *tc) diff --git a/src/arch/sparc/linux/process.hh b/src/arch/sparc/linux/process.hh index 6c7f30a43..06eee9235 100644 --- a/src/arch/sparc/linux/process.hh +++ b/src/arch/sparc/linux/process.hh @@ -65,16 +65,7 @@ class Sparc32LinuxProcess : public SparcLinuxProcess, public Sparc32LiveProcess { public: /// Constructor. - Sparc32LinuxProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + Sparc32LinuxProcess(LiveProcessParams * params, ObjectFile *objFile); SyscallDesc* getDesc(int callnum) { @@ -89,16 +80,7 @@ class Sparc64LinuxProcess : public SparcLinuxProcess, public Sparc64LiveProcess { public: /// Constructor. - Sparc64LinuxProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + Sparc64LinuxProcess(LiveProcessParams * params, ObjectFile *objFile); SyscallDesc* getDesc(int callnum) { diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc index 91564e754..e0d204a2d 100644 --- a/src/arch/sparc/process.cc +++ b/src/arch/sparc/process.cc @@ -47,14 +47,9 @@ using namespace std; using namespace SparcISA; -SparcLiveProcess::SparcLiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd, - argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid) +SparcLiveProcess::SparcLiveProcess(LiveProcessParams * params, + ObjectFile *objFile) + : LiveProcess(params, objFile) { // XXX all the below need to be updated for SPARC - Ali diff --git a/src/arch/sparc/process.hh b/src/arch/sparc/process.hh index f4e823a9a..dd8eae316 100644 --- a/src/arch/sparc/process.hh +++ b/src/arch/sparc/process.hh @@ -46,14 +46,7 @@ class SparcLiveProcess : public LiveProcess //The locations of the fill and spill handlers Addr fillStart, spillStart; - SparcLiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, - std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + SparcLiveProcess(LiveProcessParams * params, ObjectFile *objFile); public: @@ -90,18 +83,8 @@ class Sparc32LiveProcess : public SparcLiveProcess std::vector<M5_32_auxv_t> auxv; - Sparc32LiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, - std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) : - SparcLiveProcess(nm, objFile, _system, - stdin_fd, stdout_fd, stderr_fd, - argv, envp, cwd, - _uid, _euid, _gid, _egid, _pid, _ppid) + Sparc32LiveProcess(LiveProcessParams * params, ObjectFile *objFile) : + SparcLiveProcess(params, objFile) { // Set up stack. On SPARC Linux, stack goes from the top of memory // downward, less the hole for the kernel address space. @@ -143,18 +126,8 @@ class Sparc64LiveProcess : public SparcLiveProcess std::vector<M5_64_auxv_t> auxv; - Sparc64LiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, - std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) : - SparcLiveProcess(nm, objFile, _system, - stdin_fd, stdout_fd, stderr_fd, - argv, envp, cwd, - _uid, _euid, _gid, _egid, _pid, _ppid) + Sparc64LiveProcess(LiveProcessParams * params, ObjectFile *objFile) : + SparcLiveProcess(params, objFile) { // Set up stack. On SPARC Linux, stack goes from the top of memory // downward, less the hole for the kernel address space. diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc index b7a49ab8d..40d172690 100644 --- a/src/arch/sparc/solaris/process.cc +++ b/src/arch/sparc/solaris/process.cc @@ -321,24 +321,9 @@ SyscallDesc SparcSolarisProcess::syscallDescs[] = { /* 255 */ SyscallDesc("umount2", unimplementedFunc) }; -SparcSolarisProcess::SparcSolarisProcess(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, - const std::string &cwd, - uint64_t _uid, - uint64_t _euid, - uint64_t _gid, - uint64_t _egid, - uint64_t _pid, - uint64_t _ppid) - : Sparc64LiveProcess(name, objFile, system, - stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd, - _uid, _euid, _gid, _egid, _pid, _ppid), +SparcSolarisProcess::SparcSolarisProcess(LiveProcessParams * params, + ObjectFile *objFile) + : Sparc64LiveProcess(params, objFile), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)) { // The sparc syscall table must be <= 284 entries because that is all there diff --git a/src/arch/sparc/solaris/process.hh b/src/arch/sparc/solaris/process.hh index 174eaecd7..2cf56f6ba 100644 --- a/src/arch/sparc/solaris/process.hh +++ b/src/arch/sparc/solaris/process.hh @@ -42,16 +42,7 @@ class SparcSolarisProcess : public Sparc64LiveProcess { public: /// Constructor. - SparcSolarisProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + SparcSolarisProcess(LiveProcessParams * params, ObjectFile *objFile); virtual SyscallDesc* getDesc(int callnum); diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc index 9ef591a1c..8beaf150b 100644 --- a/src/arch/x86/linux/process.cc +++ b/src/arch/x86/linux/process.cc @@ -77,21 +77,9 @@ X86LinuxProcess::getDesc(int callnum) return &syscallDescs[callnum]; } -X86LinuxProcess::X86LinuxProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : X86LiveProcess(name, objFile, system, - stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd, - _uid, _euid, _gid, _egid, _pid, _ppid), +X86LinuxProcess::X86LinuxProcess(LiveProcessParams * params, + ObjectFile *objFile) + : X86LiveProcess(params, objFile), Num_Syscall_Descs(273) {} diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh index 7e7236f0d..e224374d4 100644 --- a/src/arch/x86/linux/process.hh +++ b/src/arch/x86/linux/process.hh @@ -70,16 +70,7 @@ class X86LinuxProcess : public X86LiveProcess { public: /// Constructor. - X86LinuxProcess(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, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + X86LinuxProcess(LiveProcessParams * params, ObjectFile *objFile); /// Array of syscall descriptors, indexed by call number. static SyscallDesc syscallDescs[]; diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc index 0193344e8..db32437d5 100644 --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -109,14 +109,9 @@ M5_64_auxv_t::M5_64_auxv_t(int64_t type, int64_t val) a_val = TheISA::htog(val); } -X86LiveProcess::X86LiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid) - : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd, - argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid) +X86LiveProcess::X86LiveProcess(LiveProcessParams * params, + ObjectFile *objFile) + : LiveProcess(params, objFile) { brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize(); brk_point = roundUp(brk_point, VMPageSize); diff --git a/src/arch/x86/process.hh b/src/arch/x86/process.hh index a2fa258c8..5def9e13d 100644 --- a/src/arch/x86/process.hh +++ b/src/arch/x86/process.hh @@ -84,15 +84,7 @@ namespace X86ISA protected: std::vector<M5_64_auxv_t> auxv; - X86LiveProcess(const std::string &nm, ObjectFile *objFile, - System *_system, - int stdin_fd, int stdout_fd, int stderr_fd, - std::vector<std::string> &argv, - std::vector<std::string> &envp, - const std::string &cwd, - uint64_t _uid, uint64_t _euid, - uint64_t _gid, uint64_t _egid, - uint64_t _pid, uint64_t _ppid); + X86LiveProcess(LiveProcessParams * params, ObjectFile *objFile); void startup(); |