Merge zizzer:/bk/newmem

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

--HG--
extra : convert_revision : 9bdde9b5bd3049744451eda1134f080b7c4b1b59

diff --cc arch/mips/isa_traits.hh
Simple merge

diff --cc arch/mips/process.cc
index 37627ac31e1b8a8510eb01ff7ab1f95392fcd353,a4ce3f5f159717b06cec04bfec7651effb8c718a..3f24fc68fdcf1c6694a51411d575ad4de4ec8288
--- 1/arch/mips/process.cc
--- 2/arch/mips/process.cc
+++ b/arch/mips/process.cc
@@@ -30,19 -31,28 +31,28 @@@
  #include "arch/mips/linux_process.hh"
  #include "base/loader/object_file.hh"
  #include "base/misc.hh"
+ #include "cpu/exec_context.hh"
+ #include "sim/builder.hh"
+ #include "sim/system.hh"
  
  using namespace std;
+ using namespace MipsISA;
  
- namespace MipsISA
- {
  
- LiveProcess *
- createProcess(const string &nm, ObjectFile * objFile, System * system,
-         int stdin_fd, int stdout_fd, int stderr_fd,
-         vector<string> &argv, vector<string> &envp)
+ MipsLiveProcess *
+ 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)
  {
-     LiveProcess * process = NULL;
+     MipsLiveProcess *process = NULL;
+ 
+     ObjectFile *objFile = createObjectFile(executable);
+     if (objFile == NULL) {
+         fatal("Can't load object file %s", executable);
+     }
+ 
+ 
 -    if (objFile->getArch() != ObjectFile::MIPS)
 +    if (objFile->getArch() != ObjectFile::Mips)
          fatal("Object file does not match architecture.");
      switch (objFile->getOpSys()) {
        case ObjectFile::Linux: