Merge zizzer:/bk/newmem

into  zower.eecs.umich.edu:/eecshome/m5/newmem

src/cpu/o3/commit_impl.hh:
    Hand Merge

--HG--
extra : convert_revision : 6984db90d5b5ec71c31f1c345f5a77eed540059e

diff --cc src/cpu/o3/commit_impl.hh
index ba6a62b4dda038ef37db35269dc7fd6b4bf0b7ec,43305f9625891c266c719d3909396dc0554fe1a5..1527efe1a2e9cf70df9a2f1c18524310aaa631d5
--- 1/src/cpu/o3/commit_impl.hh
--- 2/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@@ -728,12 -728,28 +728,11 @@@ DefaultCommit<Impl>::commit(
              InstSeqNum squashed_inst = fromIEW->squashedSeqNum[tid];
  
  #if ISA_HAS_DELAY_SLOT
 -            InstSeqNum bdelay_done_seq_num;
 -            bool squash_bdelay_slot;
 -
 -            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;
 -            }
 +            InstSeqNum bdelay_done_seq_num = squashed_inst;
 +            bool squash_bdelay_slot = fromIEW->squashDelaySlot[tid];
 +
 +            if (!squash_bdelay_slot)
 +                bdelay_done_seq_num++;
- 
  #endif
  
              if (fromIEW->includeSquashInst[tid] == true) {

diff --cc src/cpu/o3/fetch_impl.hh
Simple merge

diff --cc src/cpu/o3/thread_context_impl.hh
Simple merge

diff --cc src/cpu/thread_context.hh
Simple merge