From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 16 Mar 2007 10:57:34 +0000 (+0000)
Subject: Fix ALPHA_FS compile. The MachInst -> StaticInstPtr constructor is no longer a conver... 
X-Git-Tag: m5_2.0_beta3~92^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=725ee42ba784d4b18f26bec618d23ce580a02b2a;p=gem5.git

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
---

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;
     }