const char* isa = DEFAULT_ISA;
uint16_t rbb_port = 0;
bool use_rbb = false;
+ std::vector<int> hartids;
+
+ auto const hartids_parser = [&](const char *s) {
+ std::string const str(s);
+ std::stringstream stream(str);
+
+ int n;
+ while (stream >> n)
+ {
+ hartids.push_back(n);
+ if (stream.peek() == ',') stream.ignore();
+ }
+ };
option_parser_t parser;
parser.help(&help);
parser.option('H', 0, 0, [&](const char* s){halted = true;});
parser.option(0, "rbb-port", 1, [&](const char* s){use_rbb = true; rbb_port = atoi(s);});
parser.option(0, "pc", 1, [&](const char* s){start_pc = strtoull(s, 0, 0);});
+ parser.option(0, "hartids", 1, hartids_parser);
parser.option(0, "ic", 1, [&](const char* s){ic.reset(new icache_sim_t(s));});
parser.option(0, "dc", 1, [&](const char* s){dc.reset(new dcache_sim_t(s));});
parser.option(0, "l2", 1, [&](const char* s){l2.reset(cache_sim_t::construct(s, "L2$"));});
if (mems.empty())
mems = make_mems("2048");
- sim_t s(isa, nprocs, halted, start_pc, mems, htif_args);
+ sim_t s(isa, nprocs, halted, start_pc, mems, htif_args, std::move(hartids));
std::unique_ptr<remote_bitbang_t> remote_bitbang((remote_bitbang_t *) NULL);
std::unique_ptr<jtag_dtm_t> jtag_dtm(new jtag_dtm_t(&s.debug_module));
if (use_rbb) {