43c43
< #include "sim/root.hh"
---
> #include "sim/core.hh"
605c605
< Packet::ReadReq, Packet::Broadcast);
---
> MemCmd::ReadReq, Packet::Broadcast);
622d621
< warn("Bad address!\n");
673,677c672
< if (retryPkt) {
< delete retryPkt->req;
< delete retryPkt;
< }
< retryPkt = NULL;
---
> cacheBlocked = false;
678a674,676
> delete retryPkt->req;
> delete retryPkt;
> retryPkt = NULL;
1157c1155
< // predicted_branch |=
---
> predicted_branch |=
1228c1226
< assert(numInst < fetchWidth);
---
> assert(numInst != fetchWidth);