From 2e325359b7c8e22d1da869c1b05cfab0c2cd835b Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 21 Oct 2019 18:01:31 -0700 Subject: [PATCH] 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 Reviewed-by: Chun-Chen TK Hsu Maintainer: Giacomo Travaglini Tested-by: kokoro --- src/arch/arm/fastmodel/iris/cpu.cc | 7 +++++++ 1 file changed, 7 insertions(+) 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."); + + // 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() -- 2.30.2