cpu: move initCPU calls from initState to init
This commit moves the initCPU calls from initState to init
of base cpu (which were added in commit 0b8d02dec4).
This is a temporary fix to solve the problem of X86System
initState getting called before initState of base cpu.
Jira Issue: https://gem5.atlassian.net/browse/GEM5-292
Change-Id: I7434cd811536175562cfa2646f4326907fadad8c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24884
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
@@ -318,11 +318,8 @@ BaseCPU::init()
|
||||
|
||||
verifyMemoryMode();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
BaseCPU::initState()
|
||||
{
|
||||
//These calls eventually need to be moved to initState
|
||||
if (FullSystem && !params()->switched_out) {
|
||||
for (auto *tc: threadContexts)
|
||||
TheISA::initCPU(tc, tc->contextId());
|
||||
|
||||
@@ -314,7 +314,6 @@ class BaseCPU : public ClockedObject
|
||||
virtual ~BaseCPU();
|
||||
|
||||
void init() override;
|
||||
void initState() override;
|
||||
void startup() override;
|
||||
void regStats() override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user