aboutsummaryrefslogtreecommitdiff
path: root/spike_main
diff options
context:
space:
mode:
authorJerry Zhao <jerryz123@berkeley.edu>2023-12-07 14:26:35 -0800
committerJerry Zhao <jerryz123@berkeley.edu>2023-12-08 18:05:28 -0800
commitab10e576e112ffaef78f8a4d4b86c53a40438eb6 (patch)
treec2dce9e20ceb306c55681faa5f45438c9c5ac3d3 /spike_main
parent0ee120bfae308850e78e51b548e4a83df5f9f840 (diff)
downloadriscv-isa-sim-ab10e576e112ffaef78f8a4d4b86c53a40438eb6.zip
riscv-isa-sim-ab10e576e112ffaef78f8a4d4b86c53a40438eb6.tar.gz
riscv-isa-sim-ab10e576e112ffaef78f8a4d4b86c53a40438eb6.tar.bz2
Remove old explicit-fields cfg_t constructor, switch to default constructor
Diffstat (limited to 'spike_main')
-rw-r--r--spike_main/spike-log-parser.cc14
-rw-r--r--spike_main/spike.cc14
2 files changed, 2 insertions, 26 deletions
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);