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, 1 insertions, 11 deletions

diff --git a/sim/process.hh b/sim/process.hh
index 68312f115..b5b9d18b3 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -174,19 +174,9 @@ class LiveProcess : public Process
                 std::vector<std::string> &argv,
                 std::vector<std::string> &envp);
 
-    void startup();
+    void argsInit(int intSize, int pageSize);
 
   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 LiveProcess *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);
-
     virtual void syscall(ExecContext *xc);
 
     virtual SyscallDesc* getDesc(int callnum) = 0;