diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-02-16 02:40:04 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-02-16 02:40:04 -0500 |
| commit | e7d16b0aefec6543817762b6e5e389372a11b53c (patch) | |
| tree | 2e90bf447049ece5fb234bfaf44c50515388744e /cpu/o3/commit_impl.hh | |
| parent | 7c9ea671aff141bc0a3e7acc892794e7e8181cf3 (diff) | |
| parent | 00f451cc02373a22023f1e32ba3823a1d07adb42 (diff) | |
| download | gem5-e7d16b0aefec6543817762b6e5e389372a11b53c.tar.xz | |
Merge zizzer:/bk/multiarch
into zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/m5-multiarch
--HG--
extra : convert_revision : 17b164847aee7e21d15d1a9d99aae43f46906c28
Diffstat (limited to 'cpu/o3/commit_impl.hh')
| -rw-r--r-- | cpu/o3/commit_impl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/o3/commit_impl.hh b/cpu/o3/commit_impl.hh index dc0986772..540f16b78 100644 --- a/cpu/o3/commit_impl.hh +++ b/cpu/o3/commit_impl.hh @@ -393,9 +393,9 @@ 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(); + Fault * inst_fault = head_inst->getFault(); - if (inst_fault != No_Fault && inst_fault != Fake_Mem_Fault) { + if (inst_fault != NoFault && inst_fault != FakeMemFault) { if (!head_inst->isNop()) { #if FULL_SYSTEM cpu->trap(inst_fault); |