diff options
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/x86/pagetable_walker.cc | 9 | ||||
-rw-r--r-- | src/arch/x86/pagetable_walker.hh | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc index 960954f15..b6e6c33f4 100644 --- a/src/arch/x86/pagetable_walker.cc +++ b/src/arch/x86/pagetable_walker.cc @@ -114,15 +114,14 @@ Walker::startFunctional(ThreadContext * _tc, Addr &addr, unsigned &logBytes, } bool -Walker::WalkerPort::recvTiming(PacketPtr pkt) +Walker::WalkerPort::recvTimingResp(PacketPtr pkt) { - return walker->recvTiming(pkt); + return walker->recvTimingResp(pkt); } bool -Walker::recvTiming(PacketPtr pkt) +Walker::recvTimingResp(PacketPtr pkt) { - assert(pkt->isResponse()); WalkerSenderState * senderState = dynamic_cast<WalkerSenderState *>(pkt->senderState); pkt->senderState = senderState->saved; @@ -171,7 +170,7 @@ Walker::recvRetry() bool Walker::sendTiming(WalkerState* sendingState, PacketPtr pkt) { pkt->senderState = new WalkerSenderState(sendingState, pkt->senderState); - return port.sendTiming(pkt); + return port.sendTimingReq(pkt); } MasterPort & diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh index c4c770884..9392290c7 100644 --- a/src/arch/x86/pagetable_walker.hh +++ b/src/arch/x86/pagetable_walker.hh @@ -70,12 +70,12 @@ namespace X86ISA protected: Walker *walker; - bool recvTiming(PacketPtr pkt); + bool recvTimingResp(PacketPtr pkt); /** * Snooping a coherence request, do nothing. */ - bool recvTimingSnoop(PacketPtr pkt) { return true; } + void recvTimingSnoopReq(PacketPtr pkt) { } Tick recvAtomicSnoop(PacketPtr pkt) { return 0; } void recvFunctionalSnoop(PacketPtr pkt) { } void recvRetry(); @@ -179,7 +179,7 @@ namespace X86ISA MasterID masterId; // Functions for dealing with packets. - bool recvTiming(PacketPtr pkt); + bool recvTimingResp(PacketPtr pkt); void recvRetry(); bool sendTiming(WalkerState * sendingState, PacketPtr pkt); |