41c41,42
< #include "mem/fs_translating_port_proxy.hh"
---
> #include "mem/physical.hh"
> #include "mem/vport.hh"
48c49
< : System(p)
---
> : System(p), intrFreq(0)
66d66
< }
68,76d67
< AlphaSystem::~AlphaSystem()
< {
< delete consoleSymtab;
< delete console;
< delete pal;
< #ifdef DEBUG
< delete consolePanicEvent;
< #endif
< }
78,86d68
< void
< AlphaSystem::initState()
< {
< // Moved from the constructor to here since it relies on the
< // address map being resolved in the interconnect
<
< // Call the initialisation of the super class
< System::initState();
<
88,89c70,71
< pal->loadSections(physProxy, loadAddrMask);
< console->loadSections(physProxy, loadAddrMask);
---
> pal->loadSections(functionalPort, loadAddrMask);
> console->loadSections(functionalPort, loadAddrMask);
122,123c104,105
< virtProxy->writeBlob(addr, (uint8_t*)params()->boot_osflags.c_str(),
< strlen(params()->boot_osflags.c_str()));
---
> virtPort->writeBlob(addr, (uint8_t*)params()->boot_osflags.c_str(),
> strlen(params()->boot_osflags.c_str()));
133c115
< virtProxy->write(addr+0x50, data);
---
> virtPort->write(addr+0x50, data);
135c117
< virtProxy->write(addr+0x58, data);
---
> virtPort->write(addr+0x58, data);
139a122,131
> AlphaSystem::~AlphaSystem()
> {
> delete consoleSymtab;
> delete console;
> delete pal;
> #ifdef DEBUG
> delete consolePanicEvent;
> #endif
> }
>
181,182c173,174
< uint32_t i1 = virtProxy->read<uint32_t>(addr);
< uint32_t i2 = virtProxy->read<uint32_t>(addr + sizeof(MachInst));
---
> uint32_t i1 = virtPort->read<uint32_t>(addr);
> uint32_t i2 = virtPort->read<uint32_t>(addr + sizeof(MachInst));
199c191
< virtProxy->write(addr, htog(Phys2K0Seg(access)));
---
> virtPort->write(addr, htog(Phys2K0Seg(access)));