diff options
| author | Rupert Swarbrick <rswarbrick@gmail.com> | 2022-03-16 12:18:32 +0000 |
|---|---|---|
| committer | Rupert Swarbrick <rswarbrick@gmail.com> | 2022-03-18 15:31:37 +0000 |
| commit | b163dd4ddf68c5b8a806b57320abd57d899472be (patch) | |
| tree | 5cfddbb8add484cc5ee242ff1d2eafc53d116440 /riscv | |
| parent | 4ce0b5aef17804ea8534a9d6d958d91f0c574f93 (diff) | |
| download | spike-b163dd4ddf68c5b8a806b57320abd57d899472be.zip spike-b163dd4ddf68c5b8a806b57320abd57d899472be.tar.gz spike-b163dd4ddf68c5b8a806b57320abd57d899472be.tar.bz2 | |
Fold priv parameter into cfg_t
Diffstat (limited to 'riscv')
| -rw-r--r-- | riscv/cfg.h | 6 | ||||
| -rw-r--r-- | riscv/sim.cc | 5 | ||||
| -rw-r--r-- | riscv/sim.h | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/riscv/cfg.h b/riscv/cfg.h index e0b9dcc..f0dea9f 100644 --- a/riscv/cfg.h +++ b/riscv/cfg.h @@ -30,17 +30,19 @@ class cfg_t 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_isa, const char *default_priv) : initrd_bounds(default_initrd_bounds), bootargs(default_bootargs), nprocs(default_nprocs), - isa(default_isa) + isa(default_isa), + priv(default_priv) {} cfg_arg_t<std::pair<reg_t, reg_t>> initrd_bounds; cfg_arg_t<const char *> bootargs; cfg_arg_t<size_t> nprocs; cfg_arg_t<const char *> isa; + cfg_arg_t<const char *> priv; }; #endif diff --git a/riscv/sim.cc b/riscv/sim.cc index 39c6525..f3999a7 100644 --- a/riscv/sim.cc +++ b/riscv/sim.cc @@ -28,8 +28,7 @@ static void handle_signal(int sig) signal(sig, &handle_signal); } -sim_t::sim_t(const cfg_t *cfg, const char* priv, const char* varch, - bool halted, bool real_time_clint, +sim_t::sim_t(const cfg_t *cfg, const char* varch, bool halted, bool real_time_clint, reg_t start_pc, std::vector<std::pair<reg_t, mem_t*>> mems, std::vector<std::pair<reg_t, abstract_device_t*>> plugin_devices, const std::vector<std::string>& args, @@ -42,7 +41,7 @@ sim_t::sim_t(const cfg_t *cfg, const char* priv, const char* varch, #endif FILE *cmd_file) // needed for command line option --cmd : htif_t(args), - isa(cfg->isa(), priv), + isa(cfg->isa(), cfg->priv()), cfg(cfg), mems(mems), plugin_devices(plugin_devices), diff --git a/riscv/sim.h b/riscv/sim.h index 84abada..fc20a2c 100644 --- a/riscv/sim.h +++ b/riscv/sim.h @@ -32,8 +32,7 @@ class remote_bitbang_t; class sim_t : public htif_t, public simif_t { public: - sim_t(const cfg_t *cfg, const char* priv, const char* varch, - bool halted, bool real_time_clint, + sim_t(const cfg_t *cfg, const char* varch, bool halted, bool real_time_clint, reg_t start_pc, std::vector<std::pair<reg_t, mem_t*>> mems, std::vector<std::pair<reg_t, abstract_device_t*>> plugin_devices, const std::vector<std::string>& args, const std::vector<int> hartids, |