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

diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index 4b285e7ec..aaf9ecb3c 100644
--- a/src/arch/alpha/remote_gdb.cc
+++ b/src/arch/alpha/remote_gdb.cc
@@ -188,7 +188,7 @@ RemoteGDB::acc(Addr va, size_t len)
 
             Addr ptbr = context->readMiscRegNoEffect(IPR_PALtemp20);
             PageTableEntry pte =
-                kernel_pte_lookup(context->getPhysPort(), ptbr, va);
+                kernel_pte_lookup(context->getPhysProxy(), ptbr, va);
             if (!pte.valid()) {
                 DPRINTF(GDBAcc, "acc:   %#x pte is invalid\n", va);
                 return false;
@@ -312,3 +312,11 @@ RemoteGDB::write(Addr vaddr, size_t size, const char *data)
     }
 }
 
+
+bool
+RemoteGDB::insertHardBreak(Addr addr, size_t len)
+{
+    warn_once("Breakpoints do not work in Alpha PAL mode.\n"
+              "      See PCEventQueue::doService() in cpu/pc_event.cc.\n");
+    return BaseRemoteGDB::insertHardBreak(addr, len);
+}