Add trigger_count field to cfg_t

ci-tests/testlib.c

@@ -27,7 +27,8 @@ int main()
             16,
             mem_cfg,
             hartids,
-            false);
+            false,
+            4);
   std::vector<std::pair<reg_t, abstract_device_t*>> plugin_devices;
   std::vector<std::string> htif_args {"pk", "hello"};
   debug_module_config_t dm_config = {

riscv/cfg.h

@@ -71,7 +71,8 @@ public:
         const reg_t default_pmpregions,
         const std::vector<mem_cfg_t> &default_mem_layout,
         const std::vector<int> default_hartids,
-        bool default_real_time_clint)
+        bool default_real_time_clint,
+        const reg_t default_trigger_count)
     : initrd_bounds(default_initrd_bounds),
       bootargs(default_bootargs),
       isa(default_isa),
@@ -84,7 +85,8 @@ public:
       mem_layout(default_mem_layout),
       hartids(default_hartids),
       explicit_hartids(false),
-      real_time_clint(default_real_time_clint)
+      real_time_clint(default_real_time_clint),
+      trigger_count(default_trigger_count)
   {}
 
   cfg_arg_t<std::pair<reg_t, reg_t>> initrd_bounds;
@@ -101,6 +103,7 @@ public:
   cfg_arg_t<std::vector<int>>        hartids;
   bool                               explicit_hartids;
   cfg_arg_t<bool>                    real_time_clint;
+  reg_t                              trigger_count;
 
   size_t nprocs() const { return hartids().size(); }
 };

riscv/processor.cc

@@ -35,7 +35,7 @@ processor_t::processor_t(const isa_parser_t *isa, const cfg_t *cfg,
   histogram_enabled(false), log_commits_enabled(false),
   log_file(log_file), sout_(sout_.rdbuf()), halt_on_reset(halt_on_reset),
   in_wfi(false),
-  impl_table(256, false), last_pc(1), executions(1), TM(4)
+  impl_table(256, false), last_pc(1), executions(1), TM(cfg->trigger_count)
 {
   VU.p = this;
   TM.proc = this;

spike_main/spike-log-parser.cc

@@ -39,7 +39,8 @@ int main(int UNUSED argc, char** argv)
             /*default_pmpregions=*/16,
             /*default_mem_layout=*/std::vector<mem_cfg_t>(),
             /*default_hartids=*/std::vector<int>(),
-            /*default_real_time_clint=*/false);
+            /*default_real_time_clint=*/false,
+            /*default_trigger_count=*/4);
 
   isa_parser_t isa(isa_string, DEFAULT_PRIV);
   processor_t p(&isa, &cfg, 0, 0, false, nullptr, cerr);

spike_main/spike.cc

@@ -355,7 +355,8 @@ int main(int argc, char** argv)
             /*default_pmpregions=*/16,
             /*default_mem_layout=*/parse_mem_layout("2048"),
             /*default_hartids=*/std::vector<int>(),
-            /*default_real_time_clint=*/false);
+            /*default_real_time_clint=*/false,
+            /*default_trigger_count=*/4);
 
   auto const device_parser = [&plugin_devices](const char *s) {
     const std::string str(s);