diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 03:20:05 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 03:20:05 -0500 |
| commit | f721a4d9adb0cbed48ef8f18dc7455a3ed8f5a9b (patch) | |
| tree | 335e7c747799099b12b38c94eceb1fd7a49c7148 /cpu/o3/commit_impl.hh | |
| parent | ed25d326174f8086a8224ecb9e798410db14cddb (diff) | |
| parent | 14f2cdb1a14e9e6896939c210cdacef289d9c263 (diff) | |
| download | gem5-f721a4d9adb0cbed48ef8f18dc7455a3ed8f5a9b.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
arch/alpha/faults.hh:
ur
Using cleaned up fault class deiffinitions
--HG--
extra : convert_revision : a600950d539be2be73358f072aa5426456bf3d2d
Diffstat (limited to 'cpu/o3/commit_impl.hh')
| -rw-r--r-- | cpu/o3/commit_impl.hh | 2 |
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); |