390,391c390,393
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
< while (threads != (*activeThreads).end()) {
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
>
> while (threads != end) {
392a395
>
419c422,423
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
421c425
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
442c446,447
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
444c449
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
517d521
< toIEW->commitInfo[tid].nextNPC = nextPC[tid];
567c571
< if ((*activeThreads).size() <= 0)
---
> if (activeThreads->empty())
570c574,575
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
574c579
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
595c600
< threads = (*activeThreads).begin();
---
> threads = activeThreads->begin();
597c602
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
695c700,701
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
697c703
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
732,733c738,739
< InstSeqNum bdelay_done_seq_num = squashed_inst;
< bool squash_bdelay_slot = fromIEW->squashDelaySlot[tid];
---
> InstSeqNum bdelay_done_seq_num;
> bool squash_bdelay_slot;
735,736c741,759
< if (!squash_bdelay_slot)
< bdelay_done_seq_num++;
---
> if (fromIEW->branchMispredict[tid]) {
> if (fromIEW->branchTaken[tid] &&
> fromIEW->condDelaySlotBranch[tid]) {
> DPRINTF(Commit, "[tid:%i]: Cond. delay slot branch"
> "mispredicted as taken. Squashing after previous "
> "inst, [sn:%i]\n",
> tid, squashed_inst);
> bdelay_done_seq_num = squashed_inst;
> squash_bdelay_slot = true;
> } else {
> DPRINTF(Commit, "[tid:%i]: Branch Mispredict. Squashing "
> "after delay slot [sn:%i]\n", tid, squashed_inst+1);
> bdelay_done_seq_num = squashed_inst + 1;
> squash_bdelay_slot = false;
> }
> } else {
> bdelay_done_seq_num = squashed_inst;
> squash_bdelay_slot = true;
> }
774d796
< toIEW->commitInfo[tid].nextNPC = fromIEW->nextNPC[tid];
800c822
< threads = (*activeThreads).begin();
---
> threads = activeThreads->begin();
802c824
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
1105c1127
< renameMap[tid]->setEntry(head_inst->flattenedDestRegIdx(i),
---
> renameMap[tid]->setEntry(head_inst->destRegIdx(i),
1252c1274,1275
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
1254c1277
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
1333c1356,1357
< int tid = (*activeThreads).front();
---
> assert(!activeThreads->empty());
> int tid = activeThreads->front();
1380c1404,1405
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
1382c1407
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {