Merge with the main repo.

--HG--
rename : src/mem/vport.hh => src/mem/fs_translating_port_proxy.hh
rename : src/mem/translating_port.cc => src/mem/se_translating_port_proxy.cc
rename : src/mem/translating_port.hh => src/mem/se_translating_port_proxy.hh

1 files changed, 7 insertions, 6 deletions

diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh
index 815c9cb64..ff6ca0093 100755
--- a/src/cpu/o3/thread_context.hh
+++ b/src/cpu/o3/thread_context.hh
@@ -96,17 +96,18 @@ class O3ThreadContext : public ThreadContext
     virtual TheISA::Kernel::Statistics *getKernelStats()
     { return thread->kernelStats; }
 
-    virtual void connectMemPorts(ThreadContext *tc)
-    { thread->connectMemPorts(tc); }
-
     /** Returns a pointer to this thread's process. */
     virtual Process *getProcessPtr() { return thread->getProcessPtr(); }
 
-    virtual TranslatingPort *getMemPort() { return thread->getMemPort(); }
+    virtual PortProxy* getPhysProxy() { return thread->getPhysProxy(); }
+
+    virtual FSTranslatingPortProxy* getVirtProxy();
 
-    virtual VirtualPort *getVirtPort();
+    virtual void initMemProxies(ThreadContext *tc)
+    { thread->initMemProxies(tc); }
 
-    virtual FunctionalPort *getPhysPort() { return thread->getPhysPort(); }
+    virtual SETranslatingPortProxy* getMemProxy()
+    { return thread->getMemProxy(); }
 
     /** Returns this thread's status. */
     virtual Status status() const { return thread->status(); }