pagetable_walker.cc (10660:87f7b5a07584) pagetable_walker.cc (10694:1a6785e37d81)
1/*
2 * Copyright (c) 2012 ARM Limited
3 * All rights reserved.
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 587 unchanged lines hidden (view full) ---

596 assert(inflight);
597 assert(state == Waiting);
598 inflight--;
599 if (pkt->isRead()) {
600 // should not have a pending read it we also had one outstanding
601 assert(!read);
602
603 // @todo someone should pay for this
1/*
2 * Copyright (c) 2012 ARM Limited
3 * All rights reserved.
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 587 unchanged lines hidden (view full) ---

596 assert(inflight);
597 assert(state == Waiting);
598 inflight--;
599 if (pkt->isRead()) {
600 // should not have a pending read it we also had one outstanding
601 assert(!read);
602
603 // @todo someone should pay for this
604 pkt->firstWordDelay = pkt->lastWordDelay = 0;
604 pkt->headerDelay = pkt->payloadDelay = 0;
605
606 state = nextState;
607 nextState = Ready;
608 PacketPtr write = NULL;
609 read = pkt;
610 timingFault = stepWalk(write);
611 state = Waiting;
612 assert(timingFault == NoFault || read == NULL);

--- 110 unchanged lines hidden --- 		605
606 state = nextState;
607 nextState = Ready;
608 PacketPtr write = NULL;
609 read = pkt;
610 timingFault = stepWalk(write);
611 state = Waiting;
612 assert(timingFault == NoFault || read == NULL);

--- 110 unchanged lines hidden ---