Set progress_interval in terms of CPU cycles.

[gem5.git] / src / cpu / simple_thread.cc

diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 5ae1e1d3c5602a80353f07e999a0fe5fdf1d673e..13d0e2e291ace750531303b190244444257eb617 100644 (file)
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -39,13 +39,13 @@
 #include "cpu/thread_context.hh"
 
 #if FULL_SYSTEM
+#include "arch/kernel_stats.hh"
 #include "base/callback.hh"
 #include "base/cprintf.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "cpu/profile.hh"
 #include "cpu/quiesce_event.hh"
-#include "kern/kernel_stats.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_exit.hh"
 #include "arch/stacktrace.hh"
@@ -91,18 +91,6 @@ SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, System *_sys,
     } else {
         kernelStats = NULL;
     }
-    Port *mem_port;
-    physPort = new FunctionalPort(csprintf("%s-%d-funcport",
-                                           cpu->name(), tid));
-    mem_port = system->physmem->getPort("functional");
-    mem_port->setPeer(physPort);
-    physPort->setPeer(mem_port);
-
-    virtPort = new VirtualPort(csprintf("%s-%d-vport",
-                                        cpu->name(), tid));
-    mem_port = system->physmem->getPort("functional");
-    mem_port->setPeer(virtPort);
-    virtPort->setPeer(mem_port);
 }
 #else
 SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num,
@@ -309,10 +297,7 @@ SimpleThread::getVirtPort(ThreadContext *src_tc)
         return virtPort;
 
     VirtualPort *vp = new VirtualPort("tc-vport", src_tc);
-    Port *mem_port = getMemFuncPort();
-
-    mem_port->setPeer(vp);
-    vp->setPeer(mem_port);
+    connectToMemFunc(vp);
     return vp;
 }