From 725ee42ba784d4b18f26bec618d23ce580a02b2a Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 16 Mar 2007 10:57:34 +0000 Subject: [PATCH] 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 --- src/cpu/simple/base.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- 2.30.2