projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
[gem5.git]
/
src
/
mem
/
physical.cc
diff --git
a/src/mem/physical.cc
b/src/mem/physical.cc
index f5a0ade15358762db8305dd756c7856044d160e6..0302f7351f9b31655a439aa62d51509ceac8eb09 100644
(file)
--- a/
src/mem/physical.cc
+++ b/
src/mem/physical.cc
@@
-39,21
+39,17
@@
#include <iostream>
#include <string>
#include <iostream>
#include <string>
-
+#include "arch/isa_traits.hh"
#include "base/misc.hh"
#include "config/full_system.hh"
#include "base/misc.hh"
#include "config/full_system.hh"
-#include "mem/packet_impl.hh"
#include "mem/physical.hh"
#include "mem/physical.hh"
-#include "sim/host.hh"
#include "sim/builder.hh"
#include "sim/eventq.hh"
#include "sim/builder.hh"
#include "sim/eventq.hh"
-#include "arch/isa_traits.hh"
-
+#include "sim/host.hh"
using namespace std;
using namespace TheISA;
using namespace std;
using namespace TheISA;
-
PhysicalMemory::PhysicalMemory(Params *p)
: MemObject(p->name), pmemAddr(NULL), port(NULL), lat(p->latency), _params(p)
{
PhysicalMemory::PhysicalMemory(Params *p)
: MemObject(p->name), pmemAddr(NULL), port(NULL), lat(p->latency), _params(p)
{
@@
-105,7
+101,7
@@
PhysicalMemory::deviceBlockSize()
}
Tick
}
Tick
-PhysicalMemory::calculateLatency(Packet
*
pkt)
+PhysicalMemory::calculateLatency(Packet
Ptr
pkt)
{
return lat;
}
{
return lat;
}
@@
-193,7
+189,7
@@
PhysicalMemory::checkLockedAddrList(Request *req)
}
void
}
void
-PhysicalMemory::doFunctionalAccess(Packet
*
pkt)
+PhysicalMemory::doFunctionalAccess(Packet
Ptr
pkt)
{
assert(pkt->getAddr() + pkt->getSize() <= params()->addrRange.size());
{
assert(pkt->getAddr() + pkt->getSize() <= params()->addrRange.size());
@@
-281,14
+277,14
@@
PhysicalMemory::MemoryPort::deviceBlockSize()
}
Tick
}
Tick
-PhysicalMemory::MemoryPort::recvAtomic(Packet
*
pkt)
+PhysicalMemory::MemoryPort::recvAtomic(Packet
Ptr
pkt)
{
memory->doFunctionalAccess(pkt);
return memory->calculateLatency(pkt);
}
void
{
memory->doFunctionalAccess(pkt);
return memory->calculateLatency(pkt);
}
void
-PhysicalMemory::MemoryPort::recvFunctional(Packet
*
pkt)
+PhysicalMemory::MemoryPort::recvFunctional(Packet
Ptr
pkt)
{
// Default implementation of SimpleTimingPort::recvFunctional()
// calls recvAtomic() and throws away the latency; we can save a
{
// Default implementation of SimpleTimingPort::recvFunctional()
// calls recvAtomic() and throws away the latency; we can save a