Remove old explicit-fields cfg_t constructor, switch to default constructor

4 files changed, 3 insertions, 68 deletions

diff --git a/ci-tests/testlib.c b/ci-tests/testlib.c
index fff27f4..34d9410 100644
--- a/ci-tests/testlib.c
+++ b/ci-tests/testlib.c
@@ -14,21 +14,7 @@ static std::vector<std::pair<reg_t, abstract_mem_t*>> make_mems(const std::vecto
 
 int main()
 {
-  std::vector<mem_cfg_t> mem_cfg { mem_cfg_t(0x80000000, 0x10000000) };
-  std::vector<size_t> hartids = {0};
-  cfg_t cfg(std::make_pair(0, 0),
-            nullptr,
-            "rv64gcv",
-            "MSU",
-            "vlen:128,elen:64",
-            false,
-            endianness_little,
-            16,
-            (1 << PMP_SHIFT),
-            mem_cfg,
-            hartids,
-            false,
-            4);
+  cfg_t cfg;
   std::vector<device_factory_t*> plugin_devices;
   std::vector<std::string> htif_args {"pk", "hello"};
   debug_module_config_t dm_config = {
diff --git a/riscv/cfg.h b/riscv/cfg.h
index 2e556dc..63465e6 100644
--- a/riscv/cfg.h
+++ b/riscv/cfg.h
@@ -61,33 +61,6 @@ private:
 class cfg_t
 {
 public:
-  cfg_t(std::pair<reg_t, reg_t> default_initrd_bounds,
-        const char *default_bootargs,
-        const char *default_isa, const char *default_priv,
-        const char *default_varch,
-        const bool default_misaligned,
-        const endianness_t default_endianness,
-        const reg_t default_pmpregions,
-        const reg_t default_pmpgranularity,
-        const std::vector<mem_cfg_t> &default_mem_layout,
-        const std::vector<size_t> default_hartids,
-        bool default_real_time_clint,
-        const reg_t default_trigger_count)
-    : initrd_bounds(default_initrd_bounds),
-      bootargs(default_bootargs),
-      isa(default_isa),
-      priv(default_priv),
-      varch(default_varch),
-      misaligned(default_misaligned),
-      endianness(default_endianness),
-      pmpregions(default_pmpregions),
-      pmpgranularity(default_pmpgranularity),
-      mem_layout(default_mem_layout),
-      hartids(default_hartids),
-      explicit_hartids(false),
-      real_time_clint(default_real_time_clint),
-      trigger_count(default_trigger_count)
-  {}
   cfg_t();
 
   std::pair<reg_t, reg_t> initrd_bounds;
diff --git a/spike_main/spike-log-parser.cc b/spike_main/spike-log-parser.cc
index 6ac4ab0..a054e95 100644
--- a/spike_main/spike-log-parser.cc
+++ b/spike_main/spike-log-parser.cc
@@ -28,19 +28,7 @@ int main(int UNUSED argc, char** argv)
   parser.option(0, "isa", 1, [&](const char* s){isa_string = s;});
   parser.parse(argv);
 
-  cfg_t cfg(/*default_initrd_bounds=*/std::make_pair((reg_t)0, (reg_t)0),
-            /*default_bootargs=*/nullptr,
-            /*default_isa=*/DEFAULT_ISA,
-            /*default_priv=*/DEFAULT_PRIV,
-            /*default_varch=*/DEFAULT_VARCH,
-            /*default_misaligned=*/false,
-            /*default_endianness*/endianness_little,
-            /*default_pmpregions=*/16,
-            /*default_pmpgranularity=*/(1 << PMP_SHIFT),
-            /*default_mem_layout=*/std::vector<mem_cfg_t>(),
-            /*default_hartids=*/std::vector<size_t>(),
-            /*default_real_time_clint=*/false,
-            /*default_trigger_count=*/4);
+  cfg_t cfg;
 
   isa_parser_t isa(isa_string, DEFAULT_PRIV);
   processor_t p(&isa, &cfg, 0, 0, false, nullptr, cerr);
diff --git a/spike_main/spike.cc b/spike_main/spike.cc
index 3bb1c10..bea4899 100644
--- a/spike_main/spike.cc
+++ b/spike_main/spike.cc
@@ -361,19 +361,7 @@ int main(int argc, char** argv)
   };
   cfg_arg_t<size_t> nprocs(1);
 
-  cfg_t cfg(/*default_initrd_bounds=*/std::make_pair((reg_t)0, (reg_t)0),
-            /*default_bootargs=*/nullptr,
-            /*default_isa=*/DEFAULT_ISA,
-            /*default_priv=*/DEFAULT_PRIV,
-            /*default_varch=*/DEFAULT_VARCH,
-            /*default_misaligned=*/false,
-            /*default_endianness*/endianness_little,
-            /*default_pmpregions=*/16,
-            /*default_pmpgranularity=*/(1 << PMP_SHIFT),
-            /*default_mem_layout=*/parse_mem_layout("2048"),
-            /*default_hartids=*/std::vector<size_t>(),
-            /*default_real_time_clint=*/false,
-            /*default_trigger_count=*/4);
+  cfg_t cfg;
 
   auto const device_parser = [&plugin_device_factories](const char *s) {
     const std::string device_args(s);