125,127d124
< #include "config/full_system.hh"
<
< #if FULL_SYSTEM
129,131d125
< #include "mem/fs_translating_port_proxy.hh"
< #endif
<
141c135,136
< #include "mem/se_translating_port_proxy.hh"
---
> #include "mem/translating_port.hh"
> #include "mem/vport.hh"
467,472c462,468
< #if FULL_SYSTEM
< FSTranslatingPortProxy *port = context->getVirtProxy();
< #else
< SETranslatingPortProxy *port = context->getMemProxy();
< #endif
< port->readBlob(vaddr, (uint8_t*)data, size);
---
> if (FullSystem) {
> VirtualPort *port = context->getVirtPort();
> port->readBlob(vaddr, (uint8_t*)data, size);
> } else {
> TranslatingPort *port = context->getMemPort();
> port->readBlob(vaddr, (uint8_t*)data, size);
> }
509,517c505,512
< #if FULL_SYSTEM
< FSTranslatingPortProxy *port = context->getVirtProxy();
< #else
< SETranslatingPortProxy *port = context->getMemProxy();
< #endif
< port->writeBlob(vaddr, (uint8_t*)data, size);
< #if !FULL_SYSTEM
< delete port;
< #endif
---
> if (FullSystem) {
> VirtualPort *port = context->getVirtPort();
> port->writeBlob(vaddr, (uint8_t*)data, size);
> } else {
> TranslatingPort *port = context->getMemPort();
> port->writeBlob(vaddr, (uint8_t*)data, size);
> delete port;
> }
651c646,647
< DPRINTF(GDBMisc, "trap: PC=%s\n", context->pcState());
---
> TheISA::PCState pc = context->pcState();
> DPRINTF(GDBMisc, "trap: PC=%s\n", pc);