diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-03-16 10:57:34 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-03-16 10:57:34 +0000 |
| commit | 725ee42ba784d4b18f26bec618d23ce580a02b2a (patch) | |
| tree | c4310288054bec4b1da78978b89a86e6b33f4d42 /src/cpu/simple | |
| parent | 3ccaee976a7c7df096c177c75daf3a7391bec295 (diff) | |
| download | gem5-725ee42ba784d4b18f26bec618d23ce580a02b2a.tar.xz | |
Fix ALPHA_FS compile. The MachInst -> StaticInstPtr constructor is no longer a conversion constructor because it caused ambiguous conversions when setting the pointer to NULL.
--HG--
extra : convert_revision : ce9ecfc03a47642d105f2378208bbe923d6b765b
Diffstat (limited to 'src/cpu/simple')
| -rw-r--r-- | src/cpu/simple/base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index cd139492a..877dc5bd4 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -418,7 +418,8 @@ BaseSimpleCPU::postExecute() if (thread->profile) { bool usermode = TheISA::inUserMode(tc); thread->profilePC = usermode ? 1 : thread->readPC(); - ProfileNode *node = thread->profile->consume(tc, inst); + StaticInstPtr si(inst); + ProfileNode *node = thread->profile->consume(tc, si); if (node) thread->profileNode = node; } |