From 0b8d02dec492215aa286138404d9fc1f0b7a9074 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 9 Jan 2020 02:10:15 -0800 Subject: cpu: Consolidate and move the CPU's calls to TheISA::initCPU. TheISA::initCPU is basically an ISA specific implementation of reset logic on architectural state. As such, it only needs to be called if we're not going to load a checkpoint, ie in initState. Also, since the implementation was the same across all CPUs, this change collapses all the individual implementations down into the base CPU class. Change-Id: Id68133fd7f31619c90bf7b3aad35ae20871acaa4 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24189 Maintainer: Gabe Black Tested-by: kokoro Reviewed-by: Jason Lowe-Power --- src/cpu/simple/base.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/cpu/simple') diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index 566533c73..06dd77390 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -130,11 +130,6 @@ BaseSimpleCPU::init() for (auto tc : threadContexts) { // Initialise the ThreadContext's memory proxies tc->initMemProxies(tc); - - if (FullSystem && !params()->switched_out) { - // initialize CPU, including PC - TheISA::initCPU(tc, tc->contextId()); - } } } -- cgit v1.2.3