Merge vm1.(none):/home/stever/bk/newmem-head

into  vm1.(none):/home/stever/bk/newmem-cache2

src/base/traceflags.py:
    Hand merge.

--HG--
extra : convert_revision : 9e7539eeab4220ed7a7237457a8f336f79216924

1 files changed, 14 insertions, 2 deletions

diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index 9ac4bb6d8..8f113fb82 100644
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -28,12 +28,18 @@
  * Authors: Korey Sewell
  */
 
-#include "arch/mips/regfile.hh"
+#include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
-#include "base/misc.hh"
+#include "arch/mips/constants.hh"
+#include "config/full_system.hh"
+#include "cpu/thread_context.hh"
+#include "cpu/static_inst.hh"
+#include "sim/serialize.hh"
 #include "base/bitfield.hh"
+#include "base/misc.hh"
 
 using namespace MipsISA;
+using namespace std;
 
 uint64_t
 MipsISA::fpConvert(ConvertType cvt_type, double fp_val)
@@ -197,3 +203,9 @@ MipsISA::isSnan(void *val_ptr, int size)
         panic("Type unsupported. Size mismatch\n");
     }
 }
+
+void
+MipsISA::startupCPU(ThreadContext *tc, int cpuId)
+{
+        tc->activate(0);
+}