sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge zizzer:/bk/newmem

Browse source 
into  zeep.pool:/z/saidi/tmp/m5.newmem

--HG--
extra : convert_revision : b754945635cc0864fdd68ec4bee736aab9bca407
This commit is contained in:
Ali Saidi 2006-08-16 23:39:44 -04:00
parent c6c5cc1ad5 c7bb14ac79
commit 57db6caab1
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mem/physical.cc
View file

@ -110,7 +110,7 @@ PhysicalMemory::calculateLatency(Packet *pkt)
return lat; return lat;
} }
Tick void
PhysicalMemory::doFunctionalAccess(Packet *pkt) PhysicalMemory::doFunctionalAccess(Packet *pkt)
{ {
assert(pkt->getAddr() + pkt->getSize() < params()->addrRange.size()); assert(pkt->getAddr() + pkt->getSize() < params()->addrRange.size());
@ -136,7 +136,6 @@ PhysicalMemory::doFunctionalAccess(Packet *pkt)
} }
pkt->result = Packet::Success; pkt->result = Packet::Success;
return calculateLatency(pkt);
} }
Port * Port *
@ -197,7 +196,9 @@ PhysicalMemory::MemoryPort::recvTiming(Packet *pkt)
{ {
assert(pkt->result != Packet::Nacked); assert(pkt->result != Packet::Nacked);
Tick latency = memory->doFunctionalAccess(pkt); Tick latency = memory->calculateLatency(pkt);
memory->doFunctionalAccess(pkt);
pkt->makeTimingResponse(); pkt->makeTimingResponse();
sendTiming(pkt, latency); sendTiming(pkt, latency);
@ -208,7 +209,8 @@ PhysicalMemory::MemoryPort::recvTiming(Packet *pkt)
Tick Tick
PhysicalMemory::MemoryPort::recvAtomic(Packet *pkt) PhysicalMemory::MemoryPort::recvAtomic(Packet *pkt)
{ {
return memory->doFunctionalAccess(pkt); memory->doFunctionalAccess(pkt);
return memory->calculateLatency(pkt);
} }
void void

2
src/mem/physical.hh
View file

@ -112,7 +112,7 @@ class PhysicalMemory : public MemObject
unsigned int drain(Event *de); unsigned int drain(Event *de);
protected: protected:
Tick doFunctionalAccess(Packet *pkt); void doFunctionalAccess(Packet *pkt);
virtual Tick calculateLatency(Packet *pkt); virtual Tick calculateLatency(Packet *pkt);
void recvStatusChange(Port::Status status); void recvStatusChange(Port::Status status);