Implement current working directory for LiveProcesses

--HG--
extra : convert_revision : a2d3cf29ab65c61af27d82a8c421a41a19fd5aeb

16 files changed, 24 insertions, 8 deletions

diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index 56342dbc5..f7d946e2e 100644
--- a/src/arch/alpha/linux/process.cc
+++ b/src/arch/alpha/linux/process.cc
@@ -576,6 +576,7 @@ AlphaLinuxProcess::AlphaLinuxProcess(const std::string &name,
                                      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,
@@ -583,7 +584,7 @@ AlphaLinuxProcess::AlphaLinuxProcess(const std::string &name,
                                      uint64_t _pid,
                                      uint64_t _ppid)
     : AlphaLiveProcess(name, objFile, system, stdin_fd, stdout_fd,
-            stderr_fd, argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid),
+           stderr_fd, argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid),
      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 b23904844..2076f6339 100644
--- a/src/arch/alpha/linux/process.hh
+++ b/src/arch/alpha/linux/process.hh
@@ -46,6 +46,7 @@ class AlphaLinuxProcess : public AlphaLiveProcess
                       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);
diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 9e360e80f..85619e493 100644
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -43,10 +43,11 @@ 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, _uid, _euid, _gid, _egid, _pid, _ppid)
+        argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid)
 {
     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 c4aeb1885..8eede502a 100644
--- a/src/arch/alpha/process.hh
+++ b/src/arch/alpha/process.hh
@@ -47,6 +47,7 @@ class AlphaLiveProcess : public LiveProcess
                 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);
diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc
index 55b8ebf8b..a1f02b16c 100644
--- a/src/arch/alpha/tru64/process.cc
+++ b/src/arch/alpha/tru64/process.cc
@@ -581,11 +581,12 @@ AlphaTru64Process::AlphaTru64Process(const std::string &name,
                                      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, _uid, _euid, _gid, _egid, _pid, _ppid),
+            stderr_fd, argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid),
       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 23429dad3..f5643c0b9 100644
--- a/src/arch/alpha/tru64/process.hh
+++ b/src/arch/alpha/tru64/process.hh
@@ -45,6 +45,7 @@ class AlphaTru64Process : public AlphaLiveProcess
                       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);
diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index d182cfa30..a847608d8 100644
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -411,6 +411,7 @@ MipsLinuxProcess::MipsLinuxProcess(const std::string &name,
                                      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,
@@ -418,7 +419,7 @@ MipsLinuxProcess::MipsLinuxProcess(const std::string &name,
                                      uint64_t _pid,
                                      uint64_t _ppid)
     : MipsLiveProcess(name, objFile, system, stdin_fd, stdout_fd, stderr_fd,
-                      argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid),
+                      argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid),
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 { }
 
diff --git a/src/arch/mips/linux/process.hh b/src/arch/mips/linux/process.hh
index 06f86379c..398e1cfc2 100644
--- a/src/arch/mips/linux/process.hh
+++ b/src/arch/mips/linux/process.hh
@@ -43,6 +43,7 @@ class MipsLinuxProcess : public MipsLiveProcess
                       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);
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 4bc91ca24..d1e6e27bf 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -44,10 +44,11 @@ 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, _uid, _euid, _gid, _egid, _pid, _ppid)
+        argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid)
 {
     // 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 fb004375d..af85e8ee9 100644
--- a/src/arch/mips/process.hh
+++ b/src/arch/mips/process.hh
@@ -48,6 +48,7 @@ class MipsLiveProcess : public LiveProcess
                 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);
diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc
index 44c893f2b..565975fe0 100644
--- a/src/arch/sparc/linux/process.cc
+++ b/src/arch/sparc/linux/process.cc
@@ -391,11 +391,12 @@ SparcLinuxProcess::SparcLinuxProcess(const std::string &name,
                                      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(name, objFile, system,
-            stdin_fd, stdout_fd, stderr_fd, argv, envp,
+            stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd,
             _uid, _euid, _gid, _egid, _pid, _ppid),
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 {
diff --git a/src/arch/sparc/linux/process.hh b/src/arch/sparc/linux/process.hh
index c758d5433..e212de973 100644
--- a/src/arch/sparc/linux/process.hh
+++ b/src/arch/sparc/linux/process.hh
@@ -49,6 +49,7 @@ class SparcLinuxProcess : public SparcLiveProcess
                       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);
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index 11a799ccb..3efe4fc08 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -47,10 +47,11 @@ 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, _uid, _euid, _gid, _egid, _pid, _ppid)
+        argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid)
 {
 
     // 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 2320810c7..1cf7ec224 100644
--- a/src/arch/sparc/process.hh
+++ b/src/arch/sparc/process.hh
@@ -64,6 +64,7 @@ class SparcLiveProcess : public LiveProcess
                 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);
diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc
index ff466c8e6..f9876bf00 100644
--- a/src/arch/sparc/solaris/process.cc
+++ b/src/arch/sparc/solaris/process.cc
@@ -329,6 +329,7 @@ SparcSolarisProcess::SparcSolarisProcess(const std::string &name,
                                      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,
@@ -336,7 +337,7 @@ SparcSolarisProcess::SparcSolarisProcess(const std::string &name,
                                      uint64_t _pid,
                                      uint64_t _ppid)
     : SparcLiveProcess(name, objFile, system,
-            stdin_fd, stdout_fd, stderr_fd, argv, envp,
+            stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd,
             _uid, _euid, _gid, _egid, _pid, _ppid),
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 {
diff --git a/src/arch/sparc/solaris/process.hh b/src/arch/sparc/solaris/process.hh
index 2cf329211..f65a60656 100644
--- a/src/arch/sparc/solaris/process.hh
+++ b/src/arch/sparc/solaris/process.hh
@@ -48,6 +48,7 @@ class SparcSolarisProcess : public SparcLiveProcess
                       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);