diff options
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/pagetable_walker.cc | 5 | ||||
| -rw-r--r-- | src/arch/x86/pagetable_walker.hh | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc index b096fbfe8..c768bb428 100644 --- a/src/arch/x86/pagetable_walker.cc +++ b/src/arch/x86/pagetable_walker.cc @@ -123,8 +123,7 @@ bool Walker::recvTimingResp(PacketPtr pkt) { WalkerSenderState * senderState = - dynamic_cast<WalkerSenderState *>(pkt->senderState); - pkt->senderState = senderState->saved; + dynamic_cast<WalkerSenderState *>(pkt->popSenderState()); WalkerState * senderWalk = senderState->senderWalk; bool walkComplete = senderWalk->recvPacket(pkt); delete senderState; @@ -169,7 +168,7 @@ Walker::recvRetry() bool Walker::sendTiming(WalkerState* sendingState, PacketPtr pkt) { - pkt->senderState = new WalkerSenderState(sendingState, pkt->senderState); + pkt->pushSenderState(new WalkerSenderState(sendingState)); return port.sendTimingReq(pkt); } diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh index 07f476b00..c2781ca1b 100644 --- a/src/arch/x86/pagetable_walker.hh +++ b/src/arch/x86/pagetable_walker.hh @@ -157,10 +157,8 @@ namespace X86ISA struct WalkerSenderState : public Packet::SenderState { WalkerState * senderWalk; - Packet::SenderState * saved; - WalkerSenderState(WalkerState * _senderWalk, - Packet::SenderState * _saved) : - senderWalk(_senderWalk), saved(_saved) {} + WalkerSenderState(WalkerState * _senderWalk) : + senderWalk(_senderWalk) {} }; public: |