diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 01:25:48 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 01:25:48 -0500 |
| commit | b161d2a731ec7d75bdeb896d1b89efcbb125a09f (patch) | |
| tree | a1a92378afb4d05e8c9e2d047c1c9edbcc9e3447 /cpu/o3/commit_impl.hh | |
| parent | 7f17f1f2df7dc7123448ec624a345ee7c0e996b5 (diff) | |
| parent | 10c79efe556697ebbed74c82214b5505b405da5b (diff) | |
| download | gem5-b161d2a731ec7d75bdeb896d1b89efcbb125a09f.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : d8626acb2686e123ad0bb6cf94e85c992657470d
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); |