Move hartids into cfg_t

The only slightly difficult thing here is that hartids will always
be considered "overridden" by the time we get to sim_t::sim_t (either
overridden by a command line argument, or overridden when we set
default hartids just before the constructor). To allow downstream code
to distinguish between "I picked IDs 0, 1, 2, 3 because the user asked
for 4 processors" and "The user explicitly asked for IDs 0, 1, 2, 3",
we have an extra explicit_hartids field.

1 files changed, 7 insertions, 2 deletions

diff --git a/riscv/cfg.h b/riscv/cfg.h
index 1e08f80..6410c81 100644
--- a/riscv/cfg.h
+++ b/riscv/cfg.h
@@ -56,13 +56,16 @@ public:
   cfg_t(std::pair<reg_t, reg_t> default_initrd_bounds,
         const char *default_bootargs, size_t default_nprocs,
         const char *default_isa, const char *default_priv,
-        const std::vector<mem_cfg_t> &default_mem_layout)
+        const std::vector<mem_cfg_t> &default_mem_layout,
+        const std::vector<int> default_hartids)
     : initrd_bounds(default_initrd_bounds),
       bootargs(default_bootargs),
       nprocs(default_nprocs),
       isa(default_isa),
       priv(default_priv),
-      mem_layout(default_mem_layout)
+      mem_layout(default_mem_layout),
+      hartids(default_hartids),
+      explicit_hartids(false)
   {}
 
   cfg_arg_t<std::pair<reg_t, reg_t>> initrd_bounds;
@@ -72,6 +75,8 @@ public:
   cfg_arg_t<const char *>            priv;
   cfg_arg_t<std::vector<mem_cfg_t>>  mem_layout;
   std::optional<reg_t>               start_pc;
+  cfg_arg_t<std::vector<int>>        hartids;
+  bool                               explicit_hartids;
 };
 
 #endif