Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/34168 )
Change subject: null,sim: Add name() to the dummy CPU and remove two #if
THE_ISAs.
......................................................................
null,sim: Add name() to the dummy CPU and remove two #if THE_ISAs.
This #if THE_ISAs were there because the dummy CPU didn't have a name()
method, and so couldn't provide its name for DPRINTFs. Provide that
method so we can get rid of the #ifs.
Change-Id: Ie7045554ddc8c9fb7725dcbcb7d1d2557786d00c
---
M src/arch/null/cpu_dummy.hh
M src/sim/system.cc
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/arch/null/cpu_dummy.hh b/src/arch/null/cpu_dummy.hh
index 7e183eb..5418511 100644
--- a/src/arch/null/cpu_dummy.hh
+++ b/src/arch/null/cpu_dummy.hh
@@ -46,6 +46,7 @@
static int numSimulatedInsts() { return 0; }
static int numSimulatedOps() { return 0; }
static void wakeup(ThreadID tid) { ; }
+ static const std::string name() { return "dummy_cpu"; }
};
#endif // __ARCH_NULL_CPU_DUMMY_HH__
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 8185f13..a9f768c 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -76,10 +76,8 @@
void
System::Threads::Thread::resume()
{
-# if THE_ISA != NULL_ISA
DPRINTFS(Quiesce, context->getCpuPtr(), "activating\n");
context->activate();
-# endif
}
std::string
@@ -179,10 +177,8 @@
System::Threads::quiesce(ContextID id)
{
auto &t = thread(id);
-# if THE_ISA != NULL_ISA
BaseCPU M5_VAR_USED *cpu = t.context->getCpuPtr();
DPRINTFS(Quiesce, cpu, "quiesce()\n");
-# endif
t.quiesce();
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/34168
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ie7045554ddc8c9fb7725dcbcb7d1d2557786d00c
Gerrit-Change-Number: 34168
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
