Merge zizzer:/bk/newmem

into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips

--HG--
extra : convert_revision : 9bdde9b5bd3049744451eda1134f080b7c4b1b59

1 files changed, 21 insertions, 6 deletions

diff --git a/arch/mips/process.hh b/arch/mips/process.hh
index 8f5d74d96..2a13dc955 100644
--- a/arch/mips/process.hh
+++ b/arch/mips/process.hh
@@ -31,19 +31,34 @@
 
 #include <string>
 #include <vector>
+#include "sim/process.hh"
 
 class LiveProcess;
 class ObjectFile;
 class System;
 
-namespace MipsISA
+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);
 
-LiveProcess *
-createProcess(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);
+    void startup();
+
+  public:
+    // this function is used to create the LiveProcess object, since
+    // we can't tell which subclass of LiveProcess to use until we
+    // open and look at the object file.
+    static MipsLiveProcess *create(const std::string &nm,
+                               System *_system,
+                               int stdin_fd, int stdout_fd, int stderr_fd,
+                               std::string executable,
+                               std::vector<std::string> &argv,
+                               std::vector<std::string> &envp);
+
+};
 
-} // namespace MipsISA
 
 #endif // __MIPS_PROCESS_HH__