summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2019-10-21 18:01:31 -0700
committerGabe Black <gabeblack@google.com>2019-12-17 23:17:28 +0000
commit2e325359b7c8e22d1da869c1b05cfab0c2cd835b (patch)
treef047ec61a0f2a4dc2de7d96cd23fc8b61cea7e8f /src
parent1b48cfd7617e3cd54086121d36ad8364a29f1d90 (diff)
downloadgem5-2e325359b7c8e22d1da869c1b05cfab0c2cd835b.tar.xz
fastmodel: Tell fast model not to shutdown when time stops.
Change-Id: I000e7809a2c8850eb31e5615caf1d88b537fea8d Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22121 Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Chun-Chen TK Hsu <chunchenhsu@google.com> Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com> Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm/fastmodel/iris/cpu.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/arch/arm/fastmodel/iris/cpu.cc b/src/arch/arm/fastmodel/iris/cpu.cc
index d66cf1dbc..e5d95ef65 100644
--- a/src/arch/arm/fastmodel/iris/cpu.cc
+++ b/src/arch/arm/fastmodel/iris/cpu.cc
@@ -30,6 +30,7 @@
#include "arch/arm/fastmodel/iris/cpu.hh"
#include "arch/arm/fastmodel/iris/thread_context.hh"
+#include "scx/scx.h"
namespace Iris
{
@@ -60,6 +61,12 @@ BaseCPU::BaseCPU(BaseCPUParams *params, sc_core::sc_module *_evs) :
panic_if(base && !sendFunctional,
"The EVS send functional attribute is not of type "
"sc_attribute<PortProxy::SendFunctionalFunc>.");
+
+ // Make sure fast model knows we're using debugging mechanisms to control
+ // the simulation, and it shouldn't shut down if simulation time stops
+ // for some reason. Despite the misleading name, this doesn't start a CADI
+ // server because it's first parameter is false.
+ scx::scx_start_cadi_server(false, false, true);
}
BaseCPU::~BaseCPU()