summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-02-16 14:55:15 -0500
committerKevin Lim <ktlim@umich.edu>2006-02-16 14:55:15 -0500
commitd6a330ebb949b6cd63195d44e5a4304e2fd3378e (patch)
tree012eafbc16586ed3e4c456b56d7d755fb7d7f4ec /cpu
parentc7624c26e71c1edc73a076efe472d253b199c3cc (diff)
downloadgem5-d6a330ebb949b6cd63195d44e5a4304e2fd3378e.tar.xz
Remove fake fault.
Switch fault pointers to const pointers to prevent them from accidentally being changed. Fix some coding style. arch/alpha/ev5.cc: cpu/o3/commit_impl.hh: kern/kernel_stats.hh: Remove fake fault. arch/alpha/faults.cc: Remove fake fault, fix to have normal m5 line length limit, and change pointers to be const pointers so that the default faults aren't changed accidentally. arch/alpha/faults.hh: Fix to have normal m5 line length limit, change pointers to const pointers. sim/faults.cc: sim/faults.hh: Remove fake fault, change pointers to const pointers. --HG-- extra : convert_revision : 01d4600e0d4bdc1d177b32edebc78f86a1bbfe2e
Diffstat (limited to 'cpu')
-rw-r--r--cpu/o3/commit_impl.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/o3/commit_impl.hh b/cpu/o3/commit_impl.hh
index 540f16b78..47b4dfd00 100644
--- a/cpu/o3/commit_impl.hh
+++ b/cpu/o3/commit_impl.hh
@@ -395,7 +395,7 @@ SimpleCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num)
// Check if the instruction caused a fault. If so, trap.
Fault * inst_fault = head_inst->getFault();
- if (inst_fault != NoFault && inst_fault != FakeMemFault) {
+ if (inst_fault != NoFault) {
if (!head_inst->isNop()) {
#if FULL_SYSTEM
cpu->trap(inst_fault);