Merge zizzer:/bk/sparcfs

into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 75f3398e38e18eb1f8248e23708d7a8d8cce0fc5

6 files changed, 9 insertions, 3 deletions

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);