Browse Source

Use size_t, rather than int, for hartids

They aren't signed quantities.
pull/1246/head
Andrew Waterman 3 years ago
parent
commit
b8e562a58c
  1. 2
      ci-tests/testlib.c
  2. 4
      riscv/cfg.h
  3. 2
      spike_main/spike-log-parser.cc
  4. 8
      spike_main/spike.cc

2
ci-tests/testlib.c

@ -15,7 +15,7 @@ static std::vector<std::pair<reg_t, mem_t*>> make_mems(const std::vector<mem_cfg
int main()
{
std::vector<mem_cfg_t> mem_cfg { mem_cfg_t(0x80000000, 0x10000000) };
std::vector<int> hartids = {0};
std::vector<size_t> hartids = {0};
cfg_t cfg(std::make_pair(0, 0),
nullptr,
"rv64gcv",

4
riscv/cfg.h

@ -69,7 +69,7 @@ public:
const endianness_t default_endianness,
const reg_t default_pmpregions,
const std::vector<mem_cfg_t> &default_mem_layout,
const std::vector<int> default_hartids,
const std::vector<size_t> default_hartids,
bool default_real_time_clint,
const reg_t default_trigger_count)
: initrd_bounds(default_initrd_bounds),
@ -97,7 +97,7 @@ public:
reg_t pmpregions;
cfg_arg_t<std::vector<mem_cfg_t>> mem_layout;
std::optional<reg_t> start_pc;
cfg_arg_t<std::vector<int>> hartids;
cfg_arg_t<std::vector<size_t>> hartids;
bool explicit_hartids;
cfg_arg_t<bool> real_time_clint;
reg_t trigger_count;

2
spike_main/spike-log-parser.cc

@ -37,7 +37,7 @@ int main(int UNUSED argc, char** argv)
/*default_endianness*/endianness_little,
/*default_pmpregions=*/16,
/*default_mem_layout=*/std::vector<mem_cfg_t>(),
/*default_hartids=*/std::vector<int>(),
/*default_hartids=*/std::vector<size_t>(),
/*default_real_time_clint=*/false,
/*default_trigger_count=*/4);

8
spike_main/spike.cc

@ -291,11 +291,11 @@ static unsigned long atoul_nonzero_safe(const char* s)
return res;
}
static std::vector<int> parse_hartids(const char *s)
static std::vector<size_t> parse_hartids(const char *s)
{
std::string const str(s);
std::stringstream stream(str);
std::vector<int> hartids;
std::vector<size_t> hartids;
int n;
while (stream >> n) {
@ -353,7 +353,7 @@ int main(int argc, char** argv)
/*default_endianness*/endianness_little,
/*default_pmpregions=*/16,
/*default_mem_layout=*/parse_mem_layout("2048"),
/*default_hartids=*/std::vector<int>(),
/*default_hartids=*/std::vector<size_t>(),
/*default_real_time_clint=*/false,
/*default_trigger_count=*/4);
@ -536,7 +536,7 @@ int main(int argc, char** argv)
// Set default set of hartids based on nprocs, but don't set the
// explicit_hartids flag (which means that downstream code can know that
// we've only set the number of harts, not explicitly chosen their IDs).
std::vector<int> default_hartids;
std::vector<size_t> default_hartids;
default_hartids.reserve(nprocs());
for (size_t i = 0; i < nprocs(); ++i) {
default_hartids.push_back(i);

Loading…
Cancel
Save