diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-01-11 18:52:29 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-01-11 18:52:29 -0500 |
commit | 90d4436351620bd3861013333aabd152d5492df7 (patch) | |
tree | 47216913009940d2380afce1e0ecaf6f7e1c73ec /cpu/beta_cpu/iew_impl.hh | |
parent | 2fb632dbda1b5db9163322541676cef52a55029f (diff) | |
download | gem5-90d4436351620bd3861013333aabd152d5492df7.tar.xz |
Slight fixes, add in commit trace flag.
base/traceflags.py:
Add new commit rate trace flag.
build/SConstruct:
Add extra option for efence.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
Use function calls instead of direct indexing (avoids confusion).
cpu/beta_cpu/commit_impl.hh:
Add commit rate trace output (might not be worthwhile in the future).
cpu/beta_cpu/decode_impl.hh:
Remove some older hacks. Fix it so that the isntruction properly sets its next
PC to the one calculated by the branch.
cpu/beta_cpu/fetch_impl.hh:
Remove old commented code.
cpu/beta_cpu/iew_impl.hh:
Add extra check to ensure that the instruction is valid.
cpu/beta_cpu/regfile.hh:
Include trace file.
--HG--
extra : convert_revision : 4ee1dc88f8a5ed9b65486c6c111a3718a8040e42
Diffstat (limited to 'cpu/beta_cpu/iew_impl.hh')
-rw-r--r-- | cpu/beta_cpu/iew_impl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/beta_cpu/iew_impl.hh b/cpu/beta_cpu/iew_impl.hh index 2bfd6bae9..b718e6aa0 100644 --- a/cpu/beta_cpu/iew_impl.hh +++ b/cpu/beta_cpu/iew_impl.hh @@ -249,7 +249,6 @@ SimpleIEW<Impl, IQ>::squashDueToBranch(DynInstPtr &inst) // Prediction was incorrect, so send back inverse. toCommit->branchTaken = inst->readCalcTarg() != (inst->readPC() + sizeof(MachInst)); -// toCommit->globalHist = inst->readGlobalHist(); } template<class Impl, class IQ> @@ -363,10 +362,11 @@ SimpleIEW<Impl, IQ>::dispatchInsts() continue; } else if (inst->isExecuted()) { + assert(0 && "Instruction shouldn't be executed.\n"); DPRINTF(IEW, "IEW: Issue: Executed branch encountered, " "skipping.\n"); - assert(inst->isDirectCtrl()); +// assert(inst->isDirectCtrl()); inst->setIssued(); inst->setCanCommit(); |