From b163dd4ddf68c5b8a806b57320abd57d899472be Mon Sep 17 00:00:00 2001 From: Rupert Swarbrick Date: Wed, 16 Mar 2022 12:18:32 +0000 Subject: Fold priv parameter into cfg_t --- spike_main/spike.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spike_main/spike.cc') diff --git a/spike_main/spike.cc b/spike_main/spike.cc index 70a1012..3c6e14c 100644 --- a/spike_main/spike.cc +++ b/spike_main/spike.cc @@ -232,7 +232,6 @@ int main(int argc, char** argv) const char *log_path = nullptr; std::vector> extensions; const char* initrd = NULL; - const char* priv = DEFAULT_PRIV; const char* varch = DEFAULT_VARCH; const char* dtb_file = NULL; uint16_t rbb_port = 0; @@ -253,7 +252,8 @@ int main(int argc, char** argv) cfg_t cfg(/*default_initrd_bounds=*/std::make_pair((reg_t)0, (reg_t)0), /*default_bootargs=*/nullptr, /*default_nprocs=*/1, - /*default_isa=*/DEFAULT_ISA); + /*default_isa=*/DEFAULT_ISA, + /*default_priv=*/DEFAULT_PRIV); auto const hartids_parser = [&](const char *s) { std::string const str(s); @@ -331,7 +331,7 @@ int main(int argc, char** argv) parser.option(0, "l2", 1, [&](const char* s){l2.reset(cache_sim_t::construct(s, "L2$"));}); parser.option(0, "log-cache-miss", 0, [&](const char* s){log_cache = true;}); parser.option(0, "isa", 1, [&](const char* s){cfg.isa = s;}); - parser.option(0, "priv", 1, [&](const char* s){priv = s;}); + parser.option(0, "priv", 1, [&](const char* s){cfg.priv = s;}); parser.option(0, "varch", 1, [&](const char* s){varch = s;}); parser.option(0, "device", 1, device_parser); parser.option(0, "extension", 1, [&](const char* s){extensions.push_back(find_extension(s));}); @@ -445,7 +445,7 @@ int main(int argc, char** argv) } #endif - sim_t s(&cfg, priv, varch, halted, real_time_clint, + sim_t s(&cfg, varch, halted, real_time_clint, start_pc, mems, plugin_devices, htif_args, std::move(hartids), dm_config, log_path, dtb_enabled, dtb_file, #ifdef HAVE_BOOST_ASIO -- cgit v1.1