From b8e562a58cc5e51a358167cfda3754f1998f8577 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Mon, 6 Feb 2023 13:26:48 -0800
Subject: [PATCH] Use size_t, rather than int, for hartids

They aren't signed quantities.
---
 ci-tests/testlib.c             | 2 +-
 riscv/cfg.h                    | 4 ++--
 spike_main/spike-log-parser.cc | 2 +-
 spike_main/spike.cc            | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci-tests/testlib.c b/ci-tests/testlib.c
index 9343b611..3d5438b5 100644
--- a/ci-tests/testlib.c
+++ b/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",
diff --git a/riscv/cfg.h b/riscv/cfg.h
index 58c792cb..6e7f82c6 100644
--- a/riscv/cfg.h
+++ b/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;
diff --git a/spike_main/spike-log-parser.cc b/spike_main/spike-log-parser.cc
index cec9c313..9bea5c51 100644
--- a/spike_main/spike-log-parser.cc
+++ b/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);
 
diff --git a/spike_main/spike.cc b/spike_main/spike.cc
index 9032db4f..e7ee03aa 100644
--- a/spike_main/spike.cc
+++ b/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);