sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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.

Browse source 
--HG--
extra : convert_revision : ce9ecfc03a47642d105f2378208bbe923d6b765b
This commit is contained in:
Gabe Black 2007-03-16 10:57:34 +00:00
parent 3ccaee976a
commit 725ee42ba7
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cpu/simple/base.cc
View file

@ -418,7 +418,8 @@ BaseSimpleCPU::postExecute()
if (thread->profile) { if (thread->profile) {
bool usermode = TheISA::inUserMode(tc); bool usermode = TheISA::inUserMode(tc);
thread->profilePC = usermode ? 1 : thread->readPC(); 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) if (node)
thread->profileNode = node; thread->profileNode = node;
} }